diff options
| author | Gord Thompson <gord@gordthompson.com> | 2021-08-12 13:04:28 -0600 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-09-30 10:10:16 -0400 |
| commit | 257f9130c321aaa948690d0e49c7352ad1188abd (patch) | |
| tree | 2648c88460c3e5de847ee998edb7a6df0aa9b261 /test/orm/inheritance/test_poly_persistence.py | |
| parent | f7f2df607301afcd11dd49a2ccb632291de12d29 (diff) | |
| download | sqlalchemy-257f9130c321aaa948690d0e49c7352ad1188abd.tar.gz | |
Modernize tests - calling_mapper_directly
a few changes for py2k:
* map_imperatively() includes the check that a class
is being sent, this was only working for mapper() before
* the test suite didn't place the py2k "autouse" workaround
in the correct order, seemingly, tried to adjust the
per-test ordering setup in pytestplugin.py
Change-Id: I4cc39630724e810953cfda7b2afdadc8b948e3c2
Diffstat (limited to 'test/orm/inheritance/test_poly_persistence.py')
| -rw-r--r-- | test/orm/inheritance/test_poly_persistence.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/test/orm/inheritance/test_poly_persistence.py b/test/orm/inheritance/test_poly_persistence.py index c33f3e0de..8c03a40d6 100644 --- a/test/orm/inheritance/test_poly_persistence.py +++ b/test/orm/inheritance/test_poly_persistence.py @@ -6,7 +6,6 @@ from sqlalchemy import Integer from sqlalchemy import String from sqlalchemy import Table from sqlalchemy import testing -from sqlalchemy.orm import mapper from sqlalchemy.orm import polymorphic_union from sqlalchemy.orm import relationship from sqlalchemy.orm import Session @@ -131,7 +130,7 @@ class InsertOrderTest(PolymorphTest): "pjoin", ) - person_mapper = mapper( + person_mapper = self.mapper_registry.map_imperatively( Person, people, with_polymorphic=("*", person_join), @@ -139,19 +138,19 @@ class InsertOrderTest(PolymorphTest): polymorphic_identity="person", ) - mapper( + self.mapper_registry.map_imperatively( Engineer, engineers, inherits=person_mapper, polymorphic_identity="engineer", ) - mapper( + self.mapper_registry.map_imperatively( Manager, managers, inherits=person_mapper, polymorphic_identity="manager", ) - mapper( + self.mapper_registry.map_imperatively( Company, companies, properties={ @@ -272,7 +271,7 @@ class RoundTripTest(PolymorphTest): manager_with_polymorphic = None if redefine_colprop: - person_mapper = mapper( + person_mapper = cls.mapper_registry.map_imperatively( Person, people, with_polymorphic=person_with_polymorphic, @@ -281,7 +280,7 @@ class RoundTripTest(PolymorphTest): properties={"person_name": people.c.name}, ) else: - person_mapper = mapper( + person_mapper = cls.mapper_registry.map_imperatively( Person, people, with_polymorphic=person_with_polymorphic, @@ -289,13 +288,13 @@ class RoundTripTest(PolymorphTest): polymorphic_identity="person", ) - mapper( + cls.mapper_registry.map_imperatively( Engineer, engineers, inherits=person_mapper, polymorphic_identity="engineer", ) - mapper( + cls.mapper_registry.map_imperatively( Manager, managers, inherits=person_mapper, @@ -303,9 +302,11 @@ class RoundTripTest(PolymorphTest): polymorphic_identity="manager", ) - mapper(Boss, boss, inherits=Manager, polymorphic_identity="boss") + cls.mapper_registry.map_imperatively( + Boss, boss, inherits=Manager, polymorphic_identity="boss" + ) - mapper( + cls.mapper_registry.map_imperatively( Company, companies, properties={ |