Merge pull request #56 from dimagi/sk/return-all-rows

return all rows even when no grouping is taking place

setup.py

@@ -15,7 +15,7 @@
 
 setup(
     name='sqlagg',
-    version='0.16.1',
+    version='0.17.0-beta',
     description='SQL aggregation tool',
     author='Dimagi',
     author_email='dev@dimagi.com',

sqlagg/base.py

@@ -257,7 +257,11 @@ def resolve(self, connection, filter_values=None):
         """
         Returns a dict containing the data of the following format:
         * If group_by == [] or None
-            return a dict mapping column names to values: {'col_a': 1....}
+            return a dict mapping row numbers to row data:
+            e.g. {
+                    1: {'col_a': 1....}
+                    2: {...}
+                }
         * If len(group_by) == 1
             return a dict mapping groupings to that group levels data
             e.g. {
@@ -277,22 +281,19 @@ def resolve(self, connection, filter_values=None):
         for qm in self.query_meta.values():
             result = qm.execute(self.connection, filter_values or {})
 
-            for r in result:
+            for index, sql_row in enumerate(result):
                 if not qm.group_by:
-                    row_key = None
+                    row_key = index
                 elif len(qm.group_by) == 1:
-                    row_key = r[qm.group_by[0]]
+                    row_key = sql_row[qm.group_by[0]]
                 elif len(qm.group_by) > 1:
-                    row_key = tuple([r[group] for group in qm.group_by])
-
-                if qm.group_by:
-                    if row_key is None:
-                        # null values coming out of the database wreak havoc elsewhere in the code
-                        row_key = ''
-                    row = data.setdefault(row_key, {})
-                    row.update(kvp for kvp in r.items())
-                else:
-                    data.update(kvp for kvp in r.items())
+                    row_key = tuple([sql_row[group] for group in qm.group_by])
+
+                if row_key is None:
+                    # null values coming out of the database wreak havoc elsewhere in the code
+                    row_key = ''
+                row = data.setdefault(row_key, {})
+                row.update(kvp for kvp in sql_row.items())
 
         return data
 

tests/test_columns.py

@@ -91,8 +91,9 @@ def test_alias_column(self):
         vc.append_column(i_a)
         vc.append_column(i_a2)
         data = vc.resolve(self.session.connection())
-        self.assertEqual(i_a.get_value(data), 6)
-        self.assertEqual(i_a2.get_value(data), 6)
+        self.assertEqual(len(data), 1)
+        self.assertEqual(i_a.get_value(data[0]), 6)
+        self.assertEqual(i_a2.get_value(data[0]), 6)
 
     def test_alias_column_with_aliases(self):
         vc = QueryContext("user_table")
@@ -101,8 +102,9 @@ def test_alias_column_with_aliases(self):
         vc.append_column(i_a)
         vc.append_column(i_a2)
         data = vc.resolve(self.session.connection())
-        self.assertEqual(i_a.get_value(data), 6)
-        self.assertEqual(i_a2.get_value(data), 6)
+        self.assertEqual(len(data), 1)
+        self.assertEqual(i_a.get_value(data[0]), 6)
+        self.assertEqual(i_a2.get_value(data[0]), 6)
 
     def test_aggregate_column(self):
         col = AggregateColumn(lambda x, y: x + y,
@@ -216,7 +218,8 @@ def test_quarter(self):
 
     def _test_view(self, view, expected):
         data = self._get_view_data(view)
-        value = view.get_value(data)
+        self.assertEqual(len(data), 1)
+        value = view.get_value(data[0])
         self.assertAlmostEqual(float(value), float(expected))
 
     def _get_view_data(self, view):

tests/tests.py

@@ -136,7 +136,8 @@ class CustomColumn(BaseColumn):
         vc.append_column(agg_view)
         data = vc.resolve(self.session.connection(), None)
 
-        self.assertAlmostEqual(float(data["indicator_a"]), float(0.25))
+        self.assertEqual(len(data), 1)
+        self.assertAlmostEqual(float(data[0]["indicator_a"]), float(0.25))
 
     def test_multiple_tables(self):
         filters = [LT('date', 'enddate')]