From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 31 Mar 2016 16:35:17 +0000 (-0400)
Subject: - PK names now works w/ sqlite + sqla 1.1
X-Git-Tag: rel_0_8_6~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3820c30e2e20f2d18efc64d13b9e5f1ed6fbbe40;p=thirdparty%2Fsqlalchemy%2Falembic.git

- PK names now works w/ sqlite + sqla 1.1
---

diff --git a/alembic/testing/exclusions.py b/alembic/testing/exclusions.py
index 1fc9693e..85b8c7ce 100644
--- a/alembic/testing/exclusions.py
+++ b/alembic/testing/exclusions.py
@@ -420,7 +420,7 @@ def fails_on(db, reason=None):
 def fails_on_everything_except(*dbs):
     return succeeds_if(
         OrPredicate([
-            SpecPredicate(db) for db in dbs
+            Predicate.as_predicate(db) for db in dbs
         ])
     )
 
diff --git a/alembic/util/__init__.py b/alembic/util/__init__.py
index 780c1a18..e53199bf 100644
--- a/alembic/util/__init__.py
+++ b/alembic/util/__init__.py
@@ -8,7 +8,7 @@ from .pyfiles import (  # noqa
     pyc_file_from_path, load_python_file, edit)
 from .sqla_compat import (  # noqa
     sqla_07, sqla_079, sqla_08, sqla_083, sqla_084, sqla_09, sqla_092,
-    sqla_094, sqla_099, sqla_100, sqla_105)
+    sqla_094, sqla_099, sqla_100, sqla_105, sqla_110)
 
 
 class CommandError(Exception):
diff --git a/alembic/util/sqla_compat.py b/alembic/util/sqla_compat.py
index 88bfa3b2..2d56d3ea 100644
--- a/alembic/util/sqla_compat.py
+++ b/alembic/util/sqla_compat.py
@@ -28,6 +28,7 @@ sqla_094 = _vers >= (0, 9, 4)
 sqla_099 = _vers >= (0, 9, 9)
 sqla_100 = _vers >= (1, 0, 0)
 sqla_105 = _vers >= (1, 0, 5)
+sqla_110 = _vers >= (1, 1, 0)
 
 if sqla_08:
     from sqlalchemy.sql.expression import TextClause
diff --git a/tests/requirements.py b/tests/requirements.py
index 70db3e63..3703963b 100644
--- a/tests/requirements.py
+++ b/tests/requirements.py
@@ -77,7 +77,11 @@ class DefaultRequirements(SuiteRequirements):
         """Target driver reflects the name of primary key constraints."""
 
         return exclusions.fails_on_everything_except(
-            'postgresql', 'oracle', 'mssql', 'sybase')
+            'postgresql', 'oracle', 'mssql', 'sybase',
+            lambda config: (
+                util.sqla_110 and exclusions.against(config, "sqlite")
+            )
+        )
 
     @property
     def postgresql_uuid_ossp(self):