fix convert_unicode deprecation warning

rsyring · rsyring · commit 150c1339387c · 2019-04-17T18:00:25.000-04:00
refs pallets-eco#681 refs pallets-eco#671
diff --git a/flask_sqlalchemy/__init__.py b/flask_sqlalchemy/__init__.py
@@ -567,7 +567,8 @@ def get_engine(self):
             return rv
 
     def get_options(self, sa_url, echo):
-        options = {'convert_unicode': True}
+        options = {}
+
         self._sa.apply_pool_defaults(self._app, options)
         self._sa.apply_driver_hacks(self._app, sa_url, options)
         if echo:
diff --git a/flask_sqlalchemy/utils.py b/flask_sqlalchemy/utils.py
@@ -0,0 +1,20 @@
+
+from pkg_resources import parse_version
+import sqlalchemy
+
+
+def sqlalchemy_version(op, val):
+    sa_ver = parse_version(sqlalchemy.__version__)
+    target_ver = parse_version(val)
+
+    assert op in ('<', '>', '<=', '>=', '=='), 'op {} not supported'.format(op)
+
+    if op == '<':
+        return sa_ver < target_ver
+    if op == '>':
+        return sa_ver > target_ver
+    if op == '<=':
+        return sa_ver <= target_ver
+    if op == '>=':
+        return sa_ver >= target_ver
+    return sa_ver == target_ver
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -66,11 +66,12 @@ def test_uri_binds_warning(self, app, recwarn):
                  ' "sqlite:///:memory:".'
         assert recwarn[0].message.args[0] == expect
 
-    def test_engine_creation_ok(self, app):
+    def test_engine_creation_ok(self, app, recwarn):
         """ create_engine() isn't called until needed.  Let's make sure we can do that without
-            errors.
+            errors or warnings.
         """
         assert fsa.SQLAlchemy(app).get_engine()
+        assert len(recwarn) == 0
 
 
 @pytest.fixture
@@ -103,11 +104,13 @@ def test_engine_echo_true(self, m_create_engine, app_nr):
         args, options = m_create_engine.call_args
         assert options['echo'] is True
 
-    def test_convert_unicode_default(self, m_create_engine, app_nr):
+    @mock.patch.object(fsa.utils, 'sqlalchemy')
+    def test_convert_unicode_default_sa_13(self, m_sqlalchemy, m_create_engine, app_nr):
+        m_sqlalchemy.__version__ = '1.3'
         fsa.SQLAlchemy(app_nr).get_engine()
 
         args, options = m_create_engine.call_args
-        assert options['convert_unicode'] is True
+        assert 'convert_unicode' not in options
 
     def test_config_from_engine_options(self, m_create_engine, app_nr):
         app_nr.config['SQLALCHEMY_ENGINE_OPTIONS'] = {'foo': 'bar'}
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -0,0 +1,24 @@
+import mock
+
+from flask_sqlalchemy import utils
+
+
+class TestSQLAlchemyVersion:
+
+    @mock.patch.object(utils, 'sqlalchemy')
+    def test_sqlalchemy_version(self, m_sqlalchemy):
+        m_sqlalchemy.__version__ = '1.3'
+
+        assert not utils.sqlalchemy_version('<', '1.3')
+        assert not utils.sqlalchemy_version('>', '1.3')
+        assert utils.sqlalchemy_version('<=', '1.3')
+        assert utils.sqlalchemy_version('==', '1.3')
+        assert utils.sqlalchemy_version('>=', '1.3')
+
+        m_sqlalchemy.__version__ = '1.2.99'
+
+        assert utils.sqlalchemy_version('<', '1.3')
+        assert not utils.sqlalchemy_version('>', '1.3')
+        assert utils.sqlalchemy_version('<=', '1.3')
+        assert not utils.sqlalchemy_version('==', '1.3')
+        assert not utils.sqlalchemy_version('>=', '1.3')
