diff --git a/src/py/crankshaft/test/test_pysal_utils.py b/src/py/crankshaft/test/test_pysal_utils.py index 82c38f1..9af8522 100644 --- a/src/py/crankshaft/test/test_pysal_utils.py +++ b/src/py/crankshaft/test/test_pysal_utils.py @@ -16,6 +16,13 @@ class PysalUtilsTest(unittest.TestCase): ("geom_col", "the_geom"), ("num_ngbrs", 321)]) + self.params2 = OrderedDict([("id_col", "cartodb_id"), + ("attr1", "price"), + ("attr2", "sq_meters"), + ("subquery", "SELECT * FROM a_list"), + ("geom_col", "the_geom"), + ("num_ngbrs", 321)]) + self.params_array = {"id_col": "cartodb_id", "time_cols": ["_2013_dec", "_2014_jan", "_2014_feb"], "subquery": "SELECT * FROM a_list", @@ -28,11 +35,15 @@ class PysalUtilsTest(unittest.TestCase): ans = "i.\"andy\"::numeric As attr1, " \ "i.\"jay_z\"::numeric As attr2, " + ans2 = "i.\"price\"::numeric As attr1, " \ + "i.\"sq_meters\"::numeric As attr2, " + ans_array = "i.\"_2013_dec\"::numeric As attr1, " \ "i.\"_2014_jan\"::numeric As attr2, " \ "i.\"_2014_feb\"::numeric As attr3, " self.assertEqual(pu.query_attr_select(self.params), ans) + self.assertEqual(pu.query_attr_select(self.params2), ans2) self.assertEqual(pu.query_attr_select(self.params_array), ans_array) def test_query_attr_where(self):