diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-01-04 15:18:25 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-01-05 23:46:02 -0500 |
| commit | 6fccdf4a285d5332ef49f23dc18c3ce45501d78b (patch) | |
| tree | d276e13e8960f00dc088c40908e4991248cc8639 /test/orm/test_utils.py | |
| parent | 640cd8a70f8a664b7834c5f74ec322fdea644043 (diff) | |
| download | sqlalchemy-6fccdf4a285d5332ef49f23dc18c3ce45501d78b.tar.gz | |
remove more bound metadata
in Iae6ab95938a7e92b6d42086aec534af27b5577d3 I missed
that the "bind" was being stuck onto the MetaData in
TablesTest, which led thousands of ORM tests to still use
bound metadata. Keep looking for bound metadata.
standardize all ORM tests on a single means of getting a
Session when the Session API isn't the thing we are directly
testing, using a new function fixture_session() that replaces
create_session() and uses modern defaults.
Change-Id: Iaf71206e9ee568151496d8bc213a069504bf65ef
Diffstat (limited to 'test/orm/test_utils.py')
| -rw-r--r-- | test/orm/test_utils.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/test/orm/test_utils.py b/test/orm/test_utils.py index d3082accd..260cae37b 100644 --- a/test/orm/test_utils.py +++ b/test/orm/test_utils.py @@ -8,9 +8,7 @@ from sqlalchemy import util from sqlalchemy.ext.hybrid import hybrid_method from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.orm import aliased -from sqlalchemy.orm import create_session from sqlalchemy.orm import mapper -from sqlalchemy.orm import Session from sqlalchemy.orm import synonym from sqlalchemy.orm import util as orm_util from sqlalchemy.orm import with_polymorphic @@ -22,6 +20,7 @@ from sqlalchemy.testing import eq_ from sqlalchemy.testing import expect_warnings from sqlalchemy.testing import fixtures from sqlalchemy.testing import is_ +from sqlalchemy.testing.fixtures import fixture_session from sqlalchemy.util import compat from test.orm import _fixtures from .inheritance import _poly_fixtures @@ -177,7 +176,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): self._fixture(Point) alias = aliased(Point) - sess = Session() + sess = fixture_session() self.assert_compile( sess.query(alias).filter(alias.left_of(Point)), @@ -203,7 +202,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): eq_(str(Point.double_x.__clause_element__()), "point.x * :x_1") eq_(str(alias.double_x.__clause_element__()), "point_1.x * :x_1") - sess = Session() + sess = fixture_session() self.assert_compile( sess.query(alias).filter(alias.double_x > Point.x), @@ -262,7 +261,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): a2 = aliased(Point) eq_(str(a2.x_alone == alias.x), "point_1.x = point_2.x") - sess = Session() + sess = fixture_session() self.assert_compile( sess.query(alias).filter(alias.x_alone > Point.x), @@ -282,7 +281,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): eq_(str(Point.x_syn), "Point.x_syn") eq_(str(alias.x_syn), "AliasedClass_Point.x_syn") - sess = Session() + sess = fixture_session() self.assert_compile( sess.query(alias.x_syn).filter(alias.x_syn > Point.x_syn), "SELECT point_1.x AS point_1_x FROM point AS point_1, point " @@ -321,7 +320,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): a2 = aliased(Point) eq_(str(a2.x_syn == alias.x), "point_1.x = point_2.x") - sess = Session() + sess = fixture_session() self.assert_compile( sess.query(alias).filter(alias.x_syn > Point.x), @@ -350,7 +349,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): eq_(str(Point.double_x.__clause_element__()), "point.x * :x_1") eq_(str(alias.double_x.__clause_element__()), "point_1.x * :x_1") - sess = Session() + sess = fixture_session() self.assert_compile( sess.query(alias).filter(alias.double_x > Point.x), @@ -380,7 +379,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): eq_(str(Point.double_x.__clause_element__()), "point.x * :x_1") eq_(str(alias.double_x.__clause_element__()), "point_1.x * :x_1") - sess = Session() + sess = fixture_session() self.assert_compile( sess.query(alias).filter(alias.double_x > Point.x), @@ -469,7 +468,7 @@ class IdentityKeyTest(_fixtures.FixtureTest): users, User = self.tables.users, self.classes.User mapper(User, users) - s = create_session() + s = fixture_session() u = User(name="u1") s.add(u) s.flush() |