- The "clear()", "save()", "update()", "save_or_update()"

Session methods have been deprecated, replaced by
"expunge_all()" and "add()".  "expunge_all()" has also
been added to ScopedSession.

1 files changed, 38 insertions, 38 deletions

diff --git a/test/orm/query.py b/test/orm/query.py
index 18363ac98..1b56dbb26 100644
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -83,7 +83,7 @@ class GetTest(QueryTest):
         u = s.query(User).get(7)
         u2 = s.query(User).get(7)
         assert u is u2
-        s.clear()
+        s.expunge_all()
         u2 = s.query(User).get(7)
         assert u is not u2
 
@@ -122,7 +122,7 @@ class GetTest(QueryTest):
         u = s.query(User).populate_existing().get(7)
         u2 = s.query(User).populate_existing().get(7)
         assert u is u2
-        s.clear()
+        s.expunge_all()
         u2 = s.query(User).populate_existing().get(7)
         assert u is not u2
 
@@ -893,7 +893,7 @@ class DistinctTest(QueryTest):
 
         assert [User(id=7), User(id=9), User(id=8)] == q.all()
 
-        sess.clear()
+        sess.expunge_all()
 
         # test that it works on embedded eagerload/LIMIT subquery
         q = sess.query(User).join('addresses').distinct().options(eagerload('addresses')).order_by(desc(Address.email_address)).limit(2)
@@ -1176,7 +1176,7 @@ class JoinTest(QueryTest):
         l = q.order_by(User.id, AdAlias.id).all()
         self.assertEquals(l, expected)
 
-        sess.clear()
+        sess.expunge_all()
 
         q = sess.query(User).add_entity(AdAlias)
         l = q.select_from(outerjoin(User, AdAlias)).filter(AdAlias.email_address=='ed@bettyboop.com').all()
@@ -1429,7 +1429,7 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
             assert fixtures.user_address_result == l
         self.assert_sql_count(testing.db, go, 1)
 
-        sess.clear()
+        sess.expunge_all()
 
         def go():
             l = q.options(contains_alias('ulist'), contains_eager('addresses')).from_statement(query).all()
@@ -1466,14 +1466,14 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
         def go():
             assert fixtures.user_address_result == q.all()
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
         adalias = addresses.alias()
         q = sess.query(User).select_from(users.outerjoin(adalias)).options(contains_eager(User.addresses, alias=adalias))
         def go():
             self.assertEquals(fixtures.user_address_result, q.order_by(User.id).all())
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
         selectquery = users.outerjoin(addresses).select(users.c.id<10, use_labels=True, order_by=[users.c.id, addresses.c.id])
         q = sess.query(User)
@@ -1483,13 +1483,13 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
             assert fixtures.user_address_result[0:3] == l
         self.assert_sql_count(testing.db, go, 1)
 
-        sess.clear()
+        sess.expunge_all()
 
         def go():
             l = list(q.options(contains_eager(User.addresses)).instances(selectquery.execute()))
             assert fixtures.user_address_result[0:3] == l
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
         def go():
             l = q.options(contains_eager('addresses')).from_statement(selectquery).all()
@@ -1507,7 +1507,7 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
             l = list(q.options(contains_eager('addresses', alias="adalias")).instances(selectquery.execute()))
             assert fixtures.user_address_result == l
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
         # expression.Alias object
         def go():
@@ -1515,7 +1515,7 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
             assert fixtures.user_address_result == l
         self.assert_sql_count(testing.db, go, 1)
 
-        sess.clear()
+        sess.expunge_all()
 
         # Aliased object
         adalias = aliased(Address)
@@ -1523,7 +1523,7 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
             l = q.options(contains_eager('addresses', alias=adalias)).outerjoin((adalias, User.addresses)).order_by(User.id, adalias.id)
             assert fixtures.user_address_result == l.all()
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
         oalias = orders.alias('o1')
         ialias = items.alias('i1')
