[SQL-CVS] r3888 - in SQLObject/trunk: docs sqlobject/maxdb sqlobject/mssql sqlobject/mysql sqlobjec
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2009-05-18 16:15:52
|
Author: phd Date: 2009-05-18 10:15:46 -0600 (Mon, 18 May 2009) New Revision: 3888 Modified: SQLObject/trunk/docs/News.txt SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py SQLObject/trunk/sqlobject/mssql/mssqlconnection.py SQLObject/trunk/sqlobject/mysql/mysqlconnection.py SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py SQLObject/trunk/sqlobject/sybase/sybaseconnection.py Log: Use sqlmeta.idName instead of 'id' in all connection classes. Modified: SQLObject/trunk/docs/News.txt =================================================================== --- SQLObject/trunk/docs/News.txt 2009-05-18 16:14:04 UTC (rev 3887) +++ SQLObject/trunk/docs/News.txt 2009-05-18 16:15:46 UTC (rev 3888) @@ -171,6 +171,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/trunk/sqlobject/maxdb/maxdbconnection.py =================================================================== --- SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py 2009-05-18 16:14:04 UTC (rev 3887) +++ SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py 2009-05-18 16:15:46 UTC (rev 3888) @@ -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/trunk/sqlobject/mssql/mssqlconnection.py =================================================================== --- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py 2009-05-18 16:14:04 UTC (rev 3887) +++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py 2009-05-18 16:15:46 UTC (rev 3888) @@ -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/trunk/sqlobject/mysql/mysqlconnection.py =================================================================== --- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py 2009-05-18 16:14:04 UTC (rev 3887) +++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py 2009-05-18 16:15:46 UTC (rev 3888) @@ -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/trunk/sqlobject/sqlite/sqliteconnection.py =================================================================== --- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py 2009-05-18 16:14:04 UTC (rev 3887) +++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py 2009-05-18 16:15:46 UTC (rev 3888) @@ -280,7 +280,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/trunk/sqlobject/sybase/sybaseconnection.py =================================================================== --- SQLObject/trunk/sqlobject/sybase/sybaseconnection.py 2009-05-18 16:14:04 UTC (rev 3887) +++ SQLObject/trunk/sqlobject/sybase/sybaseconnection.py 2009-05-18 16:15:46 UTC (rev 3888) @@ -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) |