Sort array that was misordered (#31)

* Sort array that was misordered

* wasn't sorting on string

* do set comparison instead

Author: max-hoffman

tests/helpers.py

@@ -22,15 +22,15 @@ def compare_rows_helper(expected: List[dict], actual: List[dict]):
         actual
     ), f"Unequal row counts: {len(expected)} != {len(actual)}"
     errors = []
-    for l, r in zip(expected, actual):
-        l_cols, r_cols = set(l.keys()), set(r.keys())
-        assert l_cols == r_cols, f"Unequal sets of columns: {l_cols} != {r_cols}"
-        for col in l_cols:
-            l_val, r_val = l[col], r[col]
-            if col.startswith("date"):
-                l_val, r_val = l_val[:10], r_val[:10]
-            if l_val != r_val and not (l_val is None and r_val == ""):
-                errors.append(f"{col}: {l_val} != {r_val}")
+    for k in expected[0].keys():
+        if k.startswith("date"):
+            exp = set([e[k][:10] for e in expected])
+            act = set([a[k][:10] for a in actual])
+        else:
+            exp = set([e[k] for e in expected])
+            act = set([a[k] for a in actual])
+        if exp ^ act != set():
+            errors.append(f"Unequal value sets: {exp}, {act}")
 
     error_str = "\n".join(errors)
     assert not errors, f"Failed with the following unequal columns:\n{error_str}"

tests/test_read.py

@@ -56,5 +56,6 @@ def test_read_columns(with_initial_test_data):
     second_commit = update_test_data(dolt)
     first_write = read_columns(dolt, TEST_TABLE, first_commit)
     compare_rows_helper(columns_to_rows(first_write), TEST_DATA_INITIAL)
-    second_write = read_columns(dolt, TEST_TABLE, second_commit)
-    compare_rows_helper(columns_to_rows(second_write), TEST_DATA_COMBINED)
+    second_write = columns_to_rows(read_columns(dolt, TEST_TABLE, second_commit))
+    sorted(second_write, key=lambda x: int(x["id"]))
+    compare_rows_helper(second_write, TEST_DATA_COMBINED)