[SQL-CVS] r2155 - in SQLObject/trunk/sqlobject: . firebird maxdb mssql mysql postgres sqlite sybase

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

Author: phd
Date: 2006-12-28 13:09:12 -0700 (Thu, 28 Dec 2006)
New Revision: 2155

Modified:
   SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
   SQLObject/trunk/sqlobject/main.py
   SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py
   SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
   SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
   SQLObject/trunk/sqlobject/postgres/pgconnection.py
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
   SQLObject/trunk/sqlobject/sybase/sybaseconnection.py
Log:
Changed connection.delColumn(): the first argument is sqlmeta, not tableName (required for SQLite).


Modified: SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/firebird/firebirdconnection.py	2006-12-28 19:50:05 UTC (rev 2154)
+++ SQLObject/trunk/sqlobject/firebird/firebirdconnection.py	2006-12-28 20:09:12 UTC (rev 2155)
@@ -161,10 +161,8 @@
         self.query("DROP TABLE %s" % tableName)
         self.query("DROP GENERATOR GEN_%s" % tableName)
 
-    def delColumn(self, tableName, column):
-        self.query('ALTER TABLE %s DROP %s' %
-                   (tableName,
-                    column.dbName))
+    def delColumn(self, sqlmeta, column):
+        self.query('ALTER TABLE %s DROP %s' % (sqlmeta.table, column.dbName))
 
     def columnsFromSchema(self, tableName, soClass):
         """

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2006-12-28 19:50:05 UTC (rev 2154)
+++ SQLObject/trunk/sqlobject/main.py	2006-12-28 20:09:12 UTC (rev 2155)
@@ -493,7 +493,7 @@
 
         if changeSchema:
             conn = connection or soClass._connection
-            conn.delColumn(sqlmeta.table, column)
+            conn.delColumn(sqlmeta, column)
 
         if soClass._SO_finishedClassCreation:
             unmakeProperties(soClass)

Modified: SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py	2006-12-28 19:50:05 UTC (rev 2154)
+++ SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py	2006-12-28 20:09:12 UTC (rev 2155)
@@ -211,10 +211,8 @@
                    (tableName,
                     column.maxdbCreateSQL()))
 
-    def delColumn(self, tableName, column):
-        self.query('ALTER TABLE %s DROP COLUMN %s' %
-                   (tableName,
-                    column.dbName))
+    def delColumn(self, sqlmeta, column):
+        self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table, column.dbName))
 
     GET_COLUMNS = """
     SELECT COLUMN_NAME, NULLABLE, DATA_DEFAULT, DATA_TYPE,

Modified: SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	2006-12-28 19:50:05 UTC (rev 2154)
+++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	2006-12-28 20:09:12 UTC (rev 2155)
@@ -181,10 +181,8 @@
                    (tableName,
                     column.mssqlCreateSQL()))
 
-    def delColumn(self, tableName, column):
-        self.query('ALTER TABLE %s DROP COLUMN %s' %
-                   (tableName,
-                    column.dbName))
+    def delColumn(self, sqlmeta, column):
+        self.query('ALTER TABLE %s DROP COLUMN %s' % (tableName.table, column.dbName))
 
     # precision and scale is gotten from column table so that we can create 
     # decimal columns if needed

Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2006-12-28 19:50:05 UTC (rev 2154)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2006-12-28 20:09:12 UTC (rev 2155)
@@ -177,10 +177,8 @@
                    (tableName,
                     column.mysqlCreateSQL()))
 
-    def delColumn(self, tableName, column):
-        self.query('ALTER TABLE %s DROP COLUMN %s' %
-                   (tableName,
-                    column.dbName))
+    def delColumn(self, sqlmeta, column):
+        self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table, column.dbName))
 
     def columnsFromSchema(self, tableName, soClass):
         colData = self.queryAll("SHOW COLUMNS FROM %s"

Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py	2006-12-28 19:50:05 UTC (rev 2154)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py	2006-12-28 20:09:12 UTC (rev 2155)
@@ -177,10 +177,8 @@
                    (tableName,
                     column.postgresCreateSQL()))
 
-    def delColumn(self, tableName, column):
-        self.query('ALTER TABLE %s DROP COLUMN %s' %
-                   (tableName,
-                    column.dbName))
+    def delColumn(self, sqlmeta, column):
+        self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table, column.dbName))
 
     def columnsFromSchema(self, tableName, soClass):
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2006-12-28 19:50:05 UTC (rev 2154)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2006-12-28 20:09:12 UTC (rev 2155)
@@ -268,10 +268,8 @@
                     column.sqliteCreateSQL()))
         self.query('VACUUM %s' % tableName)
 
-    def delColumn(self, tableName, column):
-        # @@ Need an sqlmeta to call recreateTableWithoutColumn
-        #~ self.recreateTableWithoutColumn(, column)
-        pass # Oops! There is no DROP COLUMN in SQLite
+    def delColumn(self, sqlmeta, column):
+        self.recreateTableWithoutColumn(sqlmeta, column)
 
     def recreateTableWithoutColumn(self, sqlmeta, column):
         new_name = sqlmeta.table + '_ORIGINAL'

Modified: SQLObject/trunk/sqlobject/sybase/sybaseconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sybase/sybaseconnection.py	2006-12-28 19:50:05 UTC (rev 2154)
+++ SQLObject/trunk/sqlobject/sybase/sybaseconnection.py	2006-12-28 20:09:12 UTC (rev 2155)
@@ -128,10 +128,8 @@
                    (tableName,
                     column.sybaseCreateSQL()))
 
-    def delColumn(self, tableName, column):
-        self.query('ALTER TABLE %s DROP COLUMN %s' %
-                   (tableName,
-                    column.dbName))
+    def delColumn(self, sqlmeta, column):
+        self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table, column.dbName))
 
     SHOW_COLUMNS=('SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS '
                   'WHERE TABLE_NAME = \'%s\'')