- 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.

12 files changed, 171 insertions, 171 deletions

diff --git a/test/orm/inheritance/abc_inheritance.py b/test/orm/inheritance/abc_inheritance.py
index 7b14ca929..6415e9919 100644
--- a/test/orm/inheritance/abc_inheritance.py
+++ b/test/orm/inheritance/abc_inheritance.py
@@ -114,21 +114,21 @@ def produce_test(parent, child, direction):
 
             #print "APPENDING", parent.__class__.__name__ , "TO", child.__class__.__name__
 
-            sess.save(parent_obj)
+            sess.add(parent_obj)
             parent_obj.collection.append(child_obj)
             if direction == ONETOMANY:
                 child2 = child_class('child2')
                 parent_obj.collection.append(child2)
-                sess.save(child2)
+                sess.add(child2)
             elif direction == MANYTOONE:
                 parent2 = parent_class('parent2')
                 parent2.collection.append(child_obj)
-                sess.save(parent2)
-            sess.save(somea)
-            sess.save(someb)
-            sess.save(somec)
+                sess.add(parent2)
+            sess.add(somea)
+            sess.add(someb)
+            sess.add(somec)
             sess.flush()
-            sess.clear()
+            sess.expunge_all()
 
             # assert result via direct get() of parent object
             result = sess.query(parent_class).get(parent_obj.id)
@@ -141,7 +141,7 @@ def produce_test(parent, child, direction):
                 assert result2.id == parent2.id
                 assert result2.collection[0].id == child_obj.id
 
-            sess.clear()
+            sess.expunge_all()
 
             # assert result via polymorphic load of parent object
             result = sess.query(A).filter_by(id=parent_obj.id).one()
diff --git a/test/orm/inheritance/abc_polymorphic.py b/test/orm/inheritance/abc_polymorphic.py
index 05df5d51e..79e3f880d 100644
--- a/test/orm/inheritance/abc_polymorphic.py
+++ b/test/orm/inheritance/abc_polymorphic.py
@@ -46,9 +46,9 @@ class ABCTest(ORMTest):
 
             sess = create_session()
             for x in (a1, b1, b2, b3, c1, c2, c3):
-                sess.save(x)
+                sess.add(x)
             sess.flush()
-            sess.clear()
+            sess.expunge_all()
 
             #for obj in sess.query(A).all():
             #    print obj
diff --git a/test/orm/inheritance/basic.py b/test/orm/inheritance/basic.py
index dd0701da4..0068c5534 100644
--- a/test/orm/inheritance/basic.py
+++ b/test/orm/inheritance/basic.py
@@ -50,14 +50,14 @@ class O2MTest(ORMTest):
         b1 = Blub("blub #1")
         b2 = Blub("blub #2")
         f = Foo("foo #1")
-        sess.save(b1)
-        sess.save(b2)
-        sess.save(f)
+        sess.add(b1)
+        sess.add(b2)
+        sess.add(f)
         b1.parent_foo = f
         b2.parent_foo = f
         sess.flush()
         compare = ','.join([repr(b1), repr(b2), repr(b1.parent_foo), repr(b2.parent_foo)])
-        sess.clear()
+        sess.expunge_all()
         l = sess.query(Blub).all()
         result = ','.join([repr(l[0]), repr(l[1]), repr(l[0].parent_foo), repr(l[1].parent_foo)])
         print compare
@@ -77,10 +77,10 @@ class FalseDiscriminatorTest(ORMTest):
         mapper(Bar, inherits=Foo, polymorphic_identity=0)
         sess = create_session()
         f1 = Bar()
-        sess.save(f1)
+        sess.add(f1)
         sess.flush()
         assert f1.type == 0
-        sess.clear()
+        sess.expunge_all()
         assert isinstance(sess.query(Foo).one(), Bar)
         
 class PolymorphicSynonymTest(ORMTest):
@@ -111,10 +111,10 @@ class PolymorphicSynonymTest(ORMTest):
         sess = create_session()
         at1 = T1(info='at1')
         at2 = T2(info='at2', data='t2 data')
-        sess.save(at1)
-        sess.save(at2)
+        sess.add(at1)
+        sess.add(at2)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
         self.assertEquals(sess.query(T2).filter(T2.info=='at2').one(), at2)
         self.assertEquals(at2.info, "THE INFO IS:at2")
         
@@ -177,7 +177,7 @@ class CascadeTest(ORMTest):
         t4_1 = T4(data='t4')
         t3_1.t4s.append(t4_1)
 
-        sess.save(t1_1)
+        sess.add(t1_1)
 
 
         assert t4_1 in sess.new
@@ -230,9 +230,9 @@ class GetTest(ORMTest):
             f = Foo()
             b = Bar()
             bl = Blub()
-            sess.save(f)
-            sess.save(b)
-            sess.save(bl)
+            sess.add(f)
+            sess.add(b)
+            sess.add(bl)
             sess.flush()
 
             if polymorphic:
