]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- fix changelog for #3602
authorMike Bayer <mike_mp@zzzcomputing.com>
Tue, 8 Dec 2015 18:49:56 +0000 (13:49 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Tue, 8 Dec 2015 18:49:56 +0000 (13:49 -0500)
- add version switch for backend fsp test

doc/build/changelog/changelog_10.rst
test/dialect/mysql/test_reflection.py
test/requirements.py

index 3e7f6fd29b17a91ec2ff5afc41249f12cfdc14fe..21a8f3e6fddc255bb5a0f31df2168502f4c130f7 100644 (file)
@@ -26,7 +26,7 @@
         Fixed bug in MySQL reflection where the "fractional sections portion"
         of the :class:`.mysql.DATETIME`, :class:`.mysql.TIMESTAMP` and
         :class:`.mysql.TIME` types would be incorrectly placed into the
-        ``timestamp`` attribute, which is unused by MySQL, instead of the
+        ``timezone`` attribute, which is unused by MySQL, instead of the
         ``fsp`` attribute.
 
     .. change::
index 01fd60db30c28586e90483e74aa7d210137b744e..172b8edaff296bd7cb99ce8bb608b45ddce0b120 100644 (file)
@@ -71,11 +71,16 @@ class TypeReflectionTest(fixtures.TestBase):
     def test_time_types(self):
         specs = []
 
+        if testing.requires.mysql_fsp.enabled:
+            fsps = [None, 0, 5]
+        else:
+            fsps = [None]
+
         for type_ in (mysql.TIMESTAMP, mysql.DATETIME, mysql.TIME):
             # MySQL defaults fsp to 0, and if 0 does not report it.
             # we don't actually render 0 right now in DDL but even if we do,
             # it comes back blank
-            for fsp in (None, 0, 5):
+            for fsp in fsps:
                 if fsp:
                     specs.append((type_(fsp=fsp), type_(fsp=fsp)))
                 else:
index db4daca20ae28bb4b069aa5b9065d0d0d8db4cc4..f7db7a4d42015d780492b87a966aec42b91d43ec 100644 (file)
@@ -840,6 +840,10 @@ class DefaultRequirements(SuiteRequirements):
         """target driver must support the literal statement 'select 1'"""
         return skip_if(["oracle", "firebird"], "non-standard SELECT scalar syntax")
 
+    @property
+    def mysql_fsp(self):
+        return only_if('mysql >= 5.6.4')
+
     @property
     def mysql_fully_case_sensitive(self):
         return only_if(self._has_mysql_fully_case_sensitive)