From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 8 Dec 2015 18:49:56 +0000 (-0500)
Subject: - fix changelog for #3602
X-Git-Tag: rel_1_1_0b1~84^2~70^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a1129e79e0cd938da3e7737b190f7f4db3ed63;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fix changelog for #3602
- add version switch for backend fsp test

(cherry picked from commit 67b22cee3ab2c17b61100f1ccd69081082c0f074)
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 3e7f6fd29b..21a8f3e6fd 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -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::
diff --git a/test/dialect/mysql/test_reflection.py b/test/dialect/mysql/test_reflection.py
index 351eacea54..a288762625 100644
--- a/test/dialect/mysql/test_reflection.py
+++ b/test/dialect/mysql/test_reflection.py
@@ -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:
diff --git a/test/requirements.py b/test/requirements.py
index fa69a62f10..ff93a9c3d8 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -865,6 +865,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)