@@ -1535,14 +1535,14 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
             assert fixtures.user_order_result == l
         self.assert_sql_count(testing.db, go, 1)
 
-        sess.clear()
+        sess.expunge_all()
 
         # test using Alias with more than one level deep
         def go():
             l = list(q.options(contains_eager('orders', alias=oalias), contains_eager('orders.items', alias=ialias)).instances(query.execute()))
             assert fixtures.user_order_result == l
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
         # test using Aliased with more than one level deep
         oalias = aliased(Order)
@@ -1552,7 +1552,7 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
                 outerjoin((oalias, User.orders), (ialias, oalias.items)).order_by(User.id, oalias.id, ialias.id)
             assert fixtures.user_order_result == l.all()
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
     def test_mixed_eager_contains_with_limit(self):
         sess = create_session()
@@ -1572,7 +1572,7 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
                 Order(address_id=None,user_id=7,description=u'order 5',isopen=0,id=5)
             ])])
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
         def go():
             # same as above, except Order is aliased, so two adapters are applied by the
@@ -1849,25 +1849,25 @@ class MixedEntitiesTest(QueryTest):
 
         selectquery = users.outerjoin(addresses).select(use_labels=True, order_by=[users.c.id, addresses.c.id])
         self.assertEquals(list(sess.query(User, Address).instances(selectquery.execute())), expected)
-        sess.clear()
+        sess.expunge_all()
 
         for address_entity in (Address, aliased(Address)):
             q = sess.query(User).add_entity(address_entity).outerjoin(('addresses', address_entity)).order_by(User.id, address_entity.id)
             self.assertEquals(q.all(), expected)
-            sess.clear()
+            sess.expunge_all()
 
             q = sess.query(User).add_entity(address_entity)
             q = q.join(('addresses', address_entity)).filter_by(email_address='ed@bettyboop.com')
             self.assertEquals(q.all(), [(user8, address3)])
-            sess.clear()
+            sess.expunge_all()
 
             q = sess.query(User, address_entity).join(('addresses', address_entity)).filter_by(email_address='ed@bettyboop.com')
             self.assertEquals(q.all(), [(user8, address3)])
-            sess.clear()
+            sess.expunge_all()
 
             q = sess.query(User, address_entity).join(('addresses', address_entity)).options(eagerload('addresses')).filter_by(email_address='ed@bettyboop.com')
             self.assertEquals(list(util.OrderedSet(q.all())), [(user8, address3)])
-            sess.clear()
+            sess.expunge_all()
 
     def test_aliased_multi_mappers(self):
         sess = create_session()
@@ -1888,7 +1888,7 @@ class MixedEntitiesTest(QueryTest):
         l = q.order_by(User.id, adalias.c.id).all()
         assert l == expected
 
-        sess.clear()
+        sess.expunge_all()
 
         q = sess.query(User).add_entity(Address, alias=adalias)
         l = q.select_from(users.outerjoin(adalias)).filter(adalias.c.email_address=='ed@bettyboop.com').all()
@@ -1901,7 +1901,7 @@ class MixedEntitiesTest(QueryTest):
 
         for add_col in (User.name, users.c.name):
             assert sess.query(User).add_column(add_col).all() == expected
-            sess.clear()
+            sess.expunge_all()
 
         self.assertRaises(sa_exc.InvalidRequestError, sess.query(User).add_column, object())
     
@@ -1929,13 +1929,13 @@ class MixedEntitiesTest(QueryTest):
         q = sess.query(User)
         q = q.group_by([c for c in users.c]).order_by(User.id).outerjoin('addresses').add_column(func.count(Address.id).label('count'))
         self.assertEquals(q.all(), expected)
-        sess.clear()
+        sess.expunge_all()
         
         adalias = aliased(Address)
         q = sess.query(User)
         q = q.group_by([c for c in users.c]).order_by(User.id).outerjoin(('addresses', adalias)).add_column(func.count(adalias.id).label('count'))
         self.assertEquals(q.all(), expected)
