Fix testdata and maplib dep

DataTreehouse · Feb 6, 2025 · 382e425 · 382e425
1 parent de5837c
commit 382e425
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,11 +16,11 @@ members = [
 #pydf_io = { path = "../maplib/lib/pydf_io"}
 #representation = { path = "../maplib/lib/representation", features = ["rdf-star"]}
 #templates = { path = "../maplib/lib/templates"}
-spargebra = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
-query_processing = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
-pydf_io = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
-representation = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
-templates = { git = "https://github.com/DataTreehouse/maplib", rev="01c9ad280fb890478a7900844433fa62df24d511" }
+spargebra = { git = "https://github.com/DataTreehouse/maplib", rev="f693f30dd3644fd8533b9f582dd344309239ab30" }
+query_processing = { git = "https://github.com/DataTreehouse/maplib", rev="f693f30dd3644fd8533b9f582dd344309239ab30" }
+pydf_io = { git = "https://github.com/DataTreehouse/maplib", rev="f693f30dd3644fd8533b9f582dd344309239ab30" }
+representation = { git = "https://github.com/DataTreehouse/maplib", rev="f693f30dd3644fd8533b9f582dd344309239ab30" }
+templates = { git = "https://github.com/DataTreehouse/maplib", rev="f693f30dd3644fd8533b9f582dd344309239ab30" }
 
 
 sparesults = { version = "0.2.3" }

diff --git a/py_chrontext/tests/test_python_database.py b/py_chrontext/tests/test_python_database.py
@@ -32,6 +32,7 @@ def __init__(self):
 
     def query(self, sql: str):
         df = self.con.execute(sql).pl()
+        print(df)
         return df
 
 
@@ -248,7 +249,7 @@ def test_pushdown_group_by_second_having_hybrid_query(engine):
     df = sm.mappings.cast({"sum_v": pl.Int64}).sort(by)
     expected = pl.read_csv(TESTDATA_PATH / "expected_pushdown_group_by_second_having_hybrid.csv", try_parse_dates=True).sort(by)
     assert_frame_equal(df, expected)
-    assert sm.pushdown_paths == [['ProjectInner', 'ExtendInner', 'ExtendInner', 'FilterInner']]
+    assert sm.pushdown_paths == [['ProjectInner', 'FilterInner', 'ExtendInner', 'ExtendInner']]
 
 
 def test_union_of_two_groupby_queries(engine):
@@ -299,8 +300,8 @@ def test_union_of_two_groupby_queries(engine):
     assert sm.pushdown_paths == [['ProjectInner',
                                   'UnionLeftSide',
                                   'ProjectInner',
-                                  'ExtendInner',
                                   'FilterInner',
+                                  'ExtendInner',
                                   'GroupInner',
                                   'FilterInner',
                                   'ExtendInner',
@@ -309,8 +310,8 @@ def test_union_of_two_groupby_queries(engine):
                                  ['ProjectInner',
                                   'UnionRightSide',
                                   'ProjectInner',
-                                  'ExtendInner',
                                   'FilterInner',
+                                  'ExtendInner',
                                   'GroupInner',
                                   'FilterInner',
                                   'ExtendInner',