summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/schema.py4
-rw-r--r--lib/sqlalchemy/test/testing.py8
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 7af4d39d4..9bebf46c9 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -782,6 +782,10 @@ class Column(SchemaItem, expression.ColumnClause):
quote=self.quote,
index=self.index,
autoincrement=self.autoincrement,
+ default=self.default,
+ server_default=self.server_default,
+ onupdate=self.onupdate,
+ server_onupdate=self.server_onupdate,
*[c.copy(**kw) for c in self.constraints])
def _make_proxy(self, selectable, name=None):
diff --git a/lib/sqlalchemy/test/testing.py b/lib/sqlalchemy/test/testing.py
index 91e9c68ae..3689ca0b7 100644
--- a/lib/sqlalchemy/test/testing.py
+++ b/lib/sqlalchemy/test/testing.py
@@ -631,15 +631,9 @@ class ComparesTables(object):
eq_(c.type.length, reflected_c.type.length)
eq_(set([f.column.name for f in c.foreign_keys]), set([f.column.name for f in reflected_c.foreign_keys]))
- if c.default:
+ if c.server_default:
assert isinstance(reflected_c.server_default,
schema.FetchedValue)
- elif against(('mysql', '<', (5, 0))):
- # ignore reflection of bogus db-generated DefaultClause()
- pass
- elif not c.primary_key or not against('postgresql', 'mssql'):
- #print repr(c)
- assert reflected_c.default is None, reflected_c.default
assert len(table.primary_key) == len(reflected_table.primary_key)
for c in table.primary_key: