PublicArchive/sqlalchemy
2
0
Fork 0
mirror of https://github.com/sqlalchemy/sqlalchemy.git synced 2026-05-09 10:20:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix innodb autoinc constraint (double)quoting

Browse Source
This commit is contained in:
Jeff Dairiki
2012-04-06 21:55:39 -07:00
parent 4cb74452fe
commit b7abf86f72
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sqlalchemy/dialects/mysql/base.py
+1 -1
View File
@@ -1395,7 +1395,7 @@ class MySQLDDLCompiler(compiler.DDLCompiler):
auto_inc_column is not list(table.primary_key)[0]:
if constraint_string:
constraint_string += ", \n\t"
constraint_string += "KEY `idx_autoinc_%s`(`%s`)" % (auto_inc_column.name, \
constraint_string += "KEY `idx_autoinc_%s`(%s)" % (auto_inc_column.name, \
self.preparer.format_column(auto_inc_column))
return constraint_string
test/dialect/test_mysql.py
+17 -1
View File
@@ -1411,7 +1411,7 @@ class SQLTest(fixtures.TestBase, AssertsCompiledSQL):
'CREATE TABLE sometable (assigned_id '
'INTEGER NOT NULL, id INTEGER NOT NULL '
'AUTO_INCREMENT, PRIMARY KEY (assigned_id, '
'id), KEY `idx_autoinc_id`(`id`))ENGINE=Inn'
'id), KEY `idx_autoinc_id`(id))ENGINE=Inn'
'oDB')
t1 = Table('sometable', MetaData(), Column('assigned_id',
@@ -1424,6 +1424,22 @@ class SQLTest(fixtures.TestBase, AssertsCompiledSQL):
'INTEGER NOT NULL, PRIMARY KEY '
'(assigned_id, id))ENGINE=InnoDB')
def test_innodb_autoincrement_reserved_word_column_name(self):
t1 = Table(
'sometable', MetaData(),
Column('id', Integer(), primary_key=True, autoincrement=False),
Column('order', Integer(), primary_key=True, autoincrement=True),
mysql_engine='InnoDB')
self.assert_compile(
schema.CreateTable(t1),
'CREATE TABLE sometable ('
'id INTEGER NOT NULL, '
'`order` INTEGER NOT NULL AUTO_INCREMENT, '
'PRIMARY KEY (id, `order`), '
'KEY `idx_autoinc_order`(`order`)'
')ENGINE=InnoDB')
class SQLModeDetectionTest(fixtures.TestBase):
__only_on__ = 'mysql'