GeezerVison is showing github.com — Changed connection.delColumn(): the first argument is sqlmeta, not ta… · sqlobject/sqlobject@b5e1c6d
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: sqlobject/firebird/firebirdconnection.py +2-4Lines changed: 2 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -161,10 +161,8 @@ def dropTable(self, tableName, cascade=False): | 161 | 161 | self.query("DROP TABLE %s" % tableName) | 162 | 162 | self.query("DROP GENERATOR GEN_%s" % tableName) | 163 | 163 |
| 164 | | - def delColumn(self, tableName, column): | 165 | | - self.query('ALTER TABLE %s DROP %s' % | 166 | | - (tableName, | 167 | | - column.dbName)) | | 164 | + def delColumn(self, sqlmeta, column): | | 165 | + self.query('ALTER TABLE %s DROP %s' % (sqlmeta.table, column.dbName)) | 168 | 166 |
| 169 | 167 | def columnsFromSchema(self, tableName, soClass): | 170 | 168 | """ | |
Collapse file Copy file name to clipboardExpand all lines: sqlobject/main.py +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -493,7 +493,7 @@ def delColumn(cls, column, changeSchema=False, connection=None): | 493 | 493 |
| 494 | 494 | if changeSchema: | 495 | 495 | conn = connection or soClass._connection | 496 | | - conn.delColumn(sqlmeta.table, column) | | 496 | + conn.delColumn(sqlmeta, column) | 497 | 497 |
| 498 | 498 | if soClass._SO_finishedClassCreation: | 499 | 499 | unmakeProperties(soClass) | |
Collapse file Copy file name to clipboardExpand all lines: sqlobject/maxdb/maxdbconnection.py +2-4Lines changed: 2 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -211,10 +211,8 @@ def addColumn(self, tableName, column): | 211 | 211 | (tableName, | 212 | 212 | column.maxdbCreateSQL())) | 213 | 213 |
| 214 | | - def delColumn(self, tableName, column): | 215 | | - self.query('ALTER TABLE %s DROP COLUMN %s' % | 216 | | - (tableName, | 217 | | - column.dbName)) | | 214 | + def delColumn(self, sqlmeta, column): | | 215 | + self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table, column.dbName)) | 218 | 216 |
| 219 | 217 | GET_COLUMNS = """ | 220 | 218 | SELECT COLUMN_NAME, NULLABLE, DATA_DEFAULT, DATA_TYPE, | |
Collapse file Copy file name to clipboardExpand all lines: sqlobject/mssql/mssqlconnection.py +2-4Lines changed: 2 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -181,10 +181,8 @@ def addColumn(self, tableName, column): | 181 | 181 | (tableName, | 182 | 182 | column.mssqlCreateSQL())) | 183 | 183 |
| 184 | | - def delColumn(self, tableName, column): | 185 | | - self.query('ALTER TABLE %s DROP COLUMN %s' % | 186 | | - (tableName, | 187 | | - column.dbName)) | | 184 | + def delColumn(self, sqlmeta, column): | | 185 | + self.query('ALTER TABLE %s DROP COLUMN %s' % (tableName.table, column.dbName)) | 188 | 186 |
| 189 | 187 | # precision and scale is gotten from column table so that we can create | 190 | 188 | # decimal columns if needed | |
Collapse file Copy file name to clipboardExpand all lines: sqlobject/mysql/mysqlconnection.py +2-4Lines changed: 2 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -177,10 +177,8 @@ def addColumn(self, tableName, column): | 177 | 177 | (tableName, | 178 | 178 | column.mysqlCreateSQL())) | 179 | 179 |
| 180 | | - def delColumn(self, tableName, column): | 181 | | - self.query('ALTER TABLE %s DROP COLUMN %s' % | 182 | | - (tableName, | 183 | | - column.dbName)) | | 180 | + def delColumn(self, sqlmeta, column): | | 181 | + self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table, column.dbName)) | 184 | 182 |
| 185 | 183 | def columnsFromSchema(self, tableName, soClass): | 186 | 184 | colData = self.queryAll("SHOW COLUMNS FROM %s" | |
Collapse file Copy file name to clipboardExpand all lines: sqlobject/postgres/pgconnection.py +2-4Lines changed: 2 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -177,10 +177,8 @@ def addColumn(self, tableName, column): | 177 | 177 | (tableName, | 178 | 178 | column.postgresCreateSQL())) | 179 | 179 |
| 180 | | - def delColumn(self, tableName, column): | 181 | | - self.query('ALTER TABLE %s DROP COLUMN %s' % | 182 | | - (tableName, | 183 | | - column.dbName)) | | 180 | + def delColumn(self, sqlmeta, column): | | 181 | + self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table, column.dbName)) | 184 | 182 |
| 185 | 183 | def columnsFromSchema(self, tableName, soClass): | 186 | 184 |
| |
Collapse file Copy file name to clipboardExpand all lines: sqlobject/sqlite/sqliteconnection.py +2-4Lines changed: 2 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -268,10 +268,8 @@ def addColumn(self, tableName, column): | 268 | 268 | column.sqliteCreateSQL())) | 269 | 269 | self.query('VACUUM %s' % tableName) | 270 | 270 |
| 271 | | - def delColumn(self, tableName, column): | 272 | | - # @@ Need an sqlmeta to call recreateTableWithoutColumn | 273 | | - #~ self.recreateTableWithoutColumn(, column) | 274 | | - pass # Oops! There is no DROP COLUMN in SQLite | | 271 | + def delColumn(self, sqlmeta, column): | | 272 | + self.recreateTableWithoutColumn(sqlmeta, column) | 275 | 273 |
| 276 | 274 | def recreateTableWithoutColumn(self, sqlmeta, column): | 277 | 275 | new_name = sqlmeta.table + '_ORIGINAL' | |
Collapse file Copy file name to clipboardExpand all lines: sqlobject/sybase/sybaseconnection.py +2-4Lines changed: 2 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -128,10 +128,8 @@ def addColumn(self, tableName, column): | 128 | 128 | (tableName, | 129 | 129 | column.sybaseCreateSQL())) | 130 | 130 |
| 131 | | - def delColumn(self, tableName, column): | 132 | | - self.query('ALTER TABLE %s DROP COLUMN %s' % | 133 | | - (tableName, | 134 | | - column.dbName)) | | 131 | + def delColumn(self, sqlmeta, column): | | 132 | + self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table, column.dbName)) | 135 | 133 |
| 136 | 134 | SHOW_COLUMNS=('SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS ' | 137 | 135 | 'WHERE TABLE_NAME = \'%s\'') | |
|