psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-08-04 12:20:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 5920d4f25d into 7a1d1791d3

Browse Source
This commit is contained in:
Christian Zagrodnick 2013-03-19 04:43:46 -07:00
commit 0ea07491cf
2 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ZPsycopgDA/db.py
View File

@ -26,7 +26,7 @@ import pool
import psycopg2 import psycopg2
from psycopg2.extensions import INTEGER, LONGINTEGER, FLOAT, BOOLEAN, DATE, TIME from psycopg2.extensions import INTEGER, LONGINTEGER, FLOAT, BOOLEAN, DATE, TIME
from psycopg2.extensions import TransactionRollbackError, register_type from psycopg2.extensions import TransactionRollbackError, register_type
from psycopg2 import NUMBER, STRING, ROWID, DATETIME from psycopg2 import NUMBER, STRING, ROWID, DATETIME
# the DB object, managing all the real query work # the DB object, managing all the real query work
@ -107,17 +107,17 @@ class DB(TM, dbi_db.DB):
def make_mappings(self): def make_mappings(self):
"""Generate the mappings used later by self.convert_description().""" """Generate the mappings used later by self.convert_description()."""
self.type_mappings = {} self.type_mappings = {}
for t, s in [(INTEGER,'i'), (LONGINTEGER, 'i'), (NUMBER, 'n'), for t, s in [(INTEGER,'i'), (LONGINTEGER, 'i'), (NUMBER, 'n'),
(BOOLEAN,'n'), (ROWID, 'i'), (BOOLEAN,'n'), (ROWID, 'i'),
(DATETIME, 'd'), (DATE, 'd'), (TIME, 'd')]: (DATETIME, 'd'), (DATE, 'd'), (TIME, 'd')]:
for v in t.values: for v in t.values:
self.type_mappings[v] = (t, s) self.type_mappings[v] = (t, s)
def convert_description(self, desc, use_psycopg_types=False): def convert_description(self, desc, use_psycopg_types=False):
"""Convert DBAPI-2.0 description field to Zope format.""" """Convert DBAPI-2.0 description field to Zope format."""
items = [] items = []
for name, typ, width, ds, p, scale, null_ok in desc: for name, typ, width, ds, p, scale, null_ok in desc:
m = self.type_mappings.get(typ, (STRING, 's')) m = self.type_mappings.get(typ, (STRING, 's'))
items.append({ items.append({
'name': name, 'name': name,
'type': use_psycopg_types and m[0] or m[1], 'type': use_psycopg_types and m[0] or m[1],
@ -158,7 +158,7 @@ class DB(TM, dbi_db.DB):
return () return ()
self.putconn() self.putconn()
return self.convert_description(c.description, True) return self.convert_description(c.description, True)
## query execution ## ## query execution ##
def query(self, query_string, max_rows=None, query_data=None): def query(self, query_string, max_rows=None, query_data=None):
@ -205,5 +205,5 @@ class DB(TM, dbi_db.DB):
except StandardError, err: except StandardError, err:
self._abort() self._abort()
raise err raise err
return self.convert_description(desc), res return self.convert_description(desc), res

42
ZPsycopgDA/test_da.py Normal file
View File

@ -0,0 +1,42 @@
# zopectl run script to test the DA/threading behavior
#
# Usage: bin/zopectl run test_da.py "dbname=xxx"
#
from Products.ZPsycopgDA.DA import ZDATETIME
from Products.ZPsycopgDA.db import DB
import sys
import threading
dsn = sys.argv[1]
typecasts = [ZDATETIME]
def DA_connect():
db = DB(dsn, tilevel=2, typecasts=typecasts)
db.open()
return db
def assert_casts(conn, name):
connection = conn.getcursor().connection
if (connection.string_types ==
{1114: ZDATETIME, 1184: ZDATETIME}):
print '%s pass\n' % name
else:
print '%s fail (%s)\n' % (name, connection.string_types)
def test_connect(name):
assert_casts(conn1, name)
conn1 = DA_connect()
t1 = threading.Thread(target=test_connect, args=('t1',))
t1.start()
t2 = threading.Thread(target=test_connect, args=('t2',))
t2.start()
t1.join()
t2.join()