(no commit message)

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index 80891ae0916013e89e6992256d58d87bb98db85b..87a867358d8a2df0f144672e0d0001f3f57eaed3 100644 (file)
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -91,7 +91,7 @@ class UnitOfWork(object):
         else:
             self.identity_map = {}
         self.attributes = UOWAttributeManager(self)
-        self.new = util.HashSet()
+        self.new = util.HashSet(ordered = True)
         self.dirty = util.HashSet()
         self.modified_lists = util.HashSet()
         self.deleted = util.HashSet()
@@ -352,7 +352,7 @@ class UOWTransaction(object):
             return res
             
         for task in self.tasks.values():
-            print "new node for " + str(task)
+            #print "new node for " + str(task)
             bymapper[(task.mapper, task.isdelete)] = task
             
     
@@ -376,7 +376,7 @@ class UOWTask(object):
         self.isdelete = isdelete
         self.objects = util.HashSet()
         self.dependencies = []
-        print "new task " + str(self)
+        #print "new task " + str(self)
     
     def __str__(self):
         if self.isdelete:

diff --git a/test/mapper.py b/test/mapper.py
index ceea987af18edf2b7925cac821d838d7aad0fa40..9a31c00a7e384aaf7a2116fb0ac5bb48cc1793c9 100644 (file)
--- a/test/mapper.py
+++ b/test/mapper.py
@@ -87,7 +87,7 @@ class LazyTest(AssertMixin):
 
     def testbackwardsonetoone(self):
         m = mapper(Address, addresses, properties = dict(
-            user = relation(User, users, primaryjoin = users.c.user_id == addresses.c.user_id, lazy = True, uselist = False)
+            user = relation(User, users, primaryjoin = users.c.user_id == addresses.c.user_id, lazy = True)
         ))
         l = m.select(addresses.c.address_id == 1)
         print repr(l)
@@ -146,8 +146,9 @@ class EagerTest(AssertMixin):
 
     def testbackwardsonetoone(self):
         m = mapper(Address, addresses, properties = dict(
-            user = relation(User, users, lazy = False, uselist = False)
+            user = relation(User, users, lazy = False)
         ))
+        print repr(m.props['user'].uselist)
         l = m.select(addresses.c.address_id == 1)
         self.assert_result(l, Address, 
             {'address_id' : 1, 'email_address' : 'jack@bean.com',