[SQL-CVS] r2018 - in home/phd/SQLObject/paramstyles/sqlobject: firebird maxdb mssql mysql sybase tests

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

Author: phd
Date: 2006-10-12 07:55:46 -0600 (Thu, 12 Oct 2006)
New Revision: 2018

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/sybase/sybaseconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py
   home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto.py
Log:
Merged patches from the revisions 2015:2017 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2006-10-12 13:48:23 UTC (rev 2017)
+++ home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2006-10-12 13:55:46 UTC (rev 2018)
@@ -196,6 +196,7 @@
                 continue
             colClass, kw = self.guessClass(t, flength, fscale)
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
+            kw['dbName'] = field
             kw['notNone'] = not nullAllowed
             kw['default'] = thedefault
             results.append(colClass(**kw))

Modified: home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py	2006-10-12 13:48:23 UTC (rev 2017)
+++ home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py	2006-10-12 13:55:46 UTC (rev 2018)
@@ -261,6 +261,7 @@
 
             colClass, kw = self.guessClass(data_type,data_len,data_scale)
             kw['name'] = field_name
+            kw['dbName'] = field
 
             if nullAllowed == 'Y' :
                 nullAllowed=False

Modified: home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py	2006-10-12 13:48:23 UTC (rev 2017)
+++ home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py	2006-10-12 13:55:46 UTC (rev 2018)
@@ -218,6 +218,7 @@
             # precision is needed for decimal columns
             colClass, kw = self.guessClass(t, size, precision, scale)
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
+            kw['dbName'] = field
             kw['notNone'] = not nullAllowed
             if (defaultText):
                 # Strip ( and )

Modified: home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2006-10-12 13:48:23 UTC (rev 2017)
+++ home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2006-10-12 13:55:46 UTC (rev 2018)
@@ -194,6 +194,7 @@
                 colClass = col.UnicodeCol
                 if self.dbEncoding: kw['dbEncoding'] = self.dbEncoding
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
+            kw['dbName'] = field
             kw['notNone'] = not nullAllowed
             if default and t.startswith('int'):
                 kw['default'] = int(default)

Modified: home/phd/SQLObject/paramstyles/sqlobject/sybase/sybaseconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/sybase/sybaseconnection.py	2006-10-12 13:48:23 UTC (rev 2017)
+++ home/phd/SQLObject/paramstyles/sqlobject/sybase/sybaseconnection.py	2006-10-12 13:55:46 UTC (rev 2018)
@@ -144,6 +144,7 @@
                 continue
             colClass, kw = self.guessClass(t)
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
+            kw['dbName'] = field
             kw['notNone'] = not nullAllowed
             kw['default'] = default
             # @@ skip key...

Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py	2006-10-12 13:48:23 UTC (rev 2017)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py	2006-10-12 13:55:46 UTC (rev 2018)
@@ -36,7 +36,7 @@
     '+exceptions': 'mysql sqlite',
     '-transactions': 'mysql',
     '-dropTableCascade': 'sybase mssql',
-    '-fromDatabase': 'sqlite sybase firebird',
+    '-fromDatabase': 'sqlite',
     '-expressionIndex': 'mysql sqlite firebird mssql',
     '-blobData': 'mssql',
     '-decimalColumn': 'mssql',

Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto.py	2006-10-12 13:48:23 UTC (rev 2017)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto.py	2006-10-12 13:55:46 UTC (rev 2018)
@@ -174,3 +174,7 @@
         assert jane.longField == 'x'*1000
         del classregistry.registry(
             AutoTest.sqlmeta.registry).classes['AutoTest']
+
+        columns = AutoTest.sqlmeta.columns
+        assert columns["lastName"].dbName == "last_name"
+        assert columns["wannahavefun"].dbName == "wannahavefun"