@@ -357,7 +357,7 @@ class FlushTest(ORMTest):
         admin_mapper = mapper(Admin, admins, inherits=user_mapper)
         sess = create_session()
         adminrole = Role()
-        sess.save(adminrole)
+        sess.add(adminrole)
         sess.flush()
 
         # create an Admin, and append a Role.  the dependency processors
@@ -367,7 +367,7 @@ class FlushTest(ORMTest):
         a = Admin()
         a.roles.append(adminrole)
         a.password = 'admin'
-        sess.save(a)
+        sess.add(a)
         sess.flush()
 
         assert user_roles.count().scalar() == 1
@@ -396,13 +396,13 @@ class FlushTest(ORMTest):
         adminrole = Role('admin')
 
         sess = create_session()
-        sess.save(adminrole)
+        sess.add(adminrole)
         sess.flush()
 
         # create admin user
         a = Admin(email='tim', password='admin')
         a.roles.append(adminrole)
-        sess.save(a)
+        sess.add(a)
         sess.flush()
 
         a.password = 'sadmin'
@@ -446,8 +446,8 @@ class VersioningTest(ORMTest):
 
         b1 = Base(value='b1')
         s1 = Sub(value='sub1', subdata='some subdata')
-        sess.save(b1)
-        sess.save(s1)
+        sess.add(b1)
+        sess.add(s1)
 
         sess.flush()
 
@@ -491,9 +491,9 @@ class VersioningTest(ORMTest):
         b1 = Base(value='b1')
         s1 = Sub(value='sub1', subdata='some subdata')
         s2 = Sub(value='sub2', subdata='some other subdata')
-        sess.save(b1)
-        sess.save(s1)
-        sess.save(s2)
+        sess.add(b1)
+        sess.add(s1)
+        sess.add(s2)
 
         sess.flush()
 
@@ -637,16 +637,16 @@ class SyncCompileTest(ORMTest):
         session = create_session()
 
         a = A(data1='a1')
-        session.save(a)
+        session.add(a)
 
         b = B(data1='b1', data2='b2')
-        session.save(b)
+        session.add(b)
 
         c = C(data1='c1', data2='c2', data3='c3')
-        session.save(c)
+        session.add(c)
 
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         assert len(session.query(A).all()) == 3
         assert len(session.query(B).all()) == 2
@@ -852,7 +852,7 @@ class OverrideColKeyTest(ORMTest):
 
         sess.add_all([s1, b1])
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
         
         assert sess.query(Base).get(b1.base_id).subdata == "this is base"
         assert sess.query(Sub).get(s1.base_id).subdata == "this is sub"
@@ -877,7 +877,7 @@ class OverrideColKeyTest(ORMTest):
 
         sess.add_all([s1, b1])
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
 
         assert sess.query(Base).get(b1.base_id).data == "this is base"
         assert sess.query(Sub).get(s1.base_id).data == "this is base"
@@ -914,9 +914,9 @@ class OptimizedLoadTest(ORMTest):
         s1 = Sub()
         s1.data = 's1data'
         s1.sub = 's1sub'
-        sess.save(s1)
+        sess.add(s1)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
         
         # load s1 via Base.  s1.id won't populate since it's relative to 
         # the "sub" table.  The optimized load kicks in and tries to 
diff --git a/test/orm/inheritance/concrete.py b/test/orm/inheritance/concrete.py
index 225a66da8..6cdaed7e6 100644
--- a/test/orm/inheritance/concrete.py
+++ b/test/orm/inheritance/concrete.py
@@ -92,10 +92,10 @@ class ConcreteTest(_base.MappedTest):
             concrete=True, polymorphic_identity='engineer')
 
         session = create_session()
-        session.save(Manager('Tom', 'knows how to manage things'))
-        session.save(Engineer('Kurt', 'knows how to hack'))
+        session.add(Manager('Tom', 'knows how to manage things'))
+        session.add(Engineer('Kurt', 'knows how to hack'))
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         assert set([repr(x) for x in session.query(Employee)]) == set(["Engineer Kurt knows how to hack", "Manager Tom knows how to manage things"])
         assert set([repr(x) for x in session.query(Manager)]) == set(["Manager Tom knows how to manage things"])
@@ -148,7 +148,7 @@ class ConcreteTest(_base.MappedTest):
             self.assertEquals(hacker.nickname, "Badass")
         self.assert_sql_count(testing.db, go, 0)
         
-        session.clear()
+        session.expunge_all()
 
         assert repr(session.query(Employee).filter(Employee.name=='Tom').one()) == "Manager Tom knows how to manage things"
         assert repr(session.query(Manager).filter(Manager.name=='Tom').one()) == "Manager Tom knows how to manage things"
@@ -198,7 +198,7 @@ class ConcreteTest(_base.MappedTest):
             self.assertEquals(hacker.nickname, "Badass")
         self.assert_sql_count(testing.db, go, 0)
 
-        session.clear()
+        session.expunge_all()
 
         # check that we aren't getting a cartesian product in the raw SQL.
         # this requires that Engineer's polymorphic discriminator is not rendered
