Refactor MetaData test case to remove use of naming_conventions

Push minimum SQLAlchemy version back down to 0.8.0
Reflect in CHANGES

Author: immunda

CHANGES

@@ -11,8 +11,8 @@ In development, codename Dubnium
 
 - Added support for custom ``query_class`` and ``model_class`` as args
   to the ``SQLAlchemy`` constructor.
-- Fix minimum SQLAlchemy version requirement (0.9.2 or above), introduced
-  by custom MetaData support in 2.1.
+- Fix minimum SQLAlchemy version requirement (0.8 or above), due to use
+  of ``sqlalchemy.inspect``.
 
 Version 2.1
 -----------

docs/config.rst

@@ -119,13 +119,12 @@ You can optionally construct the :class:`SQLAlchemy` object with a custom
 :class:`~sqlalchemy.schema.MetaData` object.
 This allows you to, among other things,
 specify a `custom constraint naming convention
-<http://docs.sqlalchemy.org/en/latest/core/constraints.html#constraint-naming-conventions>`_.
+<http://docs.sqlalchemy.org/en/latest/core/constraints.html#constraint-naming-conventions>`_
+in conjunction with SQLAlchemy 0.9.2 or higher.
 Doing so is important for dealing with database migrations (for instance using
 `alembic <https://alembic.readthedocs.org>`_ as stated
-`here <http://alembic.readthedocs.org/en/latest/naming.html>`_. Since SQL
-defines no standard naming conventions, there is no guaranteed nor effective
-compatibility by default among database implementations. You can define a
-custom naming convention like this as suggested by the SQLAlchemy docs::
+`here <http://alembic.readthedocs.org/en/latest/naming.html>`_. Here's an
+example, as suggested by the SQLAlchemy docs::
 
     from sqlalchemy import MetaData
     from flask import Flask

setup.py

@@ -31,7 +31,7 @@
     platforms='any',
     install_requires=[
         'Flask>=0.10',
-        'SQLAlchemy>=0.9.2'
+        'SQLAlchemy>=0.8.0'
     ],
     test_suite='test_sqlalchemy.suite',
     classifiers=[

test_sqlalchemy.py

@@ -82,25 +82,15 @@ def test_helper_api(self):
         self.assertEqual(self.db.metadata, self.db.Model.metadata)
 
 
-class CustomMetaDataTestCase(unittest.TestCase):
+class MetaDataTestCase(unittest.TestCase):
 
     def setUp(self):
         self.app = flask.Flask(__name__)
         self.app.config['SQLALCHEMY_ENGINE'] = 'sqlite://'
         self.app.config['TESTING'] = True
 
-    def test_custom_metadata_positive(self):
-
-        convention = {
-            "ix": 'ix_%(column_0_label)s',
-            "uq": "uq_%(table_name)s_%(column_0_name)s",
-            "ck": "ck_%(table_name)s_%(constraint_name)s",
-            "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
-            "pk": "pk_%(table_name)s"
-        }
-
-        metadata = MetaData(naming_convention=convention)
-        db = sqlalchemy.SQLAlchemy(self.app, metadata=metadata)
+    def test_default_metadata(self):
+        db = sqlalchemy.SQLAlchemy(self.app, metadata=None)
         self.db = db
 
         class One(db.Model):
@@ -112,15 +102,19 @@ class Two(db.Model):
             one_id = db.Column(db.Integer, db.ForeignKey(One.id))
             myunique = db.Column(db.Integer, unique=True)
 
-        self.assertEqual(list(One.__table__.constraints)[0].name, 'pk_one')
-        self.assertEqual(list(One.__table__.indexes)[0].name, 'ix_one_myindex')
+        self.assertTrue(One.metadata.__class__ is MetaData)
+        self.assertTrue(Two.metadata.__class__ is MetaData)
 
-        self.assertTrue('fk_two_one_id_one' in [c.name for c in Two.__table__.constraints])
-        self.assertTrue('uq_two_myunique' in [c.name for c in Two.__table__.constraints])
-        self.assertTrue('pk_two' in [c.name for c in Two.__table__.constraints])
+        self.assertEqual(One.__table__.schema, None)
+        self.assertEqual(Two.__table__.schema, None)
 
-    def test_custom_metadata_negative(self):
-        db = sqlalchemy.SQLAlchemy(self.app, metadata=None)
+    def test_custom_metadata(self):
+
+        class CustomMetaData(MetaData):
+            pass
+
+        custom_metadata = CustomMetaData(schema="test_schema")
+        db = sqlalchemy.SQLAlchemy(self.app, metadata=custom_metadata)
         self.db = db
 
         class One(db.Model):
@@ -132,11 +126,17 @@ class Two(db.Model):
             one_id = db.Column(db.Integer, db.ForeignKey(One.id))
             myunique = db.Column(db.Integer, unique=True)
 
-        self.assertNotEqual(list(One.__table__.constraints)[0].name, 'pk_one')
+        self.assertIs(One.metadata, custom_metadata)
+        self.assertIs(Two.metadata, custom_metadata)
+
+        self.assertFalse(One.metadata.__class__ is MetaData)
+        self.assertTrue(One.metadata.__class__ is CustomMetaData)
+
+        self.assertFalse(Two.metadata.__class__ is MetaData)
+        self.assertTrue(Two.metadata.__class__ is CustomMetaData)
 
-        self.assertFalse('fk_two_one_id_one' in [c.name for c in Two.__table__.constraints])
-        self.assertFalse('uq_two_myunique' in [c.name for c in Two.__table__.constraints])
-        self.assertFalse('pk_two' in [c.name for c in Two.__table__.constraints])
+        self.assertEqual(One.__table__.schema, "test_schema")
+        self.assertEqual(Two.__table__.schema, "test_schema")
 
 
 class TestQueryProperty(unittest.TestCase):
@@ -748,7 +748,7 @@ class QazWsx(db.Model):
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(BasicAppTestCase))
-    suite.addTest(unittest.makeSuite(CustomMetaDataTestCase))
+    suite.addTest(unittest.makeSuite(MetaDataTestCase))
     suite.addTest(unittest.makeSuite(TestQueryProperty))
     suite.addTest(unittest.makeSuite(TablenameTestCase))
     suite.addTest(unittest.makeSuite(PaginationTestCase))