-        sess.clear()
+        sess.expunge_all()
 
         s = select([users, func.count(addresses.c.id).label('count')]).select_from(users.outerjoin(addresses)).group_by(*[c for c in users.c]).order_by(User.id)
         q = sess.query(User)
@@ -1965,7 +1965,7 @@ class MixedEntitiesTest(QueryTest):
         l = q.add_column("count").add_column("concat").from_statement(s).all()
         assert l == expected
 
-        sess.clear()
+        sess.expunge_all()
 
         # test with select_from()
         q = create_session().query(User).add_column(func.count(addresses.c.id))\
@@ -1973,21 +1973,21 @@ class MixedEntitiesTest(QueryTest):
             .group_by([c for c in users.c]).order_by(users.c.id)
 
         assert q.all() == expected
-        sess.clear()
+        sess.expunge_all()
 
         q = create_session().query(User).add_column(func.count(addresses.c.id))\
             .add_column(("Name:" + users.c.name)).outerjoin('addresses')\
             .group_by([c for c in users.c]).order_by(users.c.id)
 
         assert q.all() == expected
-        sess.clear()
+        sess.expunge_all()
 
         q = create_session().query(User).add_column(func.count(adalias.c.id))\
             .add_column(("Name:" + users.c.name)).outerjoin(('addresses', adalias))\
             .group_by([c for c in users.c]).order_by(users.c.id)
 
         assert q.all() == expected
-        sess.clear()
+        sess.expunge_all()
 
 
 class ImmediateTest(_fixtures.FixtureTest):
@@ -2191,7 +2191,7 @@ class SelectFromTest(QueryTest):
                 ])
         self.assert_sql_count(testing.db, go, 1)
 
-        sess.clear()
+        sess.expunge_all()
         sel2 = orders.select(orders.c.id.in_([1,2,3]))
         self.assertEquals(sess.query(Order).select_from(sel2).join(['items', 'keywords']).filter(Keyword.name == 'red').order_by(Order.id).all(), [
             Order(description=u'order 1',id=1),
@@ -2220,14 +2220,14 @@ class SelectFromTest(QueryTest):
                 ]
             )
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
         def go():
             self.assertEquals(sess.query(User).options(eagerload('addresses')).select_from(sel).filter(User.id==8).order_by(User.id).all(),
                 [User(id=8, addresses=[Address(id=2), Address(id=3), Address(id=4)])]
             )
         self.assert_sql_count(testing.db, go, 1)
-        sess.clear()
+        sess.expunge_all()
 
         def go():
             self.assertEquals(sess.query(User).options(eagerload('addresses')).select_from(sel).order_by(User.id)[1], User(id=8, addresses=[Address(id=2), Address(id=3), Address(id=4)]))
@@ -2286,7 +2286,7 @@ class SelfReferentialTest(ORMTest):
         n1.children[1].append(Node(data='n121'))
         n1.children[1].append(Node(data='n122'))
         n1.children[1].append(Node(data='n123'))
-        sess.save(n1)
+        sess.add(n1)
         sess.flush()
         sess.close()
         
@@ -2470,10 +2470,10 @@ class SelfReferentialM2MTest(ORMTest):
         n2.children = [n3, n6, n7]
         n3.children = [n5, n4]
 
-        sess.save(n1)
-        sess.save(n2)
-        sess.save(n3)
-        sess.save(n4)
+        sess.add(n1)
+        sess.add(n2)
+        sess.add(n3)
+        sess.add(n4)
         sess.flush()
         sess.close()
 
@@ -2548,7 +2548,7 @@ class ExternalColumnsTest(QueryTest):
 
         # run the eager version twice to test caching of aliased clauses
         for x in range(2):
-            sess.clear()
+            sess.expunge_all()
             def go():
                self.assertEquals(sess.query(Address).options(eagerload('user')).all(), address_result)
             self.assert_sql_count(testing.db, go, 1)