@@ -300,15 +300,15 @@ class ConcreteTest(_base.MappedTest):
         c = Company()
         c.employees.append(Manager('Tom', 'knows how to manage things'))
         c.employees.append(Engineer('Kurt', 'knows how to hack'))
-        session.save(c)
+        session.add(c)
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         def go():
             c2 = session.query(Company).get(c.id)
             assert set([repr(x) for x in c2.employees]) == set(["Engineer Kurt knows how to hack", "Manager Tom knows how to manage things"])
         self.assert_sql_count(testing.db, go, 2)
-        session.clear()
+        session.expunge_all()
         def go():
             c2 = session.query(Company).options(eagerload(Company.employees)).get(c.id)
             assert set([repr(x) for x in c2.employees]) == set(["Engineer Kurt knows how to hack", "Manager Tom knows how to manage things"])
diff --git a/test/orm/inheritance/magazine.py b/test/orm/inheritance/magazine.py
index a0444269d..2557e4116 100644
--- a/test/orm/inheritance/magazine.py
+++ b/test/orm/inheritance/magazine.py
@@ -24,7 +24,7 @@ class Location(BaseObject):
     def _set_name(self, name):
         session = create_session()
         s = session.query(LocationName).filter(LocationName.name==name).first()
-        session.clear()
+        session.expunge_all()
         if s is not None:
             self._name = s
 
@@ -193,14 +193,14 @@ def generate_round_trip_test(use_unions=False, use_joins=False):
         page = ClassifiedPage(magazine=magazine,page_no=1)
         page2 = MagazinePage(magazine=magazine,page_no=2)
         page3 = ClassifiedPage(magazine=magazine,page_no=3)
-        session.save(pub)
+        session.add(pub)
 
         session.flush()
         print [x for x in session]
-        session.clear()
+        session.expunge_all()
 
         session.flush()
-        session.clear()
+        session.expunge_all()
         p = session.query(Publication).filter(Publication.name=="Test").one()
 
         print p.issues[0].locations[0].magazine.pages
diff --git a/test/orm/inheritance/manytomany.py b/test/orm/inheritance/manytomany.py
index 43d36e9aa..081bdb823 100644
--- a/test/orm/inheritance/manytomany.py
+++ b/test/orm/inheritance/manytomany.py
@@ -59,7 +59,7 @@ class InheritTest(ORMTest):
         g = Group(name="group1")
         g.users.append(User(name="user1", password="pw", email="foo@bar.com", login_id="lg1"))
         sess = create_session()
-        sess.save(g)
+        sess.add(g)
         sess.flush()
         # TODO: put an assertion
 
@@ -94,9 +94,9 @@ class InheritTest2(ORMTest):
         print class_mapper(Bar).primary_key
         b = Bar('somedata')
         sess = create_session()
-        sess.save(b)
+        sess.add(b)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
 
         # test that "bar.bid" does not need to be referenced in a get
         # (ticket 185)
@@ -117,7 +117,7 @@ class InheritTest2(ORMTest):
 
         sess = create_session()
         b = Bar('barfoo')
-        sess.save(b)
+        sess.add(b)
         sess.flush()
 
         f1 = Foo('subfoo1')
@@ -126,7 +126,7 @@ class InheritTest2(ORMTest):
         b.foos.append(f2)
 
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
 
         l = sess.query(Bar).all()
         print l[0]
@@ -185,12 +185,12 @@ class InheritTest3(ORMTest):
 
         sess = create_session()
         b = Bar('bar #1')
-        sess.save(b)
+        sess.add(b)
         b.foos.append(Foo("foo #1"))
         b.foos.append(Foo("foo #2"))
         sess.flush()
         compare = repr(b) + repr(sorted([repr(o) for o in b.foos]))
-        sess.clear()
+        sess.expunge_all()
         l = sess.query(Bar).all()
         print repr(l[0]) + repr(l[0].foos)
         found = repr(l[0]) + repr(sorted([repr(o) for o in l[0].foos]))
@@ -225,18 +225,18 @@ class InheritTest3(ORMTest):
         b2 = Bar("bar #2")
         bl1 = Blub("blub #1")
         for o in (f1, b1, b2, bl1):
-            sess.save(o)
+            sess.add(o)
         bl1.foos.append(f1)
         bl1.bars.append(b2)
         sess.flush()
         compare = repr(bl1)
         blubid = bl1.id
-        sess.clear()
+        sess.expunge_all()
 
         l = sess.query(Blub).all()
         print l
         self.assert_(repr(l[0]) == compare)
-        sess.clear()
+        sess.expunge_all()
         x = sess.query(Blub).filter_by(id=blubid).one()
         print x
         self.assert_(repr(x) == compare)
diff --git a/test/orm/inheritance/poly_linked_list.py b/test/orm/inheritance/poly_linked_list.py
index 5e9f016c1..3fe9f9c8d 100644
--- a/test/orm/inheritance/poly_linked_list.py
+++ b/test/orm/inheritance/poly_linked_list.py
@@ -150,7 +150,7 @@ class PolymorphicCircularTest(ORMTest):
             obj = newobj
 
         # save to DB
