diff options
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/schema.py | 8 | ||||
| -rw-r--r-- | test/sql/test_defaults.py | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 61dd99b85..8b8380471 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -1309,7 +1309,7 @@ class MySQLDDLCompiler(compiler.DDLCompiler): elif column.nullable and is_timestamp and default is None: colspec.append('NULL') - if column is column.table._autoincrement_column: + if column is column.table._autoincrement_column and column.server_default is None: colspec.append('AUTO_INCREMENT') return ' '.join(colspec) diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index a81874500..a530a1a7a 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -325,9 +325,11 @@ class Table(SchemaItem, expression.TableClause): if col.autoincrement and \ issubclass(col.type._type_affinity, types.Integer) and \ not col.foreign_keys and \ - isinstance(col.default, (type(None), Sequence)) and \ - col.server_default is None: - + isinstance(col.default, (type(None), Sequence)): + # don't look at server_default here since different backends may + # or may not have a server_default, e.g. postgresql reflected + # SERIAL cols will have a DefaultClause here but are still + # autoincrement. return col @property diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py index 49aa8d3b3..7822e487c 100644 --- a/test/sql/test_defaults.py +++ b/test/sql/test_defaults.py @@ -746,7 +746,6 @@ class SpecialTypePKTest(testing.TestBase): self._run_test(Sequence('foo_seq')) @testing.fails_on('mysql', "Pending [ticket:2021]") - @testing.fails_on('sqlite', "Pending [ticket:2021]") def test_server_default(self): # note that the MySQL dialect has to not render AUTOINCREMENT on this one self._run_test(server_default='1',) |