Merge pull request #34 from CloverHealth/nullable-columns-funhouse

fix migrations for upgrading

Author: multigl

.travis.yml

@@ -38,10 +38,6 @@ matrix:
       addons:
         postgresql: 9.5
       env: PG=9.5
-    - python: 3.3
-      addons:
-        postgresql: 9.5
-      env: PG=9.5
 
 script: python setup.py test
 

setup.py

@@ -3,8 +3,8 @@
 import sys
 import setuptools
 
-if sys.version_info < (3, 3):
-    raise Exception('Python version < 3.3 are not supported.')
+if sys.version_info < (3, 4):
+    raise Exception('Python version < 3.4 are not supported.')
 
 # Get version information without importing the package
 __version__ = None

temporal_sqlalchemy/clock.py

@@ -195,14 +195,15 @@ def build_clock_table(entity_table: sa.Table,
                   primary_key=True),
         sa.Column('tick',
                   sa.Integer,
+                  nullable=False,
                   autoincrement=False),
         sa.Column('timestamp',
                   sa.DateTime(True),
                   server_default=sa.func.current_timestamp()),
         schema=schema)
 
     entity_keys = set()
-    for fk in util.foreign_key_to(entity_table):
+    for fk in util.foreign_key_to(entity_table, nullable=False):
         # this is done to support arbitrary primary key shape on entity
         clock_table.append_column(fk)
         entity_keys.add(fk.key)
@@ -225,7 +226,7 @@ def build_clock_table(entity_table: sa.Table,
             activity_keys.add(fk.key)
         # ensure we have DB constraint on clock <> activity uniqueness
         clock_table.append_constraint(
-            sa.UniqueConstraint(*(entity_keys | activity_keys))
+            sa.UniqueConstraint(*(activity_keys | entity_keys))
         )
 
     return clock_table

temporal_sqlalchemy/version.py

@@ -1,2 +1,2 @@
 """Version information."""
-__version__ = '0.4.0'
+__version__ = '0.4.1'

test-requirements.txt

@@ -1,4 +1,4 @@
 pytest>=3.0.0
-pytest-cov>=2.4.0
+pytest-cov>=2.5.0
 python-coveralls>=2.9.0
 testing.postgresql>=1.3.0