-        sess.save(t)
+        sess.add(t)
         sess.flush()
 
         # string version of the saved list
@@ -166,7 +166,7 @@ class PolymorphicCircularTest(ORMTest):
 
 
         # clear and query forwards
-        sess.clear()
+        sess.expunge_all()
         node = sess.query(Table1).filter(Table1.id==t.id).first()
         assertlist = []
         while (node):
@@ -178,7 +178,7 @@ class PolymorphicCircularTest(ORMTest):
         forwards = repr(assertlist)
 
         # clear and query backwards
-        sess.clear()
+        sess.expunge_all()
         node = sess.query(Table1).filter(Table1.id==obj.id).first()
         assertlist = []
         while (node):
diff --git a/test/orm/inheritance/polymorph.py b/test/orm/inheritance/polymorph.py
index aa241cea8..aee21fa8d 100644
--- a/test/orm/inheritance/polymorph.py
+++ b/test/orm/inheritance/polymorph.py
@@ -80,9 +80,9 @@ class InsertOrderTest(PolymorphTest):
         c.employees.append(Person(status='HHH', name='joesmith'))
         c.employees.append(Engineer(status='CGG', engineer_name='engineer2', primary_language='python', name='wally'))
         c.employees.append(Manager(status='ABA', manager_name='manager2', name='jsmith'))
-        session.save(c)
+        session.add(c)
         session.flush()
-        session.clear()
+        session.expunge_all()
         self.assertEquals(session.query(Company).get(c.company_id), c)
 
 class RelationToSubclassTest(PolymorphTest):
@@ -111,9 +111,9 @@ class RelationToSubclassTest(PolymorphTest):
 
         c = Company(name='company1')
         c.managers.append(Manager(status='AAB', manager_name='manager1', name='pointy haired boss'))
-        sess.save(c)
+        sess.add(c)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
 
         self.assertEquals(sess.query(Company).filter_by(company_id=c.company_id).one(), c)
         assert c.managers[0].company is c
@@ -200,16 +200,16 @@ def generate_round_trip_test(include_base, lazy_relation, redefine_colprop, with
         session = create_session()
         c = Company(name='company1')
         c.employees = employees
-        session.save(c)
+        session.add(c)
 
         session.flush()
-        session.clear()
+        session.expunge_all()
         
         self.assertEquals(session.query(Person).get(dilbert.person_id), dilbert)
-        session.clear()
+        session.expunge_all()
 
         self.assertEquals(session.query(Person).filter(Person.person_id==dilbert.person_id).one(), dilbert)
-        session.clear()
+        session.expunge_all()
 
         def go():
             cc = session.query(Company).get(c.company_id)
@@ -253,12 +253,12 @@ def generate_round_trip_test(include_base, lazy_relation, redefine_colprop, with
         dilbert.engineer_name = 'hes dibert!'
 
         session.flush()
-        session.clear()
+        session.expunge_all()
         
         def go():
             session.query(Person).filter(getattr(Person, person_attribute_name)=='dilbert').first()
         self.assert_sql_count(testing.db, go, 1)
-        session.clear()
+        session.expunge_all()
         dilbert = session.query(Person).filter(getattr(Person, person_attribute_name)=='dilbert').first()
         def go():
             # assert that only primary table is queried for already-present-in-session
@@ -267,13 +267,13 @@ def generate_round_trip_test(include_base, lazy_relation, redefine_colprop, with
 
         # test standalone orphans
         daboss = Boss(status='BBB', manager_name='boss', golf_swing='fore', **{person_attribute_name:'daboss'})
-        session.save(daboss)
+        session.add(daboss)
         self.assertRaises(orm_exc.FlushError, session.flush)
         c = session.query(Company).first()
         daboss.company = c
         manager_list = [e for e in c.employees if isinstance(e, Manager)]
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         self.assertEquals(session.query(Manager).order_by(Manager.person_id).all(), manager_list)
         c = session.query(Company).first()
diff --git a/test/orm/inheritance/polymorph2.py b/test/orm/inheritance/polymorph2.py
index 78081d506..c5b9b3fde 100644
--- a/test/orm/inheritance/polymorph2.py
+++ b/test/orm/inheritance/polymorph2.py
@@ -59,9 +59,9 @@ class RelationTest1(ORMTest):
         p = Person(name='some person')
         m = Manager(name='some manager')
         p.manager = m
-        session.save(p)
+        session.add(p)
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         p = session.query(Person).get(p.person_id)
         m = session.query(Manager).get(m.person_id)
@@ -86,9 +86,9 @@ class RelationTest1(ORMTest):
         p = Person(name='some person')
         m = Manager(name='some manager')
         m.employee = p
-        session.save(m)
+        session.add(m)
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         p = session.query(Person).get(p.person_id)
         m = session.query(Manager).get(m.person_id)
@@ -178,10 +178,10 @@ class RelationTest2(ORMTest):
         m.colleague = p
         if usedata:
             m.data = Data('ms data')
-        sess.save(m)
+        sess.add(m)
         sess.flush()
 
-        sess.clear()
+        sess.expunge_all()
         p = sess.query(Person).get(p.person_id)
         m = sess.query(Manager).get(m.person_id)
         print p
@@ -268,11 +268,11 @@ def generate_test(jointype="join1", usedata=False):
             p.data = Data('ps data')
             m.data = Data('ms data')
 
-        sess.save(m)
-        sess.save(p)
+        sess.add(m)
+        sess.add(p)
         sess.flush()
 
-        sess.clear()
+        sess.expunge_all()
         p = sess.query(Person).get(p.person_id)
         p2 = sess.query(Person).get(p2.person_id)
         p3 = sess.query(Person).get(p3.person_id)
@@ -357,10 +357,10 @@ class RelationTest4(ORMTest):
 
         # creating 5 managers named from M1 to E5
         for i in range(1,5):
-            session.save(Manager(name="M%d" % i,longer_status="YYYYYYYYY"))
+            session.add(Manager(name="M%d" % i,longer_status="YYYYYYYYY"))
         # creating 5 engineers named from E1 to E5
         for i in range(1,5):
-            session.save(Engineer(name="E%d" % i,status="X"))
+            session.add(Engineer(name="E%d" % i,status="X"))
 
         session.flush()
 
@@ -368,12 +368,12 @@ class RelationTest4(ORMTest):
         manager3 = session.query(Manager).filter(Manager.name=="M3").first()
 
         car1 = Car(employee=engineer4)
-        session.save(car1)
+        session.add(car1)
         car2 = Car(employee=manager3)
-        session.save(car2)
+        session.add(car2)
         session.flush()
 
-        session.clear()
+        session.expunge_all()
     
         def go():
             testcar = session.query(Car).options(eagerload('employee')).get(car1.car_id)
@@ -394,7 +394,7 @@ class RelationTest4(ORMTest):
         assert str(usingGet) == "Engineer E4, status X"
         assert str(usingProperty) == "Engineer E4, status X"
 
-        session.clear()
+        session.expunge_all()
         print "-----------------------------------------------------------------"
         # and now for the lightning round, eager !
 
@@ -403,7 +403,7 @@ class RelationTest4(ORMTest):
             assert str(testcar.employee) == "Engineer E4, status X"
         self.assert_sql_count(testing.db, go, 1)
 
-        session.clear()
+        session.expunge_all()
         s = session.query(Car)
         c = s.join("employee").filter(Person.name=="E4")[0]
         assert c.car_id==car1.car_id
@@ -459,10 +459,10 @@ class RelationTest5(ORMTest):
         car1 = Car()
         car2 = Car()
         car2.manager = Manager()
-        sess.save(car1)
-        sess.save(car2)
+        sess.add(car1)
+        sess.add(car2)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
 
         carlist = sess.query(Car).all()
         assert carlist[0].manager is None
@@ -503,10 +503,10 @@ class RelationTest6(ORMTest):
         m = Manager(name='manager1')
         m2 =Manager(name='manager2')
         m.colleague = m2
-        sess.save(m)
+        sess.add(m)
         sess.flush()
 
-        sess.clear()
+        sess.expunge_all()
         m = sess.query(Manager).get(m.person_id)
         m2 = sess.query(Manager).get(m2.person_id)
         assert m.colleague is m2
@@ -601,10 +601,10 @@ class RelationTest7(ORMTest):
                 car=Car()
             else:
                 car=Offraod_Car()
-            session.save(Manager(name="M%d" % i,category="YYYYYYYYY",car=car))
-            session.save(Engineer(name="E%d" % i,field="X",car=car))
+            session.add(Manager(name="M%d" % i,category="YYYYYYYYY",car=car))
+            session.add(Engineer(name="E%d" % i,field="X",car=car))
             session.flush()
-            session.clear()
+            session.expunge_all()
 
         r = session.query(Person).all()
         for p in r:
@@ -697,8 +697,8 @@ class GenerativeTest(TestBase, AssertsExecutionResults):
         active = Status(name="active")
         dead = Status(name="dead")
 
-        session.save(active)
-        session.save(dead)
+        session.add(active)
+        session.add(dead)
         session.flush()
 
         # TODO: we haven't created assertions for all the data combinations created here
@@ -710,8 +710,8 @@ class GenerativeTest(TestBase, AssertsExecutionResults):
                 st=active
             else:
                 st=dead
-            session.save(Manager(name="M%d" % i,category="YYYYYYYYY",status=st))
-            session.save(Engineer(name="E%d" % i,field="X",status=st))
+            session.add(Manager(name="M%d" % i,category="YYYYYYYYY",status=st))
+            session.add(Engineer(name="E%d" % i,field="X",status=st))
 
         session.flush()
 
@@ -721,8 +721,8 @@ class GenerativeTest(TestBase, AssertsExecutionResults):
         # create 2 cars for E4, one active and one dead
         car1 = Car(employee=engineer4,status=active)
         car2 = Car(employee=engineer4,status=dead)
-        session.save(car1)
-        session.save(car2)
+        session.add(car1)
+        session.add(car2)
         session.flush()
 
         # this particular adapt used to cause a recursion overflow;
@@ -807,9 +807,9 @@ class MultiLevelTest(ORMTest):
         c = Manager().set( name= 'head', machine= 'fast', duties= 'many')
 
         session = create_session()
-        session.save(a)
-        session.save(b)
-        session.save(c)
+        session.add(a)
+        session.add(b)
+        session.add(c)
         session.flush()
         assert set(session.query(Employee).all()) == set([a,b,c])
         assert set(session.query( Engineer).all()) == set([b,c])
@@ -898,10 +898,10 @@ class CustomPKTest(ORMTest):
         ot1 = T1()
         ot2 = T2()
         sess = create_session()
-        sess.save(ot1)
-        sess.save(ot2)
+        sess.add(ot1)
+        sess.add(ot2)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
 
         # query using get(), using only one value.  this requires the select_table mapper
         # has the same single-col primary key.
@@ -935,10 +935,10 @@ class CustomPKTest(ORMTest):
         ot1 = T1()
         ot2 = T2()
         sess = create_session()
-        sess.save(ot1)
-        sess.save(ot2)
+        sess.add(ot1)
+        sess.add(ot2)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
 
         # query using get(), using only one value.  this requires the select_table mapper
         # has the same single-col primary key.
@@ -995,7 +995,7 @@ class InheritingEagerTest(ORMTest):
         session = create_session()
 
         bob = Employee()
-        session.save(bob)
+        session.add(bob)
 
         tag = Tag('crazy')
         bob.tags.append(tag)
@@ -1004,7 +1004,7 @@ class InheritingEagerTest(ORMTest):
         bob.tags.append(tag)
         session.flush()
 
-        session.clear()
+        session.expunge_all()
         # query from Employee with limit, query needs to apply eager limiting subquery
         instance = session.query(Employee).filter_by(id=1).limit(1).first()
         assert len(instance.tags) == 2
@@ -1052,10 +1052,10 @@ class MissingPolymorphicOnTest(ORMTest):
         c = C(cdata='c1', adata='a1', b=B(data='c'))
         d = D(cdata='c2', adata='a2', ddata='d2', b=B(data='d'))
         sess = create_session()
-        sess.save(c)
-        sess.save(d)
+        sess.add(c)
+        sess.add(d)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
         self.assertEquals(sess.query(A).all(), [C(cdata='c1', adata='a1'), D(cdata='c2', adata='a2', ddata='d2')])
         
 if __name__ == "__main__":
diff --git a/test/orm/inheritance/productspec.py b/test/orm/inheritance/productspec.py
index ba4828c69..63c6a24fe 100644
--- a/test/orm/inheritance/productspec.py
+++ b/test/orm/inheritance/productspec.py
@@ -113,10 +113,10 @@ class InheritTest(ORMTest):
         d1 = Detail(name='d1')
         a1.specification.append(SpecLine(slave=d1))
 
-        session.save(a1)
+        session.add(a1)
         orig = repr(a1)
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         a1 = session.query(Product).filter_by(name='a1').one()
         new = repr(a1)
@@ -145,11 +145,11 @@ class InheritTest(ORMTest):
 
         s = SpecLine(slave=Product(name='p1'))
         s2 = SpecLine(slave=Detail(name='d1'))
-        session.save(s)
-        session.save(s2)
+        session.add(s)
+        session.add(s2)
         orig = repr([s, s2])
         session.flush()
-        session.clear()
+        session.expunge_all()
         new = repr(session.query(SpecLine).all())
         print orig
         print new
@@ -197,10 +197,10 @@ class InheritTest(ORMTest):
         a1.specification.append(SpecLine(slave=Detail(name='d1')))
         a1.documents.append(Document('doc1'))
         a1.documents.append(RasterDocument('doc2'))
-        session.save(a1)
+        session.add(a1)
         orig = repr(a1)
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         a1 = session.query(Product).filter_by(name='a1').one()
         new = repr(a1)
@@ -235,10 +235,10 @@ class InheritTest(ORMTest):
 
         a1 = Assembly(name='a1')
         a1.documents.append(RasterDocument('doc2'))
-        session.save(a1)
+        session.add(a1)
         orig = repr(a1)
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         a1 = session.query(Product).filter_by(name='a1').one()
         new = repr(a1)
@@ -248,7 +248,7 @@ class InheritTest(ORMTest):
 
         del a1.documents[0]
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         a1 = session.query(Product).filter_by(name='a1').one()
         assert len(session.query(Document).all()) == 0
@@ -302,10 +302,10 @@ class InheritTest(ORMTest):
         a1.specification.append(SpecLine(slave=Detail(name='d1')))
         a1.documents.append(Document('doc1'))
         a1.documents.append(RasterDocument('doc2'))
-        session.save(a1)
+        session.add(a1)
         orig = repr(a1)
         session.flush()
-        session.clear()
+        session.expunge_all()
 
         a1 = session.query(Product).filter_by(name='a1').one()
         new = repr(a1)
diff --git a/test/orm/inheritance/query.py b/test/orm/inheritance/query.py
index f362ea097..fe948931b 100644
--- a/test/orm/inheritance/query.py
+++ b/test/orm/inheritance/query.py
@@ -166,10 +166,10 @@ def make_test(select_type):
         
             c2.employees = [e3]
             sess = create_session()
-            sess.save(c1)
-            sess.save(c2)
+            sess.add(c1)
+            sess.add(c2)
             sess.flush()
-            sess.clear()
+            sess.expunge_all()
 
             all_employees = [e1, e2, b1, m1, e3]
             c1_employees = [e1, e2, b1, m1]
@@ -239,13 +239,13 @@ def make_test(select_type):
             sess = create_session()
 
             for aliased in (True, False):
-                sess.clear()
+                sess.expunge_all()
                 self.assertEquals(sess.query(Person).with_polymorphic(Manager).join('paperwork', aliased=aliased).filter(Paperwork.description.like('%review%')).all(), [b1, m1])
 
-                sess.clear()
+                sess.expunge_all()
                 self.assertEquals(sess.query(Person).with_polymorphic([Manager, Engineer]).join('paperwork', aliased=aliased).filter(Paperwork.description.like('%#2%')).all(), [e1, m1])
 
-                sess.clear()
+                sess.expunge_all()
                 self.assertEquals(sess.query(Person).with_polymorphic([Manager, Engineer]).join('paperwork', aliased=aliased).filter(Person.name.like('%dog%')).filter(Paperwork.description.like('%#2%')).all(), [m1])
     
         def test_join_to_polymorphic(self):
@@ -340,22 +340,22 @@ def make_test(select_type):
                 self.assertEquals(sess.query(Person).with_polymorphic(Engineer).filter(Engineer.primary_language=='java').all(), emps_without_relations[0:1])
             self.assert_sql_count(testing.db, go, 1)
             
-            sess.clear()
+            sess.expunge_all()
             def go():
                 self.assertEquals(sess.query(Person).with_polymorphic('*').all(), emps_without_relations)
             self.assert_sql_count(testing.db, go, 1)
 
-            sess.clear()
+            sess.expunge_all()
             def go():
                 self.assertEquals(sess.query(Person).with_polymorphic(Engineer).all(), emps_without_relations)
             self.assert_sql_count(testing.db, go, 3)
 
-            sess.clear()
+            sess.expunge_all()
             def go():
                 self.assertEquals(sess.query(Person).with_polymorphic(Engineer, people.outerjoin(engineers)).all(), emps_without_relations)
             self.assert_sql_count(testing.db, go, 3)
             
-            sess.clear()
+            sess.expunge_all()
             def go():
                 # limit the polymorphic join down to just "Person", overriding select_table
                 self.assertEquals(sess.query(Person).with_polymorphic(Person).all(), emps_without_relations)
@@ -719,10 +719,10 @@ class SelfReferentialTestJoinedToBase(ORMTest):
         p1 = Person(name='dogbert')
         e1 = Engineer(name='dilbert', primary_language='java', reports_to=p1)
         sess = create_session()
-        sess.save(p1)
-        sess.save(e1)
+        sess.add(p1)
+        sess.add(e1)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
         
         self.assertEquals(sess.query(Engineer).filter(Engineer.reports_to.has(Person.name=='dogbert')).first(), Engineer(name='dilbert'))
 
@@ -739,10 +739,10 @@ class SelfReferentialTestJoinedToBase(ORMTest):
         p1 = Person(name='dogbert')
         e1 = Engineer(name='dilbert', primary_language='java', reports_to=p1)
         sess = create_session()
-        sess.save(p1)
-        sess.save(e1)
+        sess.add(p1)
+        sess.add(e1)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
         
         self.assertEquals(
             sess.query(Engineer).join('reports_to', aliased=True).filter(Person.name=='dogbert').first(), 
@@ -781,10 +781,10 @@ class SelfReferentialTestJoinedToJoined(ORMTest):
         m1 = Manager(name='dogbert')
         e1 = Engineer(name='dilbert', primary_language='java', reports_to=m1)
         sess = create_session()
-        sess.save(m1)
-        sess.save(e1)
+        sess.add(m1)
+        sess.add(e1)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
 
         self.assertEquals(sess.query(Engineer).filter(Engineer.reports_to.has(Manager.name=='dogbert')).first(), Engineer(name='dilbert'))
 
@@ -792,10 +792,10 @@ class SelfReferentialTestJoinedToJoined(ORMTest):
         m1 = Manager(name='dogbert')
         e1 = Engineer(name='dilbert', primary_language='java', reports_to=m1)
         sess = create_session()
-        sess.save(m1)
-        sess.save(e1)
+        sess.add(m1)
+        sess.add(e1)
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
 
         self.assertEquals(
             sess.query(Engineer).join('reports_to', aliased=True).filter(Manager.name=='dogbert').first(), 
@@ -847,8 +847,8 @@ class M2MFilterTest(ORMTest):
         org2 = Organization(name='org2', engineers=[e3, e4])
         
         sess = create_session()
-        sess.save(org1)
-        sess.save(org2)
+        sess.add(org1)
+        sess.add(org2)
         sess.flush()
         
     def test_not_contains(self):
diff --git a/test/orm/inheritance/single.py b/test/orm/inheritance/single.py
index 19c9a83f2..8134d86c4 100644
--- a/test/orm/inheritance/single.py
+++ b/test/orm/inheritance/single.py
@@ -227,7 +227,7 @@ class RelationToSingleTest(MappedTest):
         e2 = JuniorEngineer(name='Ed', engineer_info='oh that ed', company=c1)
         sess.add_all([c1, c2, m1, m2, e1, e2])
         sess.commit()
-        sess.clear()
+        sess.expunge_all()
         self.assertEquals(
             sess.query(Company).filter(Company.employees.of_type(JuniorEngineer).any()).all(),
             [
@@ -269,7 +269,7 @@ class RelationToSingleTest(MappedTest):
         self.assertEquals(c1.engineers, [e2])
         self.assertEquals(c2.engineers, [e1])
         
-        sess.clear()
+        sess.expunge_all()
         self.assertEquals(sess.query(Company).order_by(Company.name).all(), 
             [
                 Company(name='c1', engineers=[JuniorEngineer(name='Ed')]),
@@ -278,7 +278,7 @@ class RelationToSingleTest(MappedTest):
         )
 
         # eager load join should limit to only "Engineer"
-        sess.clear()
+        sess.expunge_all()
         self.assertEquals(sess.query(Company).options(eagerload('engineers')).order_by(Company.name).all(), 
             [
                 Company(name='c1', engineers=[JuniorEngineer(name='Ed')]),
@@ -287,7 +287,7 @@ class RelationToSingleTest(MappedTest):
        )
 
         # join() to Company.engineers, Employee as the requested entity
-        sess.clear()
+        sess.expunge_all()
         self.assertEquals(sess.query(Company, Employee).join(Company.engineers).order_by(Company.name).all(),
             [
                 (Company(name='c1'), JuniorEngineer(name='Ed')),
@@ -297,7 +297,7 @@ class RelationToSingleTest(MappedTest):
         
         # join() to Company.engineers, Engineer as the requested entity.
         # this actually applies the IN criterion twice which is less than ideal.
-        sess.clear()
+        sess.expunge_all()
         self.assertEquals(sess.query(Company, Engineer).join(Company.engineers).order_by(Company.name).all(),
             [
                 (Company(name='c1'), JuniorEngineer(name='Ed')),
@@ -306,7 +306,7 @@ class RelationToSingleTest(MappedTest):
         )
 
         # join() to Company.engineers without any Employee/Engineer entity
-        sess.clear()
+        sess.expunge_all()
         self.assertEquals(sess.query(Company).join(Company.engineers).filter(Engineer.name.in_(['Tom', 'Kurt'])).all(),
             [
                 Company(name='c2')
@@ -321,7 +321,7 @@ class RelationToSingleTest(MappedTest):
         # section to "inheritance" laying out all the various behaviors Query has.
         @testing.fails_on_everything_except()
         def go():
-            sess.clear()
+            sess.expunge_all()
             self.assertEquals(sess.query(Company).\
                 filter(Company.company_id==Engineer.company_id).filter(Engineer.name.in_(['Tom', 'Kurt'])).all(),
                 [
@@ -359,29 +359,29 @@ class SingleOnJoinedTest(ORMTest):
         mapper(Manager, inherits=Employee,polymorphic_identity='manager')
         
         sess = create_session()
-        sess.save(Person(name='p1'))
-        sess.save(Employee(name='e1', employee_data='ed1'))
-        sess.save(Manager(name='m1', employee_data='ed2', manager_data='md1'))
+        sess.add(Person(name='p1'))
+        sess.add(Employee(name='e1', employee_data='ed1'))
+        sess.add(Manager(name='m1', employee_data='ed2', manager_data='md1'))
         sess.flush()
-        sess.clear()
+        sess.expunge_all()
         
         self.assertEquals(sess.query(Person).order_by(Person.person_id).all(), [
             Person(name='p1'),
             Employee(name='e1', employee_data='ed1'),
             Manager(name='m1', employee_data='ed2', manager_data='md1')
         ])
-        sess.clear()
+        sess.expunge_all()
 
         self.assertEquals(sess.query(Employee).order_by(Person.person_id).all(), [
             Employee(name='e1', employee_data='ed1'),
             Manager(name='m1', employee_data='ed2', manager_data='md1')
         ])
-        sess.clear()
+        sess.expunge_all()
 
         self.assertEquals(sess.query(Manager).order_by(Person.person_id).all(), [
             Manager(name='m1', employee_data='ed2', manager_data='md1')
         ])
-        sess.clear()
+        sess.expunge_all()
         
         def go():
             self.assertEquals(sess.query(Person).with_polymorphic('*').order_by(Person.person_id).all(), [