Added __len__ to RowProxy to allow len(r) and test for same.

diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py
index 3af02616b33248bd50137c72a8fcd7899765ae38..3a3af2ce93236746cd0116dc5cf8b35f256e864e 100644 (file)
--- a/lib/sqlalchemy/engine.py
+++ b/lib/sqlalchemy/engine.py
@@ -716,6 +716,8 @@ class RowProxy:
         return [v for _, v in self.iteritems()]
     def items(self):
         return list(self.iteritems())
+    def __len__(self):
+        return len(self.keys())
 
 
 

diff --git a/test/query.py b/test/query.py
index ceb50ebd00b7bb93497ec5984805520f1cb1137a..cae0c306939e15253e955a40e1bfddba50f626a0 100644 (file)
--- a/test/query.py
+++ b/test/query.py
@@ -116,6 +116,7 @@ class QueryTest(PersistTest):
         self.assertEqual(r.values(), [1, 'foo'])
         self.assertEqual(zip(r.itervalues(), r.iterkeys()), zip(r.values(), r.keys()))
         self.assertEqual(repr(r), "{'user_name': u'foo', 'user_id': 1}")
+        self.assertEqual(len(r), 2)
         
     def test_column_accessor_shadow(self):
         shadowed = Table('test_shadowed', db,