Include DateTime.timezone in autogen type comparisons

Change-Id: I2e5b380625ec45d5ebc0bc74daf9cf9e05f0155a
Pull-request: https://github.com/zzzeek/alembic/pull/26

diff --git a/alembic/ddl/impl.py b/alembic/ddl/impl.py
index d87a2fcb0ae6da29022e7bdb21605001e6c28aea..56b4d59c9ca065222d3d23d108fdef7b19800e9b 100644 (file)
--- a/alembic/ddl/impl.py
+++ b/alembic/ddl/impl.py
@@ -350,8 +350,16 @@ def _integer_compare(t1, t2):
     )
     return t1_small_or_big != t2_small_or_big
 
+
+def _datetime_compare(t1, t2):
+    return (
+        t1.timezone != t2.timezone
+    )
+
+
 _type_comparators = {
     sqltypes.String: _string_compare,
     sqltypes.Numeric: _numeric_compare,
-    sqltypes.Integer: _integer_compare
+    sqltypes.Integer: _integer_compare,
+    sqltypes.DateTime: _datetime_compare,
 }

diff --git a/docs/build/changelog.rst b/docs/build/changelog.rst
index ebd54fdace9daec96d4866443a4bd48c167404f4..cd9ce411db1e3ec0ca5eccc89298511faf1f3379 100644 (file)
--- a/docs/build/changelog.rst
+++ b/docs/build/changelog.rst
@@ -15,6 +15,13 @@ Changelog
       :paramref:`.op.alter_column.postgresql_using`
       parameter.  Pull request courtesy Frazer McLean.
 
+    .. change:
+      :tags: feature, autogenerate
+
+      Autogenerate with type comparison enabled will pick up on the timezone
+      setting changing between DateTime types.   Pull request courtesy
+      David Szotten.
+
 .. changelog::
     :version: 0.8.7
     :released: July 26, 2016

diff --git a/tests/test_autogen_diffs.py b/tests/test_autogen_diffs.py
index c2c385de395813161849ec3bbf71f0d37ec2583a..04c9e9671511c87c3ec66b9742bd51de7159108d 100644 (file)
--- a/tests/test_autogen_diffs.py
+++ b/tests/test_autogen_diffs.py
@@ -630,6 +630,16 @@ class CompareTypeSpecificityTest(TestBase):
         is_(impl.compare_type(Column('x', t5), Column('x', t2)), True)
         is_(impl.compare_type(Column('x', t1), Column('x', t4)), True)
 
+    def test_datetime(self):
+        t1 = DateTime()
+        t2 = DateTime(timezone=False)
+        t3 = DateTime(timezone=True)
+
+        impl = self._fixture()
+        is_(impl.compare_type(Column('x', t1), Column('x', t2)), False)
+        is_(impl.compare_type(Column('x', t1), Column('x', t3)), True)
+        is_(impl.compare_type(Column('x', t2), Column('x', t3)), True)
+
 
 class AutogenerateCustomCompareTypeTest(AutogenTest, TestBase):
     __only_on__ = 'sqlite'