[SQL-CVS] r1881 - in home/phd/SQLObject/paramstyles/sqlobject: . firebird mysql postgres

[<sub...@co...>]

Author: phd
Date: 2006-08-22 09:04:33 -0600 (Tue, 22 Aug 2006)
New Revision: 1881

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/index.py
   home/phd/SQLObject/paramstyles/sqlobject/main.py
   home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py
Log:
Merged patches from the revisions 1868:1880 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2006-08-22 14:59:53 UTC (rev 1880)
+++ home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2006-08-22 15:04:33 UTC (rev 1881)
@@ -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: home/phd/SQLObject/paramstyles/sqlobject/index.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/index.py	2006-08-22 14:59:53 UTC (rev 1880)
+++ home/phd/SQLObject/paramstyles/sqlobject/index.py	2006-08-22 15:04:33 UTC (rev 1881)
@@ -156,7 +156,7 @@
         self.kw['name'] = value
 
     def _get_name(self):
-        return kw['name']
+        return self.kw['name']
 
     def _set_name(self, value):
         self.setName(value)

Modified: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py	2006-08-22 14:59:53 UTC (rev 1880)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py	2006-08-22 15:04:33 UTC (rev 1881)
@@ -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 "
@@ -1414,7 +1415,7 @@
                 # This join has requested not to be created
                 continue
             sql.append(conn._SO_createJoinTableSQL(join))
-        return '\n'.join(sql)
+        return ';\n'.join(sql)
     createJoinTablesSQL = classmethod(createJoinTablesSQL)
 
     def createIndexes(cls, ifNotExists=False, connection=None):
@@ -1432,7 +1433,7 @@
             if not index:
                 continue
             sql.append(conn.createIndexSQL(cls, index))
-        return '\n'.join(sql)
+        return ';\n'.join(sql)
     createIndexesSQL = classmethod(createIndexesSQL)
 
     def _getJoinsToCreate(cls):

Modified: home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2006-08-22 14:59:53 UTC (rev 1880)
+++ home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2006-08-22 15:04:33 UTC (rev 1881)
@@ -33,7 +33,7 @@
                 "read_default_file", "read_default_group", "charset"):
             if key in kw:
                 self.kw[key] = col.popKey(kw, key)
-        for key in ("connect_time", "compress", "named_pipe", "use_unicode",
+        for key in ("connect_timeout", "compress", "named_pipe", "use_unicode",
                 "client_flag", "local_infile"):
             if key in kw:
                 self.kw[key] = int(col.popKey(kw, key))

Modified: home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py	2006-08-22 14:59:53 UTC (rev 1880)
+++ home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py	2006-08-22 15:04:33 UTC (rev 1881)
@@ -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)