- convert @provide_metadata to use self access

- having occasional issues with BasicEntity grabbing, if it persists
may have to pass an explicit base class into setup_classes()/setup_mappers()

3 files changed, 23 insertions, 13 deletions

diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py
index 74998a77c..2ba131ddc 100644
--- a/test/sql/test_defaults.py
+++ b/test/sql/test_defaults.py
@@ -652,6 +652,7 @@ class SequenceExecTest(testing.TestBase):
     def test_func_embedded_whereclause(self):
         """test can use next_value() in whereclause"""
 
+        metadata = self.metadata
         t1 = Table('t', metadata,
             Column('x', Integer)
         )
@@ -669,6 +670,7 @@ class SequenceExecTest(testing.TestBase):
     def test_func_embedded_valuesbase(self):
         """test can use next_value() in values() of _ValuesBase"""
 
+        metadata = self.metadata
         t1 = Table('t', metadata,
             Column('x', Integer)
         )
@@ -686,6 +688,7 @@ class SequenceExecTest(testing.TestBase):
         """test inserted_primary_key contains [None] when 
         pk_col=next_value(), implicit returning is not used."""
 
+        metadata = self.metadata
         e = engines.testing_engine(options={'implicit_returning':False})
         s = Sequence("my_sequence")
         metadata.bind = e
@@ -704,6 +707,7 @@ class SequenceExecTest(testing.TestBase):
         """test inserted_primary_key contains the result when 
         pk_col=next_value(), when implicit returning is used."""
 
+        metadata = self.metadata
         e = engines.testing_engine(options={'implicit_returning':True})
         s = Sequence("my_sequence")
         metadata.bind = e
@@ -800,6 +804,7 @@ class SequenceTest(testing.TestBase, testing.AssertsCompiledSQL):
 
     @testing.provide_metadata
     def test_table_overrides_metadata_create(self):
+        metadata = self.metadata
         s1 = Sequence("s1", metadata=metadata)
         s2 = Sequence("s2", metadata=metadata)
         s3 = Sequence("s3")
@@ -915,6 +920,7 @@ class SpecialTypePKTest(testing.TestBase):
 
     @testing.provide_metadata
     def _run_test(self, *arg, **kw):
+        metadata = self.metadata
         implicit_returning = kw.pop('implicit_returning', True)
         kw['primary_key'] = True
         if kw.get('autoincrement', True):
