[SQL-CVS] r3887 - in SQLObject/branches/0.10: docs sqlobject/maxdb sqlobject/mssql sqlobject/mysql sqlobject/sqlite sqlobject/sybase

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

Author: phd
Date: 2009-05-18 10:14:04 -0600 (Mon, 18 May 2009)
New Revision: 3887

Modified:
   SQLObject/branches/0.10/docs/News.txt
   SQLObject/branches/0.10/sqlobject/maxdb/maxdbconnection.py
   SQLObject/branches/0.10/sqlobject/mssql/mssqlconnection.py
   SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py
   SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py
   SQLObject/branches/0.10/sqlobject/sybase/sybaseconnection.py
Log:
Use sqlmeta.idName instead of 'id' in all connection classes.


Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/docs/News.txt	2009-05-18 16:14:04 UTC (rev 3887)
@@ -130,6 +130,8 @@
 * Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
   sqlmeta.idName instead of 'id'; convert default 'NULL' to None.
 
+* Use sqlmeta.idName instead of 'id' in all connection classes.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/branches/0.10/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/maxdb/maxdbconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/maxdb/maxdbconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -257,7 +257,7 @@
             # id is defined as primary key --> ok
             # We let sqlobject raise error if the 'id' is used for another column
             field_name = field.lower()
-            if field_name == 'id' and  pkmap[field_name]:
+            if (field_name == soClass.sqlmeta.idName) and pkmap[field_name]:
                 continue
 
             colClass, kw = self.guessClass(data_type,data_len,data_scale)

Modified: SQLObject/branches/0.10/sqlobject/mssql/mssqlconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/mssql/mssqlconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/mssql/mssqlconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -217,8 +217,7 @@
                                 % tableName)
         results = []
         for field, size, t, precision, scale, nullAllowed, default, defaultText, is_identity in colData:
-            # Seems strange to skip the pk column?  What if it's not 'id'?
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             # precision is needed for decimal columns
             colClass, kw = self.guessClass(t, size, precision, scale)

Modified: SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -220,7 +220,7 @@
                                 % tableName)
         results = []
         for field, t, nullAllowed, key, default, extra in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
             if self.kw.get('use_unicode') and colClass is col.StringCol:

Modified: SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -279,7 +279,7 @@
                         for col in sqlmeta.columnList if col.name != column.name]
         cols = ",\n".join(["    %s" % c for c in cols])
         self.query('CREATE TABLE %s (\n%s\n)' % (sqlmeta.table, cols))
-        all_columns = ', '.join(['id'] + [col.dbName for col in sqlmeta.columnList])
+        all_columns = ', '.join([sqlmeta.idName] + [col.dbName for col in sqlmeta.columnList])
         self.query('INSERT INTO %s (%s) SELECT %s FROM %s' % (
             sqlmeta.table, all_columns, all_columns, new_name))
         self.query('DROP TABLE %s' % new_name)

Modified: SQLObject/branches/0.10/sqlobject/sybase/sybaseconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/sybase/sybaseconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/sybase/sybaseconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -139,7 +139,7 @@
                                 % tableName)
         results = []
         for field, t, nullAllowed, default in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)