Jonas Borgström's fantastic SelectRsults patch that adds dynamic list argument support to the mapper.select() methd. associated unit test tweaks and mapper integration.

4 files changed, 12 insertions, 10 deletions

diff --git a/test/alltests.py b/test/alltests.py
index d30f97287..b266ebcb1 100644
--- a/test/alltests.py
+++ b/test/alltests.py
@@ -33,6 +33,7 @@ def suite():
         
         # ORM selecting
         'mapper',
+        'selectresults',
         'eagertest1',
         'eagertest2',
         
diff --git a/test/mapper.py b/test/mapper.py
index 4a8edd097..6bfc3f3b8 100644
--- a/test/mapper.py
+++ b/test/mapper.py
@@ -133,7 +133,7 @@ class MapperTest(MapperSuperTest):
         # object isnt refreshed yet, using dict to bypass trigger
         self.assert_(u.__dict__['user_name'] != 'jack')
         # do a select
-        m.select()
+        m.select().list()
         # test that it refreshed
         self.assert_(u.__dict__['user_name'] == 'jack')
         
@@ -255,7 +255,7 @@ class MapperTest(MapperSuperTest):
         m = mapper(User, users, properties = dict(
             addresses = relation(mapper(Address, addresses), lazy = True)
         ))
-        l = m.options(eagerload('addresses')).select()
+        l = m.options(eagerload('addresses')).select().list()
 
         def go():
             self.assert_result(l, User, *user_address_result)
@@ -266,7 +266,7 @@ class MapperTest(MapperSuperTest):
         m = mapper(User, users, properties = dict(
             addresses = relation(mapper(Address, addresses), lazy = False)
         ))
-        l = m.options(lazyload('addresses')).select()
+        l = m.options(lazyload('addresses')).select().list()
         def go():
             self.assert_result(l, User, *user_address_result)
         self.assert_sql_count(db, go, 3)
@@ -282,12 +282,12 @@ class MapperTest(MapperSuperTest):
             })
             
         m2 = m.options(eagerload('orders.items.keywords'))
-        u = m.select()
+        u = m.select().list()
         def go():
             print u[0].orders[1].items[0].keywords[1]
         self.assert_sql_count(db, go, 3)
         objectstore.clear()
-        u = m2.select()
+        u = m2.select().list()
         self.assert_sql_count(db, go, 2)
         
 class PropertyTest(MapperSuperTest):
@@ -368,7 +368,7 @@ class DeferredTest(MapperSuperTest):
         self.assert_(o.description is None)
         
         def go():
-            l = m.select()
+            l = m.select().list()
             o2 = l[2]
             print o2.description
 
@@ -397,7 +397,7 @@ class DeferredTest(MapperSuperTest):
         })
 
         def go():
-            l = m.select()
+            l = m.select().list()
             o2 = l[2]
             print o2.opened, o2.description, o2.userident
         self.assert_sql(db, go, [
@@ -410,7 +410,7 @@ class DeferredTest(MapperSuperTest):
         m = mapper(Order, orders)
         m2 = m.options(defer('user_id'))
         def go():
-            l = m2.select()
+            l = m2.select().list()
             print l[2].user_id
         self.assert_sql(db, go, [
             ("SELECT orders.order_id AS orders_order_id, orders.description AS orders_description, orders.isopen AS orders_isopen FROM orders ORDER BY orders.%s" % orders.default_order_by()[0].key, {}),
@@ -419,7 +419,7 @@ class DeferredTest(MapperSuperTest):
         objectstore.clear()
         m3 = m2.options(undefer('user_id'))
         def go():
-            l = m3.select()
+            l = m3.select().list()
             print l[3].user_id
         self.assert_sql(db, go, [
             ("SELECT orders.order_id AS orders_order_id, orders.user_id AS orders_user_id, orders.description AS orders_description, orders.isopen AS orders_isopen FROM orders ORDER BY orders.%s" % orders.default_order_by()[0].key, {}),
diff --git a/test/proxy_engine.py b/test/proxy_engine.py
index 170e526d9..cd01272b5 100644
--- a/test/proxy_engine.py
+++ b/test/proxy_engine.py
@@ -96,7 +96,7 @@ class ThreadProxyTest(PersistTest):
                     try:
                         trans  = objectstore.begin()
 
-                        all = User.select()[:]
+                        all = User.select()[:].list()
                         assert all == []
 
                         u = User()
diff --git a/test/testbase.py b/test/testbase.py
index f3dfac15b..1578be5a0 100644
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -74,6 +74,7 @@ class AssertMixin(PersistTest):
     """given a list-based structure of keys/properties which represent information within an object structure, and
     a list of actual objects, asserts that the list of objects corresponds to the structure."""
     def assert_result(self, result, class_, *objects):
+        result = list(result)
         if echo:
             print repr(result)
         self.assert_list(result, class_, objects)