Refactor dialect tests for combinations

Dialect tests tend to have a lot of lists of types,
SQL constructs etc, convert as many of these to @combinations
as possible.

This is exposing that we don't have per-combination
exclusion rules set up which is making things a little bit
cumbersome.

Also set up a fixture that does metadata + DDL.

Change-Id: Ief820e48c9202982b0b1e181b87862490cd7b0c3

4 files changed, 28 insertions, 3 deletions

diff --git a/lib/sqlalchemy/testing/__init__.py b/lib/sqlalchemy/testing/__init__.py
index 4f28461e3..1e506ccb1 100644
--- a/lib/sqlalchemy/testing/__init__.py
+++ b/lib/sqlalchemy/testing/__init__.py
@@ -53,6 +53,7 @@ from .exclusions import skip_if  # noqa
 from .util import adict  # noqa
 from .util import fail  # noqa
 from .util import force_drop_names  # noqa
+from .util import metadata_fixture  # noqa
 from .util import provide_metadata  # noqa
 from .util import rowset  # noqa
 from .util import run_as_contextmanager  # noqa
diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py
index a2f969a66..be1984c9e 100644
--- a/lib/sqlalchemy/testing/plugin/plugin_base.py
+++ b/lib/sqlalchemy/testing/plugin/plugin_base.py
@@ -727,7 +727,7 @@ class FixtureFunctions(ABC):
         raise NotImplementedError()
 
     @abc.abstractmethod
-    def fixture(self, fn):
+    def fixture(self, *arg, **kw):
         raise NotImplementedError()
 
 
diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
index 5d91db5d7..de0f8862a 100644
--- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
+++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
@@ -380,5 +380,5 @@ class PytestFixtureFunctions(plugin_base.FixtureFunctions):
         ident = parameters[0]
         return pytest.param(*parameters[1:], id=ident)
 
-    def fixture(self, fn):
-        return pytest.fixture(fn)
+    def fixture(self, *arg, **kw):
+        return pytest.fixture(*arg, **kw)
diff --git a/lib/sqlalchemy/testing/util.py b/lib/sqlalchemy/testing/util.py
index 219511ea0..64738ad2f 100644
--- a/lib/sqlalchemy/testing/util.py
+++ b/lib/sqlalchemy/testing/util.py
@@ -211,6 +211,30 @@ def provide_metadata(fn, *args, **kw):
         self.metadata = prev_meta
 
 
+def metadata_fixture(ddl="function"):
+    """Provide MetaData for a pytest fixture."""
+
+    from . import config
+
+    def decorate(fn):
+        def run_ddl(self):
+            from sqlalchemy import schema
+
+            metadata = self.metadata = schema.MetaData()
+            try:
+                result = fn(self, metadata)
+                metadata.create_all(config.db)
+                # TODO:
+                # somehow get a per-function dml erase fixture here
+                yield result
+            finally:
+                metadata.drop_all(config.db)
+
+        return config.fixture(scope=ddl)(run_ddl)
+
+    return decorate
+
+
 def force_drop_names(*names):
     """Force the given table names to be dropped after test complete,
     isolating for foreign key cycles