pydpm_xl 0.2.1__tar.gz → 0.2.2__tar.gz

{pydpm_xl-0.2.1/pydpm_xl.egg-info → pydpm_xl-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydpm_xl
-Version: 0.2.1
+Version: 0.2.2
 Summary: Python library for DPM-XL data processing and analysis
 Author-email: "MeaningfulData S.L." <info@meaningfuldata.eu>
 License: GPL-3.0-or-later

{pydpm_xl-0.2.1 → pydpm_xl-0.2.2}/py_dpm/__init__.py

@@ -41,7 +41,7 @@ Available packages:
 - pydpm.api: Main APIs for migration, syntax, and semantic analysis
 """
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 __author__ = "MeaningfulData S.L."
 __email__ = "info@meaningfuldata.eu"
 __license__ = "GPL-3.0-or-later"

{pydpm_xl-0.2.1 → pydpm_xl-0.2.2}/py_dpm/dpm/queries/tables.py

@@ -74,7 +74,12 @@ class TableQuery:
             subq.c.table_code.isnot(None)
         )
 
-        q = filter_by_release(q, release_id, subq.c.start_release, subq.c.end_release)
+        q = filter_by_release(
+            q,
+            start_col=subq.c.start_release,
+            end_col=subq.c.end_release,
+            release_id=release_id,
+        )
         q = q.order_by(subq.c.table_code)
 
         return BaseQuery(session, q)
@@ -91,7 +96,12 @@ class TableQuery:
             subq.c.table_code == table_code, subq.c.row_code.isnot(None)
         )
 
-        q = filter_by_release(q, release_id, subq.c.start_release, subq.c.end_release)
+        q = filter_by_release(
+            q,
+            start_col=subq.c.start_release,
+            end_col=subq.c.end_release,
+            release_id=release_id,
+        )
         q = q.order_by(subq.c.row_code)
 
         return BaseQuery(session, q)
@@ -108,7 +118,12 @@ class TableQuery:
             subq.c.table_code == table_code, subq.c.column_code.isnot(None)
         )
 
-        q = filter_by_release(q, release_id, subq.c.start_release, subq.c.end_release)
+        q = filter_by_release(
+            q,
+            start_col=subq.c.start_release,
+            end_col=subq.c.end_release,
+            release_id=release_id,
+        )
         q = q.order_by(subq.c.column_code)
 
         return BaseQuery(session, q)
@@ -127,7 +142,12 @@ class TableQuery:
             subq.c.sheet_code != "",
         )
 
-        q = filter_by_release(q, release_id, subq.c.start_release, subq.c.end_release)
+        q = filter_by_release(
+            q,
+            start_col=subq.c.start_release,
+            end_col=subq.c.end_release,
+            release_id=release_id,
+        )
         q = q.order_by(subq.c.sheet_code)
 
         return BaseQuery(session, q)

{pydpm_xl-0.2.1 → pydpm_xl-0.2.2}/py_dpm/dpm_xl/ast/operands.py

@@ -208,9 +208,9 @@ class OperandsChecking(ASTTemplate, ABC):
         # Apply release filter
         query = filter_by_release(
             query,
-            self.release_id,
-            TableVersion.startreleaseid,
-            TableVersion.endreleaseid,
+            start_col=TableVersion.startreleaseid,
+            end_col=TableVersion.endreleaseid,
+            release_id=self.release_id,
         )
 
         # Execute query and convert to DataFrame

{pydpm_xl-0.2.1 → pydpm_xl-0.2.2/pydpm_xl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydpm_xl
-Version: 0.2.1
+Version: 0.2.2
 Summary: Python library for DPM-XL data processing and analysis
 Author-email: "MeaningfulData S.L." <info@meaningfuldata.eu>
 License: GPL-3.0-or-later

{pydpm_xl-0.2.1 → pydpm_xl-0.2.2}/pydpm_xl.egg-info/SOURCES.txt

@@ -97,4 +97,5 @@ tests/test_get_tables_date_filter.py
 tests/test_get_tables_release_code.py
 tests/test_hierarchical_query.py
 tests/test_query_refactor.py
+tests/test_release_filters_semantic.py
 tests/test_semantic_release.py

{pydpm_xl-0.2.1 → pydpm_xl-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pydpm_xl"
-version = "0.2.1"
+version = "0.2.2"
 description = "Python library for DPM-XL data processing and analysis"
 authors = [
     {name = "MeaningfulData S.L.", email = "info@meaningfuldata.eu"}
@@ -52,7 +52,7 @@ exclude = []
 
 [tool.poetry]
 name = "pydpm_xl"
-version = "0.2.1"
+version = "0.2.2"
 description = "Python library for DPM-XL data processing and analysis"
 authors = ["MeaningfulData S.L. <info@meaningfuldata.eu>"]
 readme = "README.md"

pydpm_xl-0.2.2/tests/test_release_filters_semantic.py

@@ -0,0 +1,108 @@
+import pandas as pd
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
+from py_dpm.dpm.models import Base, TableVersion
+from py_dpm.dpm.queries.filters import filter_by_release
+from py_dpm.dpm_xl.ast import operands as operands_module
+
+
+def _make_session():
+    """Create a lightweight in-memory SQLAlchemy session for query compilation."""
+    engine = create_engine("sqlite:///:memory:")
+    Base.metadata.bind = engine
+    Session = sessionmaker(bind=engine)
+    return Session()
+
+
+def test_filter_by_release_uses_is_null_for_end_release():
+    """
+    Ensure filter_by_release uses SQLAlchemy .is_(None) semantics for end_col,
+    resulting in an 'IS NULL' predicate rather than '= NULL' in the SQL.
+
+    This is important for PostgreSQL, which is strict about boolean expressions
+    and NULL comparison semantics.
+    """
+    session = _make_session()
+
+    query = session.query(TableVersion)
+    filtered = filter_by_release(
+        query,
+        start_col=TableVersion.startreleaseid,
+        end_col=TableVersion.endreleaseid,
+        release_id=5,
+    )
+
+    sql = str(
+        filtered.statement.compile(
+            dialect=session.get_bind().dialect, compile_kwargs={"literal_binds": True}
+        )
+    ).upper()
+
+    # Ensure NULL handling uses IS NULL rather than = NULL
+    assert "IS NULL" in sql
+    assert "= NULL" not in sql
+
+
+def test_operands_check_headers_calls_filter_by_release_with_correct_args(monkeypatch):
+    """
+    Verify that OperandsChecking.check_headers wires filter_by_release correctly:
+    - start_col is TableVersion.startreleaseid
+    - end_col is TableVersion.endreleaseid
+    - release_id matches the instance's release_id
+    """
+    called = {}
+
+    def fake_filter_by_release(query, start_col, end_col, release_id=None, release_code=None):
+        called["query"] = query
+        called["start_col"] = start_col
+        called["end_col"] = end_col
+        called["release_id"] = release_id
+        called["release_code"] = release_code
+        return query
+
+    monkeypatch.setattr(operands_module, "filter_by_release", fake_filter_by_release)
+
+    # Stub out the pandas helpers used inside check_headers so that no real DB
+    # access is attempted.
+    import py_dpm.dpm.models as models
+
+    monkeypatch.setattr(
+        models,
+        "_compile_query_for_pandas",
+        lambda stmt, session: stmt,
+    )
+
+    def fake_read_sql(sql, session):
+        # Return an empty DataFrame with the expected columns so that
+        # check_headers completes without touching self.operands.
+        return pd.DataFrame(
+            columns=[
+                "Code",
+                "StartReleaseID",
+                "EndReleaseID",
+                "Direction",
+                "HasOpenRows",
+                "HasOpenColumns",
+                "HasOpenSheets",
+            ]
+        )
+
+    monkeypatch.setattr(models, "_read_sql_with_connection", fake_read_sql)
+
+    session = _make_session()
+
+    # Create a minimal OperandsChecking instance without running its __init__,
+    # since that would require a fully-populated AST and database.
+    oc = object.__new__(operands_module.OperandsChecking)
+    oc.session = session
+    oc.release_id = 7
+    oc.tables = {"DummyTable": {}}  # Only keys are needed by check_headers
+
+    operands_module.OperandsChecking.check_headers(oc)
+
+    assert called["start_col"] is TableVersion.startreleaseid
+    assert called["end_col"] is TableVersion.endreleaseid
+    assert called["release_id"] == 7
+    assert called["release_code"] is None
+