From: Mike Bayer Date: Sun, 27 Mar 2011 19:04:06 +0000 (-0400) Subject: - move all the setup_classes(cls) and setup_mappers(cls) to use a X-Git-Tag: rel_0_7b4~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3083eabf467e7f36db0850342758ce162c3eef8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - move all the setup_classes(cls) and setup_mappers(cls) to use a local cls.Basic, cls.Comparable base class so that there is no ambiguity or hash identity behaviors getting in the way of class registration. --- diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py index d39a954dbc..96457a18a5 100644 --- a/test/aaa_profiling/test_orm.py +++ b/test/aaa_profiling/test_orm.py @@ -23,10 +23,10 @@ class MergeTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Parent(_base.BasicEntity): + class Parent(cls.Basic): pass - class Child(_base.BasicEntity): + class Child(cls.Basic): pass @classmethod @@ -133,10 +133,10 @@ class LoadManyToOneFromIdentityTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Parent(_base.BasicEntity): + class Parent(cls.Basic): pass - class Child(_base.BasicEntity): + class Child(cls.Basic): pass @classmethod diff --git a/test/ext/test_associationproxy.py b/test/ext/test_associationproxy.py index ea30b1fb22..1700282feb 100644 --- a/test/ext/test_associationproxy.py +++ b/test/ext/test_associationproxy.py @@ -1038,7 +1038,7 @@ class ComparatorTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): def __init__(self, name): self.name = name @@ -1051,7 +1051,7 @@ class ComparatorTest(_base.MappedTest): # nonuselist -> uselist singular_keywords = association_proxy('singular', 'keywords') - class Keyword(_base.ComparableEntity): + class Keyword(cls.Comparable): def __init__(self, keyword): self.keyword = keyword @@ -1059,12 +1059,12 @@ class ComparatorTest(_base.MappedTest): # nonuselist -> nonuselist user = association_proxy('user_keyword', 'user') - class UserKeyword(_base.ComparableEntity): + class UserKeyword(cls.Comparable): def __init__(self, user=None, keyword=None): self.user = user self.keyword = keyword - class Singular(_base.ComparableEntity): + class Singular(cls.Comparable): def __init__(self, value=None): self.value = value diff --git a/test/orm/_base.py b/test/orm/_base.py index d66cc57a00..764ac30c07 100644 --- a/test/orm/_base.py +++ b/test/orm/_base.py @@ -8,8 +8,6 @@ from test.lib.testing import adict from test.lib.entities import BasicEntity, ComparableEntity from test.engine._base import TablesTest -Entity = BasicEntity - class _ORMTest(object): __requires__ = ('subqueries',) @@ -17,8 +15,6 @@ class _ORMTest(object): def teardown_class(cls): sa.orm.session.Session.close_all() sa.orm.clear_mappers() - # TODO: ensure mapper registry is empty - # TODO: ensure instrumentation registry is empty class ORMTest(_ORMTest, testing.TestBase): pass @@ -40,39 +36,59 @@ class MappedTest(_ORMTest, TablesTest, testing.AssertsExecutionResults): cls.classes = adict() cls._setup_once_tables() - cls._setup_once_classes() - cls._setup_once_mappers() - cls._setup_once_inserts() + @classmethod + def teardown_class(cls): + cls.classes.clear() + _ORMTest.teardown_class() + cls._teardown_once_metadata_bind() + + def setup(self): + self._setup_each_tables() + self._setup_each_mappers() + self._setup_each_inserts() + + def teardown(self): + sa.orm.session.Session.close_all() + self._teardown_each_mappers() + self._teardown_each_tables() + self._teardown_each_bind() + @classmethod def _setup_once_classes(cls): if cls.run_setup_classes == 'once': - baseline = subclasses(BasicEntity) - cls.setup_classes() - cls._register_new_class_artifacts(baseline) + cls._with_register_classes(cls.setup_classes) @classmethod def _setup_once_mappers(cls): if cls.run_setup_mappers == 'once': - baseline = subclasses(BasicEntity) - cls.setup_mappers() - cls._register_new_class_artifacts(baseline) - - def _setup_each_classes(self): - if self.run_setup_classes == 'each': - self.classes.clear() - baseline = subclasses(BasicEntity) - self.setup_classes() - self._register_new_class_artifacts(baseline) + cls._with_register_classes(cls.setup_mappers) def _setup_each_mappers(self): if self.run_setup_mappers == 'each': - baseline = subclasses(BasicEntity) - self.setup_mappers() - self._register_new_class_artifacts(baseline) + self._with_register_classes(self.setup_mappers) + + @classmethod + def _with_register_classes(cls, fn): + """Run a setup method, framing the operation with a Base class + that will catch new subclasses to be established within + the "classes" registry. + + """ + class Base(object): + pass + class Basic(BasicEntity, Base): + pass + class Comparable(ComparableEntity, Base): + pass + cls.Basic = Basic + cls.Comparable = Comparable + fn() + for class_ in subclasses(Base): + cls.classes[class_.__name__] = class_ def _teardown_each_mappers(self): # some tests create mappers in the test bodies @@ -80,26 +96,8 @@ class MappedTest(_ORMTest, TablesTest, testing.AssertsExecutionResults): # clear mappers in any case if self.run_setup_mappers != 'once': sa.orm.clear_mappers() - - def setup(self): - self._setup_each_tables() - self._setup_each_classes() - - self._setup_each_mappers() - self._setup_each_inserts() - - def teardown(self): - sa.orm.session.Session.close_all() - self._teardown_each_mappers() - self._teardown_each_tables() - self._teardown_each_bind() - - @classmethod - def teardown_class(cls): - for cl in cls.classes.values(): - cls.unregister_class(cl) - _ORMTest.teardown_class() - cls._teardown_once_metadata_bind() + if self.run_setup_classes == 'each': + cls.classes.clear() @classmethod def setup_classes(cls): @@ -109,27 +107,10 @@ class MappedTest(_ORMTest, TablesTest, testing.AssertsExecutionResults): def setup_mappers(cls): pass - @classmethod - def _register_new_class_artifacts(cls, baseline): - for class_ in subclasses(BasicEntity) - baseline: - cls.register_class(class_) - - @classmethod - def register_class(cls, class_): - name = class_.__name__ - if name[0].isupper: - setattr(cls, name, class_) - cls.classes[name] = class_ - - @classmethod - def unregister_class(cls, class_): - name = class_.__name__ - if name[0].isupper: - delattr(cls, name) - del cls.classes[name] - @classmethod def _load_fixtures(cls): + """Insert rows as represented by the fixtures() method.""" + headers, rows = {}, {} for table, data in cls.fixtures().iteritems(): if isinstance(table, basestring): diff --git a/test/orm/_fixtures.py b/test/orm/_fixtures.py index ae8da5ec86..412f93afe3 100644 --- a/test/orm/_fixtures.py +++ b/test/orm/_fixtures.py @@ -21,7 +21,7 @@ class FixtureTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Base(_base.ComparableEntity): + class Base(cls.Comparable): pass class User(Base): diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py index 372adce56d..de677048e3 100644 --- a/test/orm/inheritance/test_basic.py +++ b/test/orm/inheritance/test_basic.py @@ -230,7 +230,7 @@ class PolymorphicAttributeManagementTest(_base.MappedTest): cls.tables.table_c, cls.tables.table_a) - class A(_base.ComparableEntity): + class A(cls.Comparable): pass class B(A): pass @@ -434,7 +434,7 @@ class GetTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Foo(_base.BasicEntity): + class Foo(cls.Basic): pass class Bar(Foo): @@ -1570,7 +1570,7 @@ class NoPolyIdentInMiddleTest(_base.MappedTest): @classmethod def setup_classes(cls): - class A(_base.ComparableEntity): + class A(cls.Comparable): pass class B(A): pass diff --git a/test/orm/inheritance/test_concrete.py b/test/orm/inheritance/test_concrete.py index 02f266b3cc..6c427d44d3 100644 --- a/test/orm/inheritance/test_concrete.py +++ b/test/orm/inheritance/test_concrete.py @@ -397,7 +397,7 @@ class PropertyInheritanceTest(_base.MappedTest): @classmethod def setup_classes(cls): - class A(_base.ComparableEntity): + class A(cls.Comparable): pass class B(A): @@ -406,7 +406,7 @@ class PropertyInheritanceTest(_base.MappedTest): class C(A): pass - class Dest(_base.ComparableEntity): + class Dest(cls.Comparable): pass def test_noninherited_warning(self): @@ -651,13 +651,13 @@ class ManyToManyTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Base(_base.ComparableEntity): + class Base(cls.Comparable): pass class Sub(Base): pass - class Related(_base.ComparableEntity): + class Related(cls.Comparable): pass diff --git a/test/orm/inheritance/test_query.py b/test/orm/inheritance/test_query.py index ce7aea68ad..f0cf24d62d 100644 --- a/test/orm/inheritance/test_query.py +++ b/test/orm/inheritance/test_query.py @@ -1117,7 +1117,7 @@ class M2MFilterTest(_base.MappedTest): cls.tables.engineers, cls.tables.engineers_to_org) - class Organization(_base.ComparableEntity): + class Organization(cls.Comparable): pass mapper(Organization, organizations, properties={ @@ -1191,7 +1191,7 @@ class SelfReferentialM2MTest(_base.MappedTest, AssertsCompiledSQL): @classmethod def setup_classes(cls): - class Parent(_base.BasicEntity): + class Parent(cls.Basic): pass class Child1(Parent): pass @@ -1344,16 +1344,16 @@ class EagerToSubclassTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Parent(_base.ComparableEntity): + class Parent(cls.Comparable): pass - class Base(_base.ComparableEntity): + class Base(cls.Comparable): pass class Sub(Base): pass - class Related(_base.ComparableEntity): + class Related(cls.Comparable): pass @classmethod @@ -1505,13 +1505,13 @@ class SubClassEagerToSubClassTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Parent(_base.ComparableEntity): + class Parent(cls.Comparable): pass class Subparent(Parent): pass - class Base(_base.ComparableEntity): + class Base(cls.Comparable): pass class Sub(Base): diff --git a/test/orm/inheritance/test_single.py b/test/orm/inheritance/test_single.py index 2d65ecbede..392c63d40b 100644 --- a/test/orm/inheritance/test_single.py +++ b/test/orm/inheritance/test_single.py @@ -4,11 +4,11 @@ from sqlalchemy.orm import * from test.lib import testing from test.orm import _fixtures -from test.orm._base import MappedTest, ComparableEntity +from test.orm import _base from test.lib.schema import Table, Column -class SingleInheritanceTest(testing.AssertsCompiledSQL, MappedTest): +class SingleInheritanceTest(testing.AssertsCompiledSQL, _base.MappedTest): @classmethod def define_tables(cls, metadata): Table('employees', metadata, @@ -27,7 +27,7 @@ class SingleInheritanceTest(testing.AssertsCompiledSQL, MappedTest): @classmethod def setup_classes(cls): global Employee, Manager, Engineer, JuniorEngineer - class Employee(ComparableEntity): + class Employee(cls.Comparable): pass class Manager(Employee): pass @@ -200,7 +200,8 @@ class SingleInheritanceTest(testing.AssertsCompiledSQL, MappedTest): self.tables.reports, self.classes.Engineer) - class Report(ComparableEntity): pass + class Report(_base.ComparableEntity): + pass mapper(Report, reports, properties={ 'employee': relationship(Employee, backref='reports')}) @@ -221,7 +222,8 @@ class SingleInheritanceTest(testing.AssertsCompiledSQL, MappedTest): self.tables.reports, self.classes.Engineer) - class Report(ComparableEntity): pass + class Report(_base.ComparableEntity): + pass mapper(Report, reports, properties={ 'employee': relationship(Employee, backref='reports')}) @@ -237,7 +239,7 @@ class SingleInheritanceTest(testing.AssertsCompiledSQL, MappedTest): assert len(rq.join(Report.employee.of_type(Manager)).all()) == 1 assert len(rq.join(Report.employee.of_type(Engineer)).all()) == 0 -class RelationshipFromSingleTest(testing.AssertsCompiledSQL, MappedTest): +class RelationshipFromSingleTest(testing.AssertsCompiledSQL, _base.MappedTest): @classmethod def define_tables(cls, metadata): Table('employee', metadata, @@ -254,11 +256,11 @@ class RelationshipFromSingleTest(testing.AssertsCompiledSQL, MappedTest): @classmethod def setup_classes(cls): - class Employee(ComparableEntity): + class Employee(cls.Comparable): pass class Manager(Employee): pass - class Stuff(ComparableEntity): + class Stuff(cls.Comparable): pass def test_subquery_load(self): @@ -293,7 +295,7 @@ class RelationshipFromSingleTest(testing.AssertsCompiledSQL, MappedTest): use_default_dialect=True ) -class RelationshipToSingleTest(MappedTest): +class RelationshipToSingleTest(_base.MappedTest): @classmethod def define_tables(cls, metadata): Table('employees', metadata, @@ -312,10 +314,10 @@ class RelationshipToSingleTest(MappedTest): @classmethod def setup_classes(cls): - class Company(ComparableEntity): + class Company(cls.Comparable): pass - class Employee(ComparableEntity): + class Employee(cls.Comparable): pass class Manager(Employee): pass @@ -461,7 +463,7 @@ class RelationshipToSingleTest(MappedTest): ) go() -class SingleOnJoinedTest(MappedTest): +class SingleOnJoinedTest(_base.MappedTest): @classmethod def define_tables(cls, metadata): global persons_table, employees_table @@ -479,7 +481,7 @@ class SingleOnJoinedTest(MappedTest): ) def test_single_on_joined(self): - class Person(ComparableEntity): + class Person(_base.ComparableEntity): pass class Employee(Person): pass diff --git a/test/orm/test_association.py b/test/orm/test_association.py index 41dfe178b6..b30db04f18 100644 --- a/test/orm/test_association.py +++ b/test/orm/test_association.py @@ -26,20 +26,20 @@ class AssociationTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Item(_base.BasicEntity): + class Item(cls.Basic): def __init__(self, name): self.name = name def __repr__(self): return "Item id=%d name=%s keywordassoc=%r" % ( self.item_id, self.name, self.keywords) - class Keyword(_base.BasicEntity): + class Keyword(cls.Basic): def __init__(self, name): self.name = name def __repr__(self): return "Keyword id=%d name=%s" % (self.keyword_id, self.name) - class KeywordAssociation(_base.BasicEntity): + class KeywordAssociation(cls.Basic): def __init__(self, keyword, data): self.keyword = keyword self.data = data diff --git a/test/orm/test_assorted_eager.py b/test/orm/test_assorted_eager.py index ac935acda6..38253a3f7e 100644 --- a/test/orm/test_assorted_eager.py +++ b/test/orm/test_assorted_eager.py @@ -54,16 +54,16 @@ class EagerTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Owner(_base.BasicEntity): + class Owner(cls.Basic): pass - class Category(_base.BasicEntity): + class Category(cls.Basic): pass - class Thing(_base.BasicEntity): + class Thing(cls.Basic): pass - class Option(_base.BasicEntity): + class Option(cls.Basic): pass @classmethod @@ -251,15 +251,15 @@ class EagerTest2(_base.MappedTest): @classmethod def setup_classes(cls): - class Left(_base.BasicEntity): + class Left(cls.Basic): def __init__(self, data): self.data = data - class Middle(_base.BasicEntity): + class Middle(cls.Basic): def __init__(self, data): self.data = data - class Right(_base.BasicEntity): + class Right(cls.Basic): def __init__(self, data): self.data = data @@ -326,13 +326,13 @@ class EagerTest3(_base.MappedTest): @classmethod def setup_classes(cls): - class Data(_base.BasicEntity): + class Data(cls.Basic): pass - class Foo(_base.BasicEntity): + class Foo(cls.Basic): pass - class Stat(_base.BasicEntity): + class Stat(cls.Basic): pass @testing.fails_on('maxdb', 'FIXME: unknown') @@ -413,10 +413,10 @@ class EagerTest4(_base.MappedTest): @classmethod def setup_classes(cls): - class Department(_base.BasicEntity): + class Department(cls.Basic): pass - class Employee(_base.BasicEntity): + class Employee(cls.Basic): pass @testing.fails_on('maxdb', 'FIXME: unknown') @@ -478,7 +478,7 @@ class EagerTest5(_base.MappedTest): @classmethod def setup_classes(cls): - class Base(_base.BasicEntity): + class Base(cls.Basic): def __init__(self, uid, x): self.uid = uid self.x = x @@ -495,7 +495,7 @@ class EagerTest5(_base.MappedTest): self.x = x self.z = z - class Comment(_base.BasicEntity): + class Comment(cls.Basic): def __init__(self, uid, comment): self.uid = uid self.comment = comment @@ -573,16 +573,16 @@ class EagerTest6(_base.MappedTest): @classmethod def setup_classes(cls): - class Part(_base.BasicEntity): + class Part(cls.Basic): pass - class Design(_base.BasicEntity): + class Design(cls.Basic): pass - class DesignType(_base.BasicEntity): + class DesignType(cls.Basic): pass - class InheritedPart(_base.BasicEntity): + class InheritedPart(cls.Basic): pass def test_one(self): @@ -650,16 +650,16 @@ class EagerTest7(_base.MappedTest): @classmethod def setup_classes(cls): - class Company(_base.ComparableEntity): + class Company(cls.Comparable): pass - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass - class Phone(_base.ComparableEntity): + class Phone(cls.Comparable): pass - class Invoice(_base.ComparableEntity): + class Invoice(cls.Comparable): pass def test_load_m2o_attached_to_o2(self): @@ -763,10 +763,10 @@ class EagerTest8(_base.MappedTest): @classmethod def setup_classes(cls): - class Task_Type(_base.BasicEntity): + class Task_Type(cls.Basic): pass - class Joined(_base.ComparableEntity): + class Joined(cls.Comparable): pass @testing.fails_on('maxdb', 'FIXME: unknown') @@ -830,13 +830,13 @@ class EagerTest9(_base.MappedTest): @classmethod def setup_classes(cls): - class Account(_base.BasicEntity): + class Account(cls.Basic): pass - class Transaction(_base.BasicEntity): + class Transaction(cls.Basic): pass - class Entry(_base.BasicEntity): + class Entry(cls.Basic): pass @classmethod diff --git a/test/orm/test_bind.py b/test/orm/test_bind.py index d680de0a77..ef6c31b63a 100644 --- a/test/orm/test_bind.py +++ b/test/orm/test_bind.py @@ -18,7 +18,7 @@ class BindTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Foo(_base.BasicEntity): + class Foo(cls.Basic): pass @classmethod diff --git a/test/orm/test_cascade.py b/test/orm/test_cascade.py index 63b4c881a4..279395ce82 100644 --- a/test/orm/test_cascade.py +++ b/test/orm/test_cascade.py @@ -38,13 +38,13 @@ class O2MCascadeDeleteOrphanTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass - class Order(_base.ComparableEntity): + class Order(cls.Comparable): pass - class Dingaling(_base.ComparableEntity): + class Dingaling(cls.Comparable): pass @classmethod @@ -319,9 +319,9 @@ class O2MCascadeDeleteNoOrphanTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Order(_base.ComparableEntity): + class Order(cls.Comparable): pass @classmethod @@ -1007,13 +1007,13 @@ class M2OCascadeDeleteOrphanTestOne(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Pref(_base.ComparableEntity): + class Pref(cls.Comparable): pass - class Extra(_base.ComparableEntity): + class Extra(cls.Comparable): pass - class Foo(_base.ComparableEntity): + class Foo(cls.Comparable): pass @classmethod @@ -1187,11 +1187,11 @@ class M2OCascadeDeleteOrphanTestTwo(_base.MappedTest): @classmethod def setup_classes(cls): - class T1(_base.ComparableEntity): + class T1(cls.Comparable): pass - class T2(_base.ComparableEntity): + class T2(cls.Comparable): pass - class T3(_base.ComparableEntity): + class T3(cls.Comparable): pass @classmethod @@ -1328,11 +1328,11 @@ class M2OCascadeDeleteNoOrphanTest(_base.MappedTest): @classmethod def setup_classes(cls): - class T1(_base.ComparableEntity): + class T1(cls.Comparable): pass - class T2(_base.ComparableEntity): + class T2(cls.Comparable): pass - class T3(_base.ComparableEntity): + class T3(cls.Comparable): pass @classmethod @@ -1489,11 +1489,11 @@ class M2MCascadeTest(_base.MappedTest): @classmethod def setup_classes(cls): - class A(_base.ComparableEntity): + class A(cls.Comparable): pass - class B(_base.ComparableEntity): + class B(cls.Comparable): pass - class C(_base.ComparableEntity): + class C(cls.Comparable): pass def test_delete_orphan(self): @@ -1790,11 +1790,11 @@ class PendingOrphanTestSingleLevel(_base.MappedTest): ) @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass - class Order(_base.ComparableEntity): + class Order(cls.Comparable): pass def test_pending_standalone_orphan(self): @@ -1922,11 +1922,11 @@ class PendingOrphanTestTwoLevel(_base.MappedTest): @classmethod def setup_classes(cls): - class Order(_base.ComparableEntity): + class Order(cls.Comparable): pass - class Item(_base.ComparableEntity): + class Item(cls.Comparable): pass - class Attribute(_base.ComparableEntity): + class Attribute(cls.Comparable): pass def test_singlelevel_remove(self): @@ -2272,9 +2272,9 @@ class O2MConflictTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Parent(_base.ComparableEntity): + class Parent(cls.Comparable): pass - class Child(_base.ComparableEntity): + class Child(cls.Comparable): pass def _do_move_test(self, delete_old): diff --git a/test/orm/test_collection.py b/test/orm/test_collection.py index 0e0c225ae2..44726297f8 100644 --- a/test/orm/test_collection.py +++ b/test/orm/test_collection.py @@ -1425,11 +1425,11 @@ class DictHelpersTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Parent(_base.BasicEntity): + class Parent(cls.Basic): def __init__(self, label=None): self.label = label - class Child(_base.BasicEntity): + class Child(cls.Basic): def __init__(self, a=None, b=None, c=None): self.a = a self.b = b diff --git a/test/orm/test_composites.py b/test/orm/test_composites.py index d3f7f030f5..a47c772f3d 100644 --- a/test/orm/test_composites.py +++ b/test/orm/test_composites.py @@ -38,7 +38,7 @@ class PointTest(_base.MappedTest): def setup_mappers(cls): graphs, edges = cls.tables.graphs, cls.tables.edges - class Point(_base.BasicEntity): + class Point(cls.Basic): def __init__(self, x, y): self.x = x self.y = y @@ -53,9 +53,9 @@ class PointTest(_base.MappedTest): return not isinstance(other, Point) or \ not self.__eq__(other) - class Graph(_base.BasicEntity): + class Graph(cls.Basic): pass - class Edge(_base.BasicEntity): + class Edge(cls.Basic): def __init__(self, *args): if args: self.start, self.end = args @@ -233,7 +233,7 @@ class PrimaryKeyTest(_base.MappedTest): def setup_mappers(cls): graphs = cls.tables.graphs - class Version(_base.BasicEntity): + class Version(cls.Basic): def __init__(self, id, version): self.id = id self.version = version @@ -247,7 +247,7 @@ class PrimaryKeyTest(_base.MappedTest): def __ne__(self, other): return not self.__eq__(other) - class Graph(_base.BasicEntity): + class Graph(cls.Basic): def __init__(self, version): self.version = version @@ -328,10 +328,10 @@ class DefaultsTest(_base.MappedTest): def setup_mappers(cls): foobars = cls.tables.foobars - class Foobar(_base.BasicEntity): + class Foobar(cls.Basic): pass - class FBComposite(_base.BasicEntity): + class FBComposite(cls.Basic): def __init__(self, x1, x2, x3, x4): self.x1 = x1 self.x2 = x2 @@ -408,13 +408,13 @@ class MappedSelectTest(_base.MappedTest): def setup_mappers(cls): values, descriptions = cls.tables.values, cls.tables.descriptions - class Descriptions(_base.BasicEntity): + class Descriptions(cls.Basic): pass - class Values(_base.BasicEntity): + class Values(cls.Basic): pass - class CustomValues(_base.BasicEntity, list): + class CustomValues(cls.Basic, list): def __init__(self, *args): self.extend(args) @@ -490,12 +490,12 @@ class ManyToOneTest(_base.MappedTest): def setup_mappers(cls): a, b = cls.tables.a, cls.tables.b - class A(_base.ComparableEntity): + class A(cls.Comparable): pass - class B(_base.ComparableEntity): + class B(cls.Comparable): pass - class C(_base.BasicEntity): + class C(cls.Basic): def __init__(self, b1, b2): self.b1, self.b2 = b1, b2 @@ -557,7 +557,7 @@ class ConfigurationTest(_base.MappedTest): @classmethod def setup_mappers(cls): - class Point(_base.BasicEntity): + class Point(cls.Basic): def __init__(self, x, y): self.x = x self.y = y @@ -571,7 +571,7 @@ class ConfigurationTest(_base.MappedTest): return not isinstance(other, Point) or \ not self.__eq__(other) - class Edge(_base.ComparableEntity): + class Edge(cls.Comparable): pass def _test_roundtrip(self): diff --git a/test/orm/test_cycles.py b/test/orm/test_cycles.py index 4c2a359500..00c2e0aca0 100644 --- a/test/orm/test_cycles.py +++ b/test/orm/test_cycles.py @@ -33,11 +33,11 @@ class SelfReferentialTest(_base.MappedTest): @classmethod def setup_classes(cls): - class C1(_base.BasicEntity): + class C1(cls.Basic): def __init__(self, data=None): self.data = data - class C2(_base.BasicEntity): + class C2(cls.Basic): def __init__(self, data=None): self.data = data @@ -147,7 +147,7 @@ class SelfReferentialNoPKTest(_base.MappedTest): @classmethod def setup_classes(cls): - class TT(_base.BasicEntity): + class TT(cls.Basic): def __init__(self): self.uuid = hex(id(self)) @@ -211,7 +211,7 @@ class InheritTestOne(_base.MappedTest): @classmethod def setup_classes(cls): - class Parent(_base.BasicEntity): + class Parent(cls.Basic): pass class Child1(Parent): @@ -288,13 +288,13 @@ class InheritTestTwo(_base.MappedTest): @classmethod def setup_classes(cls): - class A(_base.BasicEntity): + class A(cls.Basic): pass class B(A): pass - class C(_base.BasicEntity): + class C(cls.Basic): pass def test_flush(self): @@ -343,11 +343,11 @@ class BiDirectionalManyToOneTest(_base.MappedTest): @classmethod def setup_classes(cls): - class T1(_base.BasicEntity): + class T1(cls.Basic): pass - class T2(_base.BasicEntity): + class T2(cls.Basic): pass - class T3(_base.BasicEntity): + class T3(cls.Basic): pass @classmethod @@ -439,10 +439,10 @@ class BiDirectionalOneToManyTest(_base.MappedTest): @classmethod def setup_classes(cls): - class C1(_base.BasicEntity): + class C1(cls.Basic): pass - class C2(_base.BasicEntity): + class C2(cls.Basic): pass def test_cycle(self): @@ -501,13 +501,13 @@ class BiDirectionalOneToManyTest2(_base.MappedTest): @classmethod def setup_classes(cls): - class C1(_base.BasicEntity): + class C1(cls.Basic): pass - class C2(_base.BasicEntity): + class C2(cls.Basic): pass - class C1Data(_base.BasicEntity): + class C1Data(cls.Basic): pass @classmethod @@ -581,10 +581,10 @@ class OneToManyManyToOneTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Person(_base.ComparableEntity): + class Person(cls.Comparable): pass - class Ball(_base.ComparableEntity): + class Ball(cls.Comparable): pass def test_cycle(self): @@ -833,7 +833,7 @@ class SelfReferentialPostUpdateTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Node(_base.BasicEntity): + class Node(cls.Basic): def __init__(self, path=''): self.path = path @@ -972,7 +972,7 @@ class SelfReferentialPostUpdateTest2(_base.MappedTest): @classmethod def setup_classes(cls): - class A(_base.BasicEntity): + class A(cls.Basic): pass def test_one(self): @@ -1030,11 +1030,11 @@ class SelfReferentialPostUpdateTest3(_base.MappedTest): @classmethod def setup_classes(cls): - class Parent(_base.BasicEntity): + class Parent(cls.Basic): def __init__(self, name=''): self.name = name - class Child(_base.BasicEntity): + class Child(cls.Basic): def __init__(self, name=''): self.name = name @@ -1117,16 +1117,16 @@ class PostUpdateBatchingTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Parent(_base.BasicEntity): + class Parent(cls.Basic): def __init__(self, name=''): self.name = name - class Child1(_base.BasicEntity): + class Child1(cls.Basic): def __init__(self, name=''): self.name = name - class Child2(_base.BasicEntity): + class Child2(cls.Basic): def __init__(self, name=''): self.name = name - class Child3(_base.BasicEntity): + class Child3(cls.Basic): def __init__(self, name=''): self.name = name diff --git a/test/orm/test_defaults.py b/test/orm/test_defaults.py index ddb9cea1ac..4dd9da5d39 100644 --- a/test/orm/test_defaults.py +++ b/test/orm/test_defaults.py @@ -78,7 +78,7 @@ class TriggerDefaultsTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Default(_base.BasicEntity): + class Default(cls.Basic): pass @classmethod diff --git a/test/orm/test_deprecations.py b/test/orm/test_deprecations.py index f454435b4d..f313aecec5 100644 --- a/test/orm/test_deprecations.py +++ b/test/orm/test_deprecations.py @@ -60,10 +60,10 @@ class QueryAlternativesTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.BasicEntity): + class User(cls.Basic): pass - class Address(_base.BasicEntity): + class Address(cls.Basic): pass @classmethod diff --git a/test/orm/test_dynamic.py b/test/orm/test_dynamic.py index a5e23db98a..7e253d033c 100644 --- a/test/orm/test_dynamic.py +++ b/test/orm/test_dynamic.py @@ -679,10 +679,10 @@ class DontDereferenceTest(_base.MappedTest): def setup_mappers(cls): users, addresses = cls.tables.users, cls.tables.addresses - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass mapper(User, users, properties={ diff --git a/test/orm/test_eager_relations.py b/test/orm/test_eager_relations.py index bd2145519c..e16673eb77 100644 --- a/test/orm/test_eager_relations.py +++ b/test/orm/test_eager_relations.py @@ -1738,9 +1738,9 @@ class MixedSelfReferentialEagerTest(_base.MappedTest): def setup_mappers(cls): b_table, a_table = cls.tables.b_table, cls.tables.a_table - class A(_base.ComparableEntity): + class A(cls.Comparable): pass - class B(_base.ComparableEntity): + class B(cls.Comparable): pass mapper(A,a_table) diff --git a/test/orm/test_evaluator.py b/test/orm/test_evaluator.py index a27c81260e..7679c54599 100644 --- a/test/orm/test_evaluator.py +++ b/test/orm/test_evaluator.py @@ -30,7 +30,7 @@ class EvaluateTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass @classmethod diff --git a/test/orm/test_expire.py b/test/orm/test_expire.py index 23ea834384..e82fa80818 100644 --- a/test/orm/test_expire.py +++ b/test/orm/test_expire.py @@ -980,7 +980,7 @@ class PolymorphicExpireTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Person(_base.ComparableEntity): + class Person(cls.Comparable): pass class Engineer(Person): pass diff --git a/test/orm/test_froms.py b/test/orm/test_froms.py index 28133b456f..17b4c8816f 100644 --- a/test/orm/test_froms.py +++ b/test/orm/test_froms.py @@ -283,10 +283,10 @@ class AddEntityEquivalenceTest(_base.MappedTest, AssertsCompiledSQL): cls.tables.b, cls.tables.d) - class A(_base.ComparableEntity): + class A(cls.Comparable): pass - class B(_base.ComparableEntity): + class B(cls.Comparable): pass class C(B): diff --git a/test/orm/test_generative.py b/test/orm/test_generative.py index 9eb90d4e91..35fc0e3971 100644 --- a/test/orm/test_generative.py +++ b/test/orm/test_generative.py @@ -30,7 +30,7 @@ class GenerativeQueryTest(_base.MappedTest): def setup_mappers(cls): foo = cls.tables.foo - class Foo(_base.BasicEntity): + class Foo(cls.Basic): pass mapper(Foo, foo) @@ -168,9 +168,9 @@ class GenerativeTest2(_base.MappedTest): def setup_mappers(cls): table2, table1 = cls.tables.table2, cls.tables.table1 - class Obj1(_base.BasicEntity): + class Obj1(cls.Basic): pass - class Obj2(_base.BasicEntity): + class Obj2(cls.Basic): pass mapper(Obj1, table1) @@ -296,9 +296,9 @@ class CaseSensitiveTest(_base.MappedTest): def setup_mappers(cls): Table2, Table1 = cls.tables.Table2, cls.tables.Table1 - class Obj1(_base.BasicEntity): + class Obj1(cls.Basic): pass - class Obj2(_base.BasicEntity): + class Obj2(cls.Basic): pass mapper(Obj1, Table1) diff --git a/test/orm/test_joins.py b/test/orm/test_joins.py index cae48947f7..454c90a53e 100644 --- a/test/orm/test_joins.py +++ b/test/orm/test_joins.py @@ -119,9 +119,9 @@ class InheritedJoinTest(_base.MappedTest, AssertsCompiledSQL): cls.tables.machines, cls.tables.engineers) - class Company(_base.ComparableEntity): + class Company(cls.Comparable): pass - class Person(_base.ComparableEntity): + class Person(cls.Comparable): pass class Engineer(Person): pass @@ -129,9 +129,9 @@ class InheritedJoinTest(_base.MappedTest, AssertsCompiledSQL): pass class Boss(Manager): pass - class Machine(_base.ComparableEntity): + class Machine(cls.Comparable): pass - class Paperwork(_base.ComparableEntity): + class Paperwork(cls.Comparable): pass mapper(Company, companies, properties={ @@ -1371,10 +1371,10 @@ class SelfRefMixedTest(_base.MappedTest, AssertsCompiledSQL): cls.tables.assoc_table, cls.tables.sub_table) - class Node(_base.ComparableEntity): + class Node(cls.Comparable): pass - class Sub(_base.ComparableEntity): + class Sub(cls.Comparable): pass mapper(Node, nodes, properties={ @@ -1446,7 +1446,7 @@ class SelfReferentialTest(_base.MappedTest, AssertsCompiledSQL): @classmethod def setup_classes(cls): - class Node(_base.ComparableEntity): + class Node(cls.Comparable): def append(self, node): self.children.append(node) @@ -1801,7 +1801,7 @@ class SelfReferentialM2MTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Node(_base.ComparableEntity): + class Node(cls.Comparable): pass @classmethod diff --git a/test/orm/test_legacy_mutable.py b/test/orm/test_legacy_mutable.py index 002d288a26..5c65b720e4 100644 --- a/test/orm/test_legacy_mutable.py +++ b/test/orm/test_legacy_mutable.py @@ -29,7 +29,7 @@ class MutableTypesTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Foo(_base.BasicEntity): + class Foo(cls.Basic): pass @classmethod @@ -289,7 +289,7 @@ class PickledDictsTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Foo(_base.BasicEntity): + class Foo(cls.Basic): pass @classmethod diff --git a/test/orm/test_manytomany.py b/test/orm/test_manytomany.py index 2bd1cd6f6e..e7dc1075fe 100644 --- a/test/orm/test_manytomany.py +++ b/test/orm/test_manytomany.py @@ -60,18 +60,18 @@ class M2MTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Place(_base.BasicEntity): + class Place(cls.Basic): def __init__(self, name=None): self.name = name def __str__(self): return "(Place '%s')" % self.name __repr__ = __str__ - class PlaceThingy(_base.BasicEntity): + class PlaceThingy(cls.Basic): def __init__(self, name=None): self.name = name - class Transition(_base.BasicEntity): + class Transition(cls.Basic): def __init__(self, name=None): self.name = name self.inputs = [] @@ -321,10 +321,10 @@ class M2MTest2(_base.MappedTest): @classmethod def setup_classes(cls): - class Student(_base.BasicEntity): + class Student(cls.Basic): def __init__(self, name=''): self.name = name - class Course(_base.BasicEntity): + class Course(cls.Basic): def __init__(self, name=''): self.name = name diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py index f86f38fdef..85a4db67af 100644 --- a/test/orm/test_mapper.py +++ b/test/orm/test_mapper.py @@ -2217,13 +2217,13 @@ class SecondaryOptionsTest(_base.MappedTest): cls.tables.base, cls.tables.related) - class Base(_base.ComparableEntity): + class Base(cls.Comparable): pass class Child1(Base): pass class Child2(Base): pass - class Related(_base.ComparableEntity): + class Related(cls.Comparable): pass mapper(Base, base, polymorphic_on=base.c.type, properties={ 'related':relationship(Related, uselist=False) @@ -2384,8 +2384,8 @@ class DeferredPopulationTest(_base.MappedTest): def setup_mappers(cls): thing, human = cls.tables.thing, cls.tables.human - class Human(_base.BasicEntity): pass - class Thing(_base.BasicEntity): pass + class Human(cls.Basic): pass + class Thing(cls.Basic): pass mapper(Human, human, properties={"thing": relationship(Thing)}) mapper(Thing, thing, properties={"name": deferred(thing.c.name)}) @@ -2709,10 +2709,10 @@ class MagicNamesTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Cartographer(_base.BasicEntity): + class Cartographer(cls.Basic): pass - class Map(_base.BasicEntity): + class Map(cls.Basic): pass def test_mappish(self): diff --git a/test/orm/test_merge.py b/test/orm/test_merge.py index 23fc294e2a..96507387fd 100644 --- a/test/orm/test_merge.py +++ b/test/orm/test_merge.py @@ -1095,7 +1095,7 @@ class MutableMergeTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Data(_base.ComparableEntity): + class Data(cls.Comparable): pass def test_list(self): @@ -1124,7 +1124,7 @@ class CompositeNullPksTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Data(_base.ComparableEntity): + class Data(cls.Comparable): pass def test_merge_allow_partial(self): diff --git a/test/orm/test_naturalpks.py b/test/orm/test_naturalpks.py index def3ce7d52..e838d57e36 100644 --- a/test/orm/test_naturalpks.py +++ b/test/orm/test_naturalpks.py @@ -49,11 +49,11 @@ class NaturalPKTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass - class Item(_base.ComparableEntity): + class Item(cls.Comparable): pass def test_entity(self): @@ -460,7 +460,7 @@ class ReversePKsTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): def __init__(self, code, status, username): self.code = code self.status = status @@ -524,7 +524,7 @@ class SelfReferentialTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Node(_base.ComparableEntity): + class Node(cls.Comparable): pass def test_one_to_many_on_m2o(self): @@ -639,9 +639,9 @@ class NonPKCascadeTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass @testing.fails_on('sqlite', 'sqlite doesnt support ON UPDATE CASCADE') @@ -746,9 +746,9 @@ class CascadeToFKPKTest(_base.MappedTest, testing.AssertsCompiledSQL): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass @testing.fails_on('sqlite', 'sqlite doesnt support ON UPDATE CASCADE') @@ -1009,7 +1009,7 @@ class JoinedInheritanceTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Person(_base.ComparableEntity): + class Person(cls.Comparable): pass class Engineer(Person): pass diff --git a/test/orm/test_onetoone.py b/test/orm/test_onetoone.py index 0d09705bd2..fab99d93c6 100644 --- a/test/orm/test_onetoone.py +++ b/test/orm/test_onetoone.py @@ -23,9 +23,9 @@ class O2OTest(_base.MappedTest): @classmethod def setup_mappers(cls): - class Jack(_base.BasicEntity): + class Jack(cls.Basic): pass - class Port(_base.BasicEntity): + class Port(cls.Basic): pass diff --git a/test/orm/test_query.py b/test/orm/test_query.py index 164294e956..e5f002960e 100644 --- a/test/orm/test_query.py +++ b/test/orm/test_query.py @@ -1794,10 +1794,10 @@ class UpdateDeleteTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Document(_base.ComparableEntity): + class Document(cls.Comparable): pass @classmethod diff --git a/test/orm/test_relationships.py b/test/orm/test_relationships.py index a12076bad5..c671c19bc0 100644 --- a/test/orm/test_relationships.py +++ b/test/orm/test_relationships.py @@ -45,13 +45,13 @@ class DependencyTwoParentTest(_base.MappedTest): @classmethod def setup_classes(cls): - class A(_base.Entity): + class A(cls.Basic): pass - class B(_base.Entity): + class B(cls.Basic): pass - class C(_base.Entity): + class C(cls.Basic): pass - class D(_base.Entity): + class D(cls.Basic): pass @classmethod @@ -156,10 +156,10 @@ class CompositeSelfRefFKTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Company(_base.Entity): + class Company(cls.Basic): pass - class Employee(_base.Entity): + class Employee(cls.Basic): def __init__(self, name, company, emp_id, reports_to=None): self.name = name self.company = company @@ -324,14 +324,14 @@ class ComplexPostUpdateTest(_base.MappedTest): cls.tables.jobs, cls.tables.pages) - class Job(_base.Entity): + class Job(cls.Basic): def create_page(self, pagename): return Page(job=self, pagename=pagename) - class PageVersion(_base.Entity): + class PageVersion(cls.Basic): def __init__(self, page=None, version=None): self.page = page self.version = version - class Page(_base.Entity): + class Page(cls.Basic): def __init__(self, job=None, pagename=None): self.job = job self.pagename = pagename @@ -351,7 +351,7 @@ class ComplexPostUpdateTest(_base.MappedTest): self.comments.append(newcomment) newcomment.created_version = self.currentversion.version return newcomment - class PageComment(_base.Entity): + class PageComment(cls.Basic): pass mapper(Job, jobs) @@ -441,10 +441,10 @@ class FKsAsPksTest(_base.MappedTest): @classmethod def setup_classes(cls): - class A(_base.Entity): + class A(cls.Basic): pass - class B(_base.Entity): + class B(cls.Basic): pass def test_onetoone_switch(self): @@ -535,7 +535,7 @@ class FKsAsPksTest(_base.MappedTest): primary_key=True, autoincrement=False, nullable=True)) tableC.create() - class C(_base.Entity): + class C(_base.BasicEntity): pass mapper(C, tableC, properties={ 'a':relationship(A, cascade="save-update") @@ -682,9 +682,9 @@ class UniqueColReferenceSwitchTest(_base.MappedTest): @classmethod def setup_classes(cls): - class A(_base.ComparableEntity): + class A(cls.Comparable): pass - class B(_base.ComparableEntity): + class B(cls.Comparable): pass def test_switch_parent(self): @@ -729,9 +729,9 @@ class RelationshipToSelectableTest(_base.MappedTest): def test_basic(self): items = self.tables.items - class Container(_base.Entity): + class Container(_base.BasicEntity): pass - class LineItem(_base.Entity): + class LineItem(_base.BasicEntity): pass container_select = sa.select( @@ -855,9 +855,9 @@ class BackrefPropagatesForwardsArgs(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass def test_backref(self): @@ -917,10 +917,10 @@ class AmbiguousJoinInterpretedAsSelfRef(_base.MappedTest): and_(address.c.subscriber_id==subscriber.c.id, address.c.type.in_(['A', 'B', 'C']))) - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass - class Subscriber(_base.ComparableEntity): + class Subscriber(cls.Comparable): pass mapper(Address, address) @@ -1202,9 +1202,9 @@ class TypeMatchTest(_base.MappedTest): self.tables.c, self.tables.b) - class A(_base.Entity): pass - class B(_base.Entity): pass - class C(_base.Entity): pass + class A(_base.BasicEntity): pass + class B(_base.BasicEntity): pass + class C(_base.BasicEntity): pass mapper(A, a, properties={'bs':relationship(B)}) mapper(B, b) mapper(C, c) @@ -1228,9 +1228,9 @@ class TypeMatchTest(_base.MappedTest): self.tables.c, self.tables.b) - class A(_base.Entity): pass - class B(_base.Entity): pass - class C(_base.Entity): pass + class A(_base.BasicEntity): pass + class B(_base.BasicEntity): pass + class C(_base.BasicEntity): pass mapper(A, a, properties={'bs':relationship(B, cascade="none")}) mapper(B, b) mapper(C, c) @@ -1253,8 +1253,8 @@ class TypeMatchTest(_base.MappedTest): self.tables.c, self.tables.b) - class A(_base.Entity): pass - class B(_base.Entity): pass + class A(_base.BasicEntity): pass + class B(_base.BasicEntity): pass class C(B): pass mapper(A, a, properties={'bs':relationship(B, cascade="none")}) mapper(B, b) @@ -1278,9 +1278,9 @@ class TypeMatchTest(_base.MappedTest): self.tables.b, self.tables.d) - class A(_base.Entity): pass + class A(_base.BasicEntity): pass class B(A): pass - class D(_base.Entity): pass + class D(_base.BasicEntity): pass mapper(A, a) mapper(B, b, inherits=A) mapper(D, d, properties={"a":relationship(A, cascade="none")}) @@ -1299,9 +1299,9 @@ class TypeMatchTest(_base.MappedTest): self.tables.b, self.tables.d) - class A(_base.Entity): pass - class B(_base.Entity): pass - class D(_base.Entity): pass + class A(_base.BasicEntity): pass + class B(_base.BasicEntity): pass + class D(_base.BasicEntity): pass mapper(A, a) mapper(B, b) mapper(D, d, properties={"a":relationship(A)}) @@ -1341,8 +1341,8 @@ class TypedAssociationTable(_base.MappedTest): """Many-to-many tables with special types for candidate keys.""" - class T1(_base.Entity): pass - class T2(_base.Entity): pass + class T1(_base.BasicEntity): pass + class T2(_base.BasicEntity): pass mapper(T2, t2) mapper(T1, t1, properties={ 't2s':relationship(T2, secondary=t3, backref='t1s')}) @@ -1442,9 +1442,9 @@ class ViewOnlyOverlappingNames(_base.MappedTest): error. """ - class C1(_base.Entity): pass - class C2(_base.Entity): pass - class C3(_base.Entity): pass + class C1(_base.BasicEntity): pass + class C2(_base.BasicEntity): pass + class C3(_base.BasicEntity): pass mapper(C1, t1, properties={ 't2s':relationship(C2), @@ -1507,9 +1507,9 @@ class ViewOnlyUniqueNames(_base.MappedTest): PK column names and should not produce 'mapper has no columnX' error. """ - class C1(_base.Entity): pass - class C2(_base.Entity): pass - class C3(_base.Entity): pass + class C1(_base.BasicEntity): pass + class C2(_base.BasicEntity): pass + class C3(_base.BasicEntity): pass mapper(C1, t1, properties={ 't2s':relationship(C2), @@ -1740,11 +1740,11 @@ class ViewOnlyComplexJoin(_base.MappedTest): @classmethod def setup_classes(cls): - class T1(_base.ComparableEntity): + class T1(cls.Comparable): pass - class T2(_base.ComparableEntity): + class T2(cls.Comparable): pass - class T3(_base.ComparableEntity): + class T3(cls.Comparable): pass def test_basic(self): @@ -1821,9 +1821,9 @@ class ExplicitLocalRemoteTest(_base.MappedTest): @classmethod def setup_classes(cls): - class T1(_base.ComparableEntity): + class T1(cls.Comparable): pass - class T2(_base.ComparableEntity): + class T2(cls.Comparable): pass def test_onetomany_funcfk(self): @@ -1978,7 +1978,7 @@ class InvalidRemoteSideTest(_base.MappedTest): @classmethod def setup_classes(cls): - class T1(_base.ComparableEntity): + class T1(cls.Comparable): pass def test_o2m_backref(self): @@ -2060,9 +2060,9 @@ class InvalidRelationshipEscalationTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Foo(_base.Entity): + class Foo(cls.Basic): pass - class Bar(_base.Entity): + class Bar(cls.Basic): pass def test_no_join(self): @@ -2430,9 +2430,9 @@ class InvalidRelationshipEscalationTestM2M(_base.MappedTest): @classmethod def setup_classes(cls): - class Foo(_base.Entity): + class Foo(cls.Basic): pass - class Bar(_base.Entity): + class Bar(cls.Basic): pass def test_no_join(self): @@ -2752,10 +2752,10 @@ class RelationDeprecationTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.BasicEntity): + class User(cls.Basic): pass - class Address(_base.BasicEntity): + class Address(cls.Basic): pass @classmethod diff --git a/test/orm/test_selectable.py b/test/orm/test_selectable.py index bbbf3b3317..8eb7e38c1e 100644 --- a/test/orm/test_selectable.py +++ b/test/orm/test_selectable.py @@ -22,7 +22,7 @@ class SelectableNoFromsTest(_base.MappedTest, AssertsCompiledSQL): @classmethod def setup_classes(cls): - class Subset(_base.ComparableEntity): + class Subset(cls.Comparable): pass def test_no_tables(self): diff --git a/test/orm/test_session.py b/test/orm/test_session.py index 042a51d7c8..7e13ed7e5e 100644 --- a/test/orm/test_session.py +++ b/test/orm/test_session.py @@ -1552,7 +1552,7 @@ class TLTransactionTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.BasicEntity): + class User(cls.Basic): pass @classmethod diff --git a/test/orm/test_transaction.py b/test/orm/test_transaction.py index b8b8d80499..cfbfc971aa 100644 --- a/test/orm/test_transaction.py +++ b/test/orm/test_transaction.py @@ -617,7 +617,7 @@ class NaturalPKRollbackTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass def test_rollback_recover(self): diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py index 93e1dc7a20..fc5f6c7250 100644 --- a/test/orm/test_unitofwork.py +++ b/test/orm/test_unitofwork.py @@ -28,9 +28,9 @@ class HistoryTest(_fixtures.FixtureTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass - class Address(_base.ComparableEntity): + class Address(cls.Comparable): pass def test_backref(self): @@ -80,9 +80,9 @@ class UnicodeTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Test(_base.BasicEntity): + class Test(cls.Basic): pass - class Test2(_base.BasicEntity): + class Test2(cls.Basic): pass def test_basic(self): @@ -234,7 +234,7 @@ class BinaryHistTest(_base.MappedTest, testing.AssertsExecutionResults): @classmethod def setup_classes(cls): - class Foo(_base.BasicEntity): + class Foo(cls.Basic): pass def test_binary_equality(self): @@ -293,7 +293,7 @@ class PKTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Entry(_base.BasicEntity): + class Entry(cls.Basic): pass # not supported on sqlite since sqlite's auto-pk generation only works with @@ -359,9 +359,9 @@ class ForeignPKTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Person(_base.BasicEntity): + class Person(cls.Basic): pass - class PersonSite(_base.BasicEntity): + class PersonSite(cls.Basic): pass def test_basic(self): @@ -403,7 +403,7 @@ class ClauseAttributesTest(_base.MappedTest): @classmethod def setup_classes(cls): - class User(_base.ComparableEntity): + class User(cls.Comparable): pass @classmethod @@ -486,9 +486,9 @@ class PassiveDeletesTest(_base.MappedTest): @classmethod def setup_classes(cls): - class MyClass(_base.BasicEntity): + class MyClass(cls.Basic): pass - class MyOtherClass(_base.BasicEntity): + class MyOtherClass(cls.Basic): pass def test_basic(self): @@ -590,9 +590,9 @@ class ExtraPassiveDeletesTest(_base.MappedTest): @classmethod def setup_classes(cls): - class MyClass(_base.BasicEntity): + class MyClass(cls.Basic): pass - class MyOtherClass(_base.BasicEntity): + class MyOtherClass(cls.Basic): pass def test_assertions(self): @@ -771,9 +771,9 @@ class DefaultTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Hoho(_base.ComparableEntity): + class Hoho(cls.Comparable): pass - class Secondary(_base.ComparableEntity): + class Secondary(cls.Comparable): pass @testing.fails_on('firebird', 'Data type unknown on the parameter') @@ -930,7 +930,7 @@ class ColumnPropertyTest(_base.MappedTest): @classmethod def setup_mappers(cls): - class Data(_base.BasicEntity): + class Data(cls.Basic): pass def test_refreshes(self): @@ -2043,9 +2043,9 @@ class SaveTest3(_base.MappedTest): @classmethod def setup_classes(cls): - class Keyword(_base.BasicEntity): + class Keyword(cls.Basic): pass - class Item(_base.BasicEntity): + class Item(cls.Basic): pass def test_manytomany_xtracol_delete(self): @@ -2209,13 +2209,13 @@ class RowSwitchTest(_base.MappedTest): @classmethod def setup_classes(cls): - class T5(_base.ComparableEntity): + class T5(cls.Comparable): pass - class T6(_base.ComparableEntity): + class T6(cls.Comparable): pass - class T7(_base.ComparableEntity): + class T7(cls.Comparable): pass def test_onetomany(self): @@ -2352,7 +2352,7 @@ class InheritingRowSwitchTest(_base.MappedTest): @classmethod def setup_classes(cls): - class P(_base.ComparableEntity): + class P(cls.Comparable): pass class C(P): @@ -2414,10 +2414,10 @@ class TransactionTest(_base.MappedTest): )) @classmethod def setup_classes(cls): - class T1(_base.ComparableEntity): + class T1(cls.Comparable): pass - class T2(_base.ComparableEntity): + class T2(cls.Comparable): pass @classmethod diff --git a/test/orm/test_versioning.py b/test/orm/test_versioning.py index cdf2bdbcfc..74e342e0e6 100644 --- a/test/orm/test_versioning.py +++ b/test/orm/test_versioning.py @@ -44,7 +44,7 @@ class VersioningTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Foo(_base.ComparableEntity): + class Foo(cls.Comparable): pass def _fixture(self): @@ -330,9 +330,9 @@ class RowSwitchTest(_base.MappedTest): @classmethod def setup_classes(cls): - class P(_base.ComparableEntity): + class P(cls.Comparable): pass - class C(_base.ComparableEntity): + class C(cls.Comparable): pass @classmethod @@ -395,9 +395,9 @@ class AlternateGeneratorTest(_base.MappedTest): @classmethod def setup_classes(cls): - class P(_base.ComparableEntity): + class P(cls.Comparable): pass - class C(_base.ComparableEntity): + class C(cls.Comparable): pass @classmethod @@ -501,7 +501,7 @@ class InheritanceTwoVersionIdsTest(_base.MappedTest): @classmethod def setup_classes(cls): - class Base(_base.ComparableEntity): + class Base(cls.Comparable): pass class Sub(Base): pass