(no commit message)

diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py
index c7551c50e3ec5b70c67a7e58ef966119ad644caa..12cbfc1e0c94ebd10c7f990dc698fc71c6129468 100644 (file)
--- a/lib/sqlalchemy/mapper.py
+++ b/lib/sqlalchemy/mapper.py
@@ -540,7 +540,6 @@ class PropertyLoader(MapperProperty):
             childlist = uow.attributes.get_history(obj, self.key)
 
         for child in childlist.deleted_items() + childlist.unchanged_items():
-            print "deleted? " + repr(child)
             uow.register_deleted(child)
 
             

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index ec8e809233a4831b66315a1cb7d8bb245beed023..3d5ca1bb4ae9397148369871100277e2b0af5bef 100644 (file)
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -102,8 +102,11 @@ class ThreadLocal(object):
 
 class HashSet(object):
     """implements a Set."""
-    def __init__(self, iter = None):
-        self.map  = {}
+    def __init__(self, iter = None, ordered = False):
+        if ordered:
+            self.map = OrderedDict()
+        else:
+            self.map  = {}
         if iter is not None:
             for i in iter:
                 self.append(i)

diff --git a/test/objectstore.py b/test/objectstore.py
index b6dc5bdd682ff02fbe8d066a8f9b1b76e3eb8a94..77073b6cdda50a272677a47f0b16604171a042e8 100644 (file)
--- a/test/objectstore.py
+++ b/test/objectstore.py
@@ -40,8 +40,14 @@ class HistoryTest(AssertMixin):
 class SaveTest(AssertMixin):
 
     def setUp(self):
+        db.echo = False
         objectstore.clear()
         clear_mappers()
+        orders.delete().execute()
+        orderitems.delete().execute()
+        users.delete().execute()
+        addresses.delete().execute()
+        db.echo = True
         
     def testbasic(self):
         # save two users
@@ -194,9 +200,8 @@ class SaveTest(AssertMixin):
                     o.items.append(i)
                 
         objectstore.uow().commit()
-        return
         objectstore.clear()
-        
+
         l = m.select()
         for u in l:
             print repr(u.orders)