fixed more save/clear calls

diff --git a/test/profiling/memusage.py b/test/profiling/memusage.py
index 71d81d8634ddfa1c6a6bdbfe8622bf7573c11b27..8bc2825db873e9686215f297fcf2ace8cd57e0b3 100644 (file)
--- a/test/profiling/memusage.py
+++ b/test/profiling/memusage.py
@@ -101,7 +101,7 @@ class MemUsageTest(EnsureZeroed):
             for x in [a1,a2,a3]:
                 sess.add(x)
             sess.flush()
-            sess.clear()
+            sess.expunge_all()
 
             alist = sess.query(A).all()
             self.assertEquals(
@@ -152,7 +152,7 @@ class MemUsageTest(EnsureZeroed):
             for x in [a1,a2,a3]:
                 sess.add(x)
             sess.flush()
-            sess.clear()
+            sess.expunge_all()
 
             alist = sess.query(A).order_by(A.col1).all()
             self.assertEquals(
@@ -212,7 +212,7 @@ class MemUsageTest(EnsureZeroed):
             for x in [a1,a2,b1, b2]:
                 sess.add(x)
             sess.flush()
-            sess.clear()
+            sess.expunge_all()
 
             alist = sess.query(A).order_by(A.col1).all()
             self.assertEquals(
@@ -276,7 +276,7 @@ class MemUsageTest(EnsureZeroed):
             for x in [a1,a2]:
                 sess.add(x)
             sess.flush()
-            sess.clear()
+            sess.expunge_all()
 
             alist = sess.query(A).order_by(A.col1).all()
             self.assertEquals(

diff --git a/test/profiling/zoomark_orm.py b/test/profiling/zoomark_orm.py
index 8d5c28c69e4088c20284126bb36f9eea71358821..7a189f87313ed027268cbd93f28dbe25d4c11b8b 100644 (file)
--- a/test/profiling/zoomark_orm.py
+++ b/test/profiling/zoomark_orm.py
@@ -88,7 +88,7 @@ class ZooMarkTest(TestBase):
                            LastEscape=datetime.datetime(2004, 7, 29, 5, 6, 7),
                            Admission=4.95,
                            )
-        session.save(wap)
+        session.add(wap)
         sdz = Zoo(Name =u'San Diego Zoo',
                            # This early date should play havoc with a number
                            # of implementations.
@@ -96,7 +96,7 @@ class ZooMarkTest(TestBase):
                            Opens = datetime.time(9, 0, 0),
                            Admission = 0,
                            )
-        session.save(sdz)
+        session.add(sdz)
         
         bio = Zoo(
                   Name = u'Montr\xe9al Biod\xf4me',
@@ -104,11 +104,11 @@ class ZooMarkTest(TestBase):
                   Opens = datetime.time(9, 0, 0),
                   Admission = 11.75,
                   )
-        session.save(bio)
+        session.add(bio)
         
         seaworld = Zoo(
                 Name =u'Sea_World', Admission = 60)
-        session.save(seaworld)
+        session.add(seaworld)
         
         # Let's add a crazy futuristic Zoo to test large date values.
         lp = Zoo(Name =u'Luna Park',
@@ -116,40 +116,40 @@ class ZooMarkTest(TestBase):
                                   Opens = datetime.time(0, 0, 0),
                                   Admission = 134.95,
                                   )
-        session.save(lp)
+        session.add(lp)
         session.flush()
         
         # Animals
         leopard = Animal(Species=u'Leopard', Lifespan=73.5,)
-        session.save(leopard)
+        session.add(leopard)
         leopard.ZooID = wap.ID
         leopard.LastEscape = datetime.datetime(2004, 12, 21, 8, 15, 0, 999907)
         
-        session.save(Animal(Species=u'Lion', ZooID=wap.ID))
-        session.save(Animal(Species=u'Slug', Legs=1, Lifespan=.75))
-        session.save(Animal(Species=u'Tiger', ZooID=sdz.ID))
+        session.add(Animal(Species=u'Lion', ZooID=wap.ID))
+        session.add(Animal(Species=u'Slug', Legs=1, Lifespan=.75))
+        session.add(Animal(Species=u'Tiger', ZooID=sdz.ID))
         
         # Override Legs.default with itself just to make sure it works.
-        session.save(Animal(Species=u'Bear', Legs=4))
-        session.save(Animal(Species=u'Ostrich', Legs=2, Lifespan=103.2))
-        session.save(Animal(Species=u'Centipede', Legs=100))
+        session.add(Animal(Species=u'Bear', Legs=4))
+        session.add(Animal(Species=u'Ostrich', Legs=2, Lifespan=103.2))
+        session.add(Animal(Species=u'Centipede', Legs=100))
         
-        session.save(Animal(Species=u'Emperor Penguin', Legs=2, ZooID=seaworld.ID))
-        session.save(Animal(Species=u'Adelie Penguin', Legs=2, ZooID=seaworld.ID))
+        session.add(Animal(Species=u'Emperor Penguin', Legs=2, ZooID=seaworld.ID))
+        session.add(Animal(Species=u'Adelie Penguin', Legs=2, ZooID=seaworld.ID))
         
-        session.save(Animal(Species=u'Millipede', Legs=1000000, ZooID=sdz.ID))
+        session.add(Animal(Species=u'Millipede', Legs=1000000, ZooID=sdz.ID))
         
         # Add a mother and child to test relationships
         bai_yun = Animal(Species=u'Ape', Nameu=u'Bai Yun', Legs=2)
-        session.save(bai_yun)
-        session.save(Animal(Species=u'Ape', Name=u'Hua Mei', Legs=2,
+        session.add(bai_yun)
+        session.add(Animal(Species=u'Ape', Name=u'Hua Mei', Legs=2,
                          MotherID=bai_yun.ID))
         session.flush()
         session.commit()
 
     def test_baseline_2_insert(self):
         for x in xrange(ITERATIONS):
-            session.save(Animal(Species=u'Tick', Name=u'Tick %d' % x, Legs=8))
+            session.add(Animal(Species=u'Tick', Name=u'Tick %d' % x, Legs=8))
         session.flush()
 
     def test_baseline_3_properties(self):

diff --git a/test/zblog/tests.py b/test/zblog/tests.py
index 4f77d350d36e8870d7387bc4fcbab07d00fbaca7..f784c27962c74c9579484001f88ab54450575439 100644 (file)
--- a/test/zblog/tests.py
+++ b/test/zblog/tests.py
@@ -34,8 +34,8 @@ class SavePostTest(ZBlogTest):
         user = User('zbloguser', "Zblog User", "hello", group=administrator)
         blog = Blog(owner=user)
         blog.name = "this is a blog"
-        s.save(user)
-        s.save(blog)
+        s.add(user)
+        s.add(blog)
         s.flush()
         blog_id = blog.id
         user_id = user.id
@@ -55,7 +55,7 @@ class SavePostTest(ZBlogTest):
         try:
             blog = s.query(Blog).get(blog_id)
             post = Post(headline="asdf asdf", summary="asdfasfd")
-            s.save(post)
+            s.add(post)
             post.blog_id=blog_id
             post.blog = blog
             assert post in blog.posts
@@ -74,9 +74,9 @@ class SavePostTest(ZBlogTest):
             post.blog = blog
             user = s.query(User).get(user_id)
             post.user = user
-            s.save(post)
+            s.add(post)
             s.flush()
-            s.clear()
+            s.expunge_all()
 
             user = s.query(User).get(user_id)
             blog = s.query(Blog).get(blog_id)
@@ -85,7 +85,7 @@ class SavePostTest(ZBlogTest):
             comment.post = post
             comment.user = user
             s.flush()
-            s.clear()
+            s.expunge_all()
 
             assert s.query(Post).get(post.id) is not None