Merge branch 'patch-1' of https://github.com/jplaverdure/sqlalchemy into t

1 files changed, 5 insertions, 3 deletions

diff --git a/examples/versioned_history/history_meta.py b/examples/versioned_history/history_meta.py
index 04cb4e1aa..20631e369 100644
--- a/examples/versioned_history/history_meta.py
+++ b/examples/versioned_history/history_meta.py
@@ -3,7 +3,7 @@
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import mapper, class_mapper, attributes, object_mapper
 from sqlalchemy.orm.exc import UnmappedClassError, UnmappedColumnError
-from sqlalchemy import Table, Column, ForeignKeyConstraint, Integer
+from sqlalchemy import Table, Column, ForeignKeyConstraint, Integer, DateTime
 from sqlalchemy import event
 from sqlalchemy.orm.properties import RelationshipProperty
 
@@ -48,14 +48,16 @@ def _history_mapper(local_mapper):
         if super_mapper:
             super_fks.append(('version', super_history_mapper.local_table.c.version))
             cols.append(Column('version', Integer, primary_key=True, autoincrement=False))
+            cols.append(Column('changed', DateTime, default=datetime.datetime.utcnow))
         else:
             cols.append(Column('version', Integer, primary_key=True, autoincrement=False))
+            cols.append(Column('changed', DateTime, default=datetime.datetime.utcnow))
 
         if super_fks:
             cols.append(ForeignKeyConstraint(*zip(*super_fks)))
 
         table = Table(local_mapper.local_table.name + '_history', local_mapper.local_table.metadata,
-           *cols
+           *cols, schema=local_mapper.local_table.schema
         )
     else:
         # single table inheritance.  take any additional columns that may have
@@ -120,7 +122,7 @@ def create_version(obj, session, deleted = False):
             continue
 
         for hist_col in hm.local_table.c:
-            if hist_col.key == 'version':
+            if hist_col.key == 'version' or hist_col.key == 'changed':
                 continue
 
             obj_col = om.local_table.c[hist_col.key]