Author: phd
Date: 2006-08-22 08:19:20 -0600 (Tue, 22 Aug 2006)
New Revision: 1869
Modified:
SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
SQLObject/trunk/sqlobject/main.py
SQLObject/trunk/sqlobject/postgres/pgconnection.py
Log:
Fixed the bug 1380296: idSequence should be in sqlmeta.
Modified: SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/firebird/firebirdconnection.py 2006-08-22 04:48:52 UTC (rev 1868)
+++ SQLObject/trunk/sqlobject/firebird/firebirdconnection.py 2006-08-22 14:19:20 UTC (rev 1869)
@@ -90,8 +90,8 @@
for each table this method to work."""
table = soInstance.sqlmeta.table
idName = soInstance.sqlmeta.idName
- sequenceName = getattr(soInstance, '_idSequence',
- 'GEN_%s' % table)
+ sequenceName = soInstance.sqlmeta.idSequence or \
+ 'GEN_%s' % table
c = conn.cursor()
if id is None:
c.execute('SELECT gen_id(%s,1) FROM rdb$database'
Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py 2006-08-22 04:48:52 UTC (rev 1868)
+++ SQLObject/trunk/sqlobject/main.py 2006-08-22 14:19:20 UTC (rev 1869)
@@ -180,6 +180,7 @@
table = None
idName = None
+ idSequence = None
# This function is used to coerce IDs into the proper format,
# so you should replace it with str, or another function, if you
# aren't using integer IDs
@@ -879,7 +880,7 @@
"""
for attr in ['_table', '_lazyUpdate', '_style', '_idName',
'_defaultOrder', '_cacheValues', '_registry',
- '_idType', '_fromDatabase']:
+ '_idType', '_fromDatabase', '_idSequence']:
if new_attrs.has_key(attr):
new_name = attr[1:]
deprecated("%r is deprecated; please set the %r "
Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py 2006-08-22 04:48:52 UTC (rev 1868)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py 2006-08-22 14:19:20 UTC (rev 1869)
@@ -119,8 +119,8 @@
def _queryInsertID(self, conn, soInstance, id, names, values):
table = soInstance.sqlmeta.table
idName = soInstance.sqlmeta.idName
- sequenceName = getattr(soInstance, '_idSequence',
- '%s_%s_seq' % (table, idName))
+ sequenceName = soInstance.sqlmeta.idSequence or \
+ '%s_%s_seq' % (table, idName)
c = conn.cursor()
if id is None:
c.execute("SELECT NEXTVAL('%s')" % sequenceName)
|