@@ -983,6 +989,7 @@ class ServerDefaultsOnPKTest(testing.TestBase):
         like this.   Testing that all backends do the same thing here.
 
         """
+        metadata = self.metadata
         t = Table('x', metadata, 
                 Column('y', String(10), server_default='key_one', primary_key=True),
                 Column('data', String(10)),
@@ -1000,6 +1007,7 @@ class ServerDefaultsOnPKTest(testing.TestBase):
     @testing.provide_metadata
     def test_string_default_on_insert_with_returning(self):
         """With implicit_returning, we get a string PK default back no problem."""
+        metadata = self.metadata
         t = Table('x', metadata, 
                 Column('y', String(10), server_default='key_one', primary_key=True),
                 Column('data', String(10))
@@ -1014,6 +1022,7 @@ class ServerDefaultsOnPKTest(testing.TestBase):
 
     @testing.provide_metadata
     def test_int_default_none_on_insert(self):
+        metadata = self.metadata
         t = Table('x', metadata, 
                 Column('y', Integer, 
                         server_default='5', primary_key=True),
@@ -1036,6 +1045,7 @@ class ServerDefaultsOnPKTest(testing.TestBase):
             )
     @testing.provide_metadata
     def test_autoincrement_reflected_from_server_default(self):
+        metadata = self.metadata
         t = Table('x', metadata, 
                 Column('y', Integer, 
                         server_default='5', primary_key=True),
@@ -1051,6 +1061,7 @@ class ServerDefaultsOnPKTest(testing.TestBase):
 
     @testing.provide_metadata
     def test_int_default_none_on_insert_reflected(self):
+        metadata = self.metadata
         t = Table('x', metadata, 
                 Column('y', Integer, 
                         server_default='5', primary_key=True),
@@ -1078,6 +1089,7 @@ class ServerDefaultsOnPKTest(testing.TestBase):
     @testing.requires.returning
     @testing.provide_metadata
     def test_int_default_on_insert_with_returning(self):
+        metadata = self.metadata
         t = Table('x', metadata, 
                 Column('y', Integer, 
                         server_default='5', primary_key=True),
diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py
index 09f1869a4..7040cacff 100644
--- a/test/sql/test_metadata.py
+++ b/test/sql/test_metadata.py
@@ -130,6 +130,7 @@ class MetaDataTest(TestBase, ComparesTables):
 
     @testing.provide_metadata
     def test_dupe_tables(self):
+        metadata = self.metadata
         t1 = Table('table1', metadata, 
             Column('col1', Integer, primary_key=True),
             Column('col2', String(20)))
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index adfe2a8a9..9c8f66328 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -14,6 +14,7 @@ from test.lib import *
 from test.lib.util import picklers
 from sqlalchemy.util.compat import decimal
 from test.lib.util import round_decimal
+from test.engine import _base
 
 class AdaptTest(TestBase):
     def _all_dialect_modules(self):
@@ -182,12 +183,11 @@ class PickleMetadataTest(TestBase):
                 mt = loads(dumps(meta))
 
 
-class UserDefinedTest(TestBase, AssertsCompiledSQL):
+class UserDefinedTest(_base.TablesTest, AssertsCompiledSQL):
     """tests user-defined types."""
 
     def test_processing(self):
-
-        global users
+        users = self.tables.users
         users.insert().execute(
             user_id=2, goofy='jack', goofy2='jack', goofy4=u'jack',
             goofy7=u'jack', goofy8=12, goofy9=12)
@@ -270,6 +270,7 @@ class UserDefinedTest(TestBase, AssertsCompiledSQL):
     def test_type_coerce(self):
         """test ad-hoc usage of custom types with type_coerce()."""
 
+        metadata = self.metadata
         class MyType(types.TypeDecorator):
             impl = String
 
@@ -323,9 +324,7 @@ class UserDefinedTest(TestBase, AssertsCompiledSQL):
         )
 
     @classmethod
-    def setup_class(cls):
-        global users, metadata
-
+    def define_tables(cls, metadata):
         class MyType(types.UserDefinedType):
             def get_col_spec(self):
                 return "VARCHAR(100)"
@@ -409,8 +408,7 @@ class UserDefinedTest(TestBase, AssertsCompiledSQL):
             def copy(self):
                 return MyUnicodeType(self.impl.length)
 
-        metadata = MetaData(testing.db)
-        users = Table('type_users', metadata,
+        Table('users', metadata,
             Column('user_id', Integer, primary_key = True),
             # totall custom type
             Column('goofy', MyType, nullable = False),
@@ -424,11 +422,6 @@ class UserDefinedTest(TestBase, AssertsCompiledSQL):
             Column('goofy9', MyNewIntSubClass, nullable = False),
         )
 
-        metadata.create_all()
-
-    @classmethod
-    def teardown_class(cls):
-        metadata.drop_all()
 
 class UnicodeTest(TestBase, AssertsExecutionResults):
     """tests the Unicode type.  also tests the TypeDecorator with instances in the types package."""
@@ -1465,6 +1458,7 @@ class NumericRawSQLTest(TestBase):
     @testing.fails_on('sqlite', "Doesn't provide Decimal results natively")
     @testing.provide_metadata
     def test_decimal_fp(self):
+        metadata = self.metadata
         t = self._fixture(metadata, Numeric(10, 5), decimal.Decimal("45.5"))
         val = testing.db.execute("select val from t").scalar()
         assert isinstance(val, decimal.Decimal)
@@ -1473,6 +1467,7 @@ class NumericRawSQLTest(TestBase):
     @testing.fails_on('sqlite', "Doesn't provide Decimal results natively")
     @testing.provide_metadata
     def test_decimal_int(self):
+        metadata = self.metadata
         t = self._fixture(metadata, Numeric(10, 5), decimal.Decimal("45"))
         val = testing.db.execute("select val from t").scalar()
         assert isinstance(val, decimal.Decimal)
@@ -1480,6 +1475,7 @@ class NumericRawSQLTest(TestBase):
 
     @testing.provide_metadata
     def test_ints(self):
+        metadata = self.metadata
         t = self._fixture(metadata, Integer, 45)
         val = testing.db.execute("select val from t").scalar()
         assert isinstance(val, (int, long))
@@ -1487,6 +1483,7 @@ class NumericRawSQLTest(TestBase):
 
     @testing.provide_metadata
     def test_float(self):
+        metadata = self.metadata
         t = self._fixture(metadata, Float, 46.583)
         val = testing.db.execute("select val from t").scalar()
         assert isinstance(val, float)