- still attempt to exclude mariadb 10.2 from this test for older

SQLAlchemy versions

Change-Id: I38aaa14cae326206f4d2c0f22150336957187de7

diff --git a/alembic/testing/requirements.py b/alembic/testing/requirements.py
index 6f8014cd8086e4ddfbf0144cdf28cb803b1b0920..7564b06e8054db0281c3d8d01e5daf40f4cac0f3 100644 (file)
--- a/alembic/testing/requirements.py
+++ b/alembic/testing/requirements.py
@@ -165,6 +165,13 @@ class SuiteRequirements(Requirements):
             "SQLAlchemy 1.0.14 or greater required"
         )
 
+    @property
+    def sqlalchemy_1115(self):
+        return exclusions.skip_if(
+            lambda config: not util.sqla_1115,
+            "SQLAlchemy 1.1.15 or greater required"
+        )
+
     @property
     def sqlalchemy_110(self):
         return exclusions.skip_if(

diff --git a/alembic/util/__init__.py b/alembic/util/__init__.py
index 69b652fe5e915e50d57875ea9cebe694d1d5094a..8b5d8c78b97a02eaa948eee8c81363d8529d05a0 100644 (file)
--- a/alembic/util/__init__.py
+++ b/alembic/util/__init__.py
@@ -8,7 +8,8 @@ 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_110, sqla_1010, sqla_1014)
+    sqla_094, sqla_099, sqla_100, sqla_105, sqla_110, sqla_1010, sqla_1014,
+    sqla_1115)
 from .exc import CommandError
 
 

diff --git a/alembic/util/sqla_compat.py b/alembic/util/sqla_compat.py
index b90316a52f79a15936fa7438eb69233b3e1f7edb..2a337658914da4f712684eb0b2ac04d2a079122a 100644 (file)
--- a/alembic/util/sqla_compat.py
+++ b/alembic/util/sqla_compat.py
@@ -31,6 +31,7 @@ sqla_105 = _vers >= (1, 0, 5)
 sqla_1010 = _vers >= (1, 0, 10)
 sqla_110 = _vers >= (1, 1, 0)
 sqla_1014 = _vers >= (1, 0, 14)
+sqla_1115 = _vers >= (1, 1, 15)
 
 if sqla_08:
     from sqlalchemy.sql.expression import TextClause

diff --git a/tests/requirements.py b/tests/requirements.py
index 660ae21aaa2ab607bb18eea99de2e098482551a1..d3f8cbea21af29a9da22423def1b7ae3efc2792a 100644 (file)
--- a/tests/requirements.py
+++ b/tests/requirements.py
@@ -125,6 +125,13 @@ class DefaultRequirements(SuiteRequirements):
         """if a compare of Integer and BigInteger is supported yet."""
         return exclusions.skip_if(["oracle"], "not supported by alembic impl")
 
+    @property
+    def mysql_timestamp_reflection(self):
+        def go(config):
+            return not self._mariadb_102(config) \
+                or self.sqlalchemy_1115.enabled
+        return exclusions.only_if(go)
+
     def _mariadb_102(self, config):
         return exclusions.against(config, "mysql") and \
             sqla_compat._is_mariadb(config.db.dialect) and \

diff --git a/tests/test_mysql.py b/tests/test_mysql.py
index 212abab60b730dab4dd3f44c606d2d3de22ec3c3..ac20f9bcaba59047964e98d1814f8c5c3cd7791f 100644 (file)
--- a/tests/test_mysql.py
+++ b/tests/test_mysql.py
@@ -219,6 +219,8 @@ class MySQLDefaultCompareTest(TestBase):
     __only_on__ = 'mysql'
     __backend__ = True
 
+    __requires__ = 'mysql_timestamp_reflection',
+
     @classmethod
     def setup_class(cls):
         cls.bind = config.db