Merge pull request #170 from dimagi/sk/use-generator

don't evaluate the generator

commcare_export/minilinq.py

@@ -434,7 +434,7 @@ def eval(self, env):
         env.emit_table(TableSpec(
             name=self.table,
             headings=[heading.eval(env) for heading in self.headings],
-            rows=list(map(self.coerce_row, rows)),
+            rows=map(self.coerce_row, rows),
             data_types=[lit.v for lit in self.data_types]
         ))
 

commcare_export/specs.py

@@ -13,14 +13,12 @@ def __eq__(self, other):
             isinstance(other, TableSpec)
             and other.name == self.name
             and other.headings == self.headings
-            and other.rows == self.rows
             and other.data_types == self.data_types
         )
 
     def toJSON(self):
         return {
             'name': self.name,
             'headings': self.headings,
-            'rows': self.rows,
             'data_types': self.data_types,
         }

commcare_export/writers.py

@@ -210,9 +210,9 @@ def write_table(self, table):
         else:
             assert self.tables[table.name].headings == list(table.headings)
 
-        self.tables[table.name].rows.extend(
+        self.tables[table.name].rows = list(self.tables[table.name].rows) + [
             [to_jvalue(v) for v in row] for row in table.rows
-        )
+        ]
 
 
 class StreamingMarkdownTableWriter(TableWriter):