fix test

Author: joocer

dev/build_counter.py

@@ -35,7 +35,7 @@ class VersionStatus(Enum):
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it in the CLI for the same reason
-    """
+"""
 
     # Save the build number to the build.py file
     with open("opteryx/__version__.py", "w") as f:

opteryx/__version__.py

@@ -1,12 +1,11 @@
 # THIS FILE IS AUTOMATICALLY UPDATED DURING THE BUILD PROCESS
 # DO NOT EDIT THIS FILE DIRECTLY
 
-__build__ = 1650
+__build__ = 1651
 __author__ = "@joocer"
-__version__ = "0.26.0-beta.1650"
+__version__ = "0.26.0-beta.1651"
 
 # Store the version here so:
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it in the CLI for the same reason
-    

opteryx/connectors/sql_connector.py

@@ -259,21 +259,26 @@ def collect_relation_stats(self) -> RelationStatistics:
                 if row_est is not None:
                     stats.record_count_estimate = int(row_est)
 
-                pg_stats = conn.execute(
-                    text("""
+                pg_stats = (
+                    conn.execute(
+                        text("""
                     SELECT attname, n_distinct, null_frac, histogram_bounds
                     FROM pg_stats
                     WHERE tablename = :t
                 """),
-                    {"t": table_name_only},
-                ).fetchall()
+                        {"t": table_name_only},
+                    )
+                    .mappings()
+                    .all()
+                )
 
             for row in pg_stats:
                 col = row["attname"]
                 stats.cardinality_estimate[col] = (
                     int(row["n_distinct"]) if row["n_distinct"] > 0 else 0
                 )
-                stats.null_count[col] = int(row["null_frac"] * row_est)
+                if row_est is not None:
+                    stats.null_count[col] = int(row["null_frac"] * row_est)
                 bounds = row["histogram_bounds"]
                 if bounds and isinstance(bounds, list) and len(bounds) >= 2:
                     stats.lower_bounds[col] = bounds[0]

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opteryx"
-version = "0.26.0-beta.1650"
+version = "0.26.0-beta.1651"
 description = "Query your data, where it lives"
 requires-python = '>=3.11'
 readme = {file = "README.md", content-type = "text/markdown"}

tests/unit/connectors/test_wildcard_paths.py

@@ -25,13 +25,13 @@ def test_wildcard_detection():
     stats = MockStatistics()
 
     # These should be detected as wildcards
-    connector = FileConnector(dataset="path/*.parquet", statistics=stats)
+    connector = FileConnector(dataset="testdata/wildcard_test/*.parquet", statistics=stats)
     assert connector.has_wildcards is True
-    
-    connector = FileConnector(dataset="path/file?.parquet", statistics=stats)
+
+    connector = FileConnector(dataset="testdata/wildcard_test/file?.parquet", statistics=stats)
     assert connector.has_wildcards is True
-    
-    connector = FileConnector(dataset="path/file[0-9].parquet", statistics=stats)
+
+    connector = FileConnector(dataset="testdata/wildcard_test/file[0-9].parquet", statistics=stats)
     assert connector.has_wildcards is True
 
 
@@ -151,7 +151,6 @@ def test_wildcard_question_mark():
 
 
 if __name__ == "__main__":  # pragma: no cover
-    import sys
-    
-    # Run tests
-    pytest.main([__file__, "-v"])
+    from tests import run_tests
+
+    run_tests()

tests/unit/planner/test_predicate_pushdown_postgres.py

@@ -5,7 +5,7 @@
 import os
 import sys
 
-sys.path.insert(1, os.path.join(sys.path[0], "../.."))
+sys.path.insert(1, os.path.join(sys.path[0], "../../.."))
 
 import time
 
@@ -24,7 +24,7 @@
     "pg",
     SqlConnector,
     remove_prefix=True,
-    connection=f"postgresql+psycopg2://{POSTGRES_USER}:{POSTGRES_PASSWORD}@trumpet.db.elephantsql.com/{POSTGRES_USER}",
+    connection=f"postgresql+psycopg2://{POSTGRES_USER}:{POSTGRES_PASSWORD}@pg-3b7d04d1-joocer-9765.h.aivencloud.com:10067/defaultdb?sslmode=require"
 )
 
 test_cases = [