]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Default server_version_info to (0, )
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 11 May 2018 13:19:10 +0000 (09:19 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 11 May 2018 13:23:18 +0000 (09:23 -0400)
Fixed a bug in the test suite where if an external dialect returned
``None`` for ``server_version_info``, the exclusion logic would raise an
``AttributeError``.

Change-Id: I9124d3ac5484941081127274e6eb71f392fb94f7
Fixes: #4249
doc/build/changelog/unreleased_12/4249.rst [new file with mode: 0644]
lib/sqlalchemy/testing/exclusions.py
lib/sqlalchemy/testing/plugin/plugin_base.py

diff --git a/doc/build/changelog/unreleased_12/4249.rst b/doc/build/changelog/unreleased_12/4249.rst
new file mode 100644 (file)
index 0000000..11f346e
--- /dev/null
@@ -0,0 +1,8 @@
+.. change::
+       :tags: bug, tests
+       :tickets: 4249
+       :versions: 1.3.0b1
+
+       Fixed a bug in the test suite where if an external dialect returned
+       ``None`` for ``server_version_info``, the exclusion logic would raise an
+       ``AttributeError``.
index 8a10cf5ab150bc019d43037f872d513912a89840..65b70a5a317c3e30d584746da4a5433dee6becd6 100644 (file)
@@ -381,7 +381,9 @@ def _server_version(engine):
 
     # force metadata to be retrieved
     conn = engine.connect()
-    version = getattr(engine.dialect, 'server_version_info', ())
+    version = getattr(engine.dialect, 'server_version_info', None)
+    if version is None:
+        version = ()
     conn.close()
     return version
 
index 1f74321a8b39caf67c786f91febbbba2b58148e0..8939ff7c65651ac91fbeb4091d170196bb5a1e37 100644 (file)
@@ -561,7 +561,7 @@ def _do_skips(cls):
                     config_obj.db.name,
                     ".".join(
                         str(dig) for dig in
-                        config_obj.db.dialect.server_version_info),
+                        exclusions._server_version(config_obj.db)),
                     config_obj.db.driver
                 )
               for config_obj in config.Config.all_configs()