diff options
Diffstat (limited to 'test/orm/test_composites.py')
| -rw-r--r-- | test/orm/test_composites.py | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/test/orm/test_composites.py b/test/orm/test_composites.py index a164034da..6ee87eefe 100644 --- a/test/orm/test_composites.py +++ b/test/orm/test_composites.py @@ -15,6 +15,7 @@ from sqlalchemy.orm import Session from sqlalchemy.testing import assert_raises_message from sqlalchemy.testing import eq_ from sqlalchemy.testing import fixtures +from sqlalchemy.testing.fixtures import fixture_session from sqlalchemy.testing.schema import Column from sqlalchemy.testing.schema import Table @@ -151,7 +152,7 @@ class PointTest(fixtures.MappedTest, testing.AssertsCompiledSQL): # pending/transient object. e1 = Edge() assert e1.end is None - sess = Session() + sess = fixture_session() sess.add(e1) # however, once it's persistent, the code as of 0.7.3 @@ -382,7 +383,7 @@ class PointTest(fixtures.MappedTest, testing.AssertsCompiledSQL): Graph, Edge = self.classes.Graph, self.classes.Edge - sess = Session() + sess = fixture_session() g = Graph(id=1) e = Edge(None, None) g.edges.append(e) @@ -488,7 +489,7 @@ class NestedTest(fixtures.MappedTest, testing.AssertsCompiledSQL): def test_round_trip(self): Thing, AB, CD = self._fixture() - s = Session() + s = fixture_session() s.add(Thing(AB("a", "b", CD("c", "d")))) s.commit() @@ -553,7 +554,7 @@ class PrimaryKeyTest(fixtures.MappedTest): def _fixture(self): Graph, Version = self.classes.Graph, self.classes.Version - sess = Session() + sess = fixture_session() g = Graph(Version(1, 1)) sess.add(g) sess.commit() @@ -593,7 +594,7 @@ class PrimaryKeyTest(fixtures.MappedTest): def test_null_pk(self): Graph, Version = self.classes.Graph, self.classes.Version - sess = Session() + sess = fixture_session() # test pk with one column NULL # only sqlite can really handle this @@ -674,7 +675,7 @@ class DefaultsTest(fixtures.MappedTest): def test_attributes_with_defaults(self): Foobar, FBComposite = self.classes.Foobar, self.classes.FBComposite - sess = Session() + sess = fixture_session() f1 = Foobar() f1.foob = FBComposite(None, 5, None, None) sess.add(f1) @@ -690,7 +691,7 @@ class DefaultsTest(fixtures.MappedTest): def test_set_composite_values(self): Foobar, FBComposite = self.classes.Foobar, self.classes.FBComposite - sess = Session() + sess = fixture_session() f1 = Foobar() f1.foob = FBComposite(None, 5, None, None) sess.add(f1) @@ -783,7 +784,7 @@ class MappedSelectTest(fixtures.MappedTest): self.tables.descriptions, ) - session = Session() + session = fixture_session() d = Descriptions( custom_descriptions=CustomValues("Color", "Number"), values=[ @@ -866,7 +867,7 @@ class ManyToOneTest(fixtures.MappedTest): def test_persist(self): A, C, B = (self.classes.A, self.classes.C, self.classes.B) - sess = Session() + sess = fixture_session() sess.add(A(c=C("b1", B(data="b2")))) sess.commit() @@ -876,7 +877,7 @@ class ManyToOneTest(fixtures.MappedTest): def test_query(self): A, C, B = (self.classes.A, self.classes.C, self.classes.B) - sess = Session() + sess = fixture_session() b1, b2 = B(data="b1"), B(data="b2") a1 = A(c=C("a1b1", b1)) a2 = A(c=C("a2b1", b2)) @@ -888,7 +889,7 @@ class ManyToOneTest(fixtures.MappedTest): def test_query_aliased(self): A, C, B = (self.classes.A, self.classes.C, self.classes.B) - sess = Session() + sess = fixture_session() b1, b2 = B(data="b1"), B(data="b2") a1 = A(c=C("a1b1", b1)) a2 = A(c=C("a2b1", b2)) @@ -941,7 +942,7 @@ class ConfigurationTest(fixtures.MappedTest): Edge, Point = self.classes.Edge, self.classes.Point e1 = Edge(start=Point(3, 4), end=Point(5, 6)) - sess = Session() + sess = fixture_session() sess.add(e1) sess.commit() @@ -1131,7 +1132,7 @@ class ComparatorTest(fixtures.MappedTest, testing.AssertsCompiledSQL): def _test_comparator_behavior(self): Edge, Point = (self.classes.Edge, self.classes.Point) - sess = Session() + sess = fixture_session() e1 = Edge(Point(3, 4), Point(5, 6)) e2 = Edge(Point(14, 5), Point(2, 7)) sess.add_all([e1, e2]) @@ -1159,7 +1160,7 @@ class ComparatorTest(fixtures.MappedTest, testing.AssertsCompiledSQL): Edge(Point(0, 1), Point(3, 5)), ) - sess = Session() + sess = fixture_session() sess.add_all([edge_1, edge_2]) sess.commit() @@ -1179,7 +1180,7 @@ class ComparatorTest(fixtures.MappedTest, testing.AssertsCompiledSQL): def test_order_by(self): self._fixture(False) Edge = self.classes.Edge - s = Session() + s = fixture_session() self.assert_compile( s.query(Edge).order_by(Edge.start, Edge.end), "SELECT edge.id AS edge_id, edge.x1 AS edge_x1, " @@ -1190,7 +1191,7 @@ class ComparatorTest(fixtures.MappedTest, testing.AssertsCompiledSQL): def test_order_by_aliased(self): self._fixture(False) Edge = self.classes.Edge - s = Session() + s = fixture_session() ea = aliased(Edge) self.assert_compile( s.query(ea).order_by(ea.start, ea.end), |