summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/mysql
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/dialects/mysql')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 01f8b13a7..e0610ec7e 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1318,10 +1318,14 @@ class MySQLDDLCompiler(compiler.DDLCompiler):
default = self.get_column_default_string(column)
if default is not None:
colspec.append('DEFAULT ' + default)
-
- if not column.nullable:
+
+ is_timestamp = isinstance(column.type, sqltypes.TIMESTAMP)
+ if not column.nullable and not is_timestamp:
colspec.append('NOT NULL')
+ elif column.nullable and is_timestamp and default is None:
+ colspec.append('NULL')
+
if column.primary_key and column.autoincrement:
try:
first = [c for c in column.table.primary_key.columns