datajunction-server 0.0.2.dev1__py3-none-any.whl → 0.0.2.dev2__py3-none-any.whl

datajunction_server/__about__.py

@@ -2,4 +2,4 @@
 Version for Hatch
 """
 
-__version__ = "0.0.2.dev1"
+__version__ = "0.0.2.dev2"

datajunction_server/models/deployment.py

@@ -65,7 +65,7 @@ class ColumnSpec(BaseModel):
             and (self.display_name == other.display_name or self.display_name is None)
             and (self.description == other.description or self.description is None)
             and set(self.attributes) == set(other.attributes)
-            and self.partition == other.partition
+            and (self.partition == other.partition) or (self.partition is None and other.partition is None)
         )
 
 
@@ -387,11 +387,11 @@ class MetricSpec(NodeSpec):
             super().__eq__(other)
             and self.query_ast.compare(other.query_ast)
             and (self.required_dimensions or []) == (other.required_dimensions or [])
-            and self.direction == other.direction
-            and self.unit == other.unit
-            and self.significant_digits == other.significant_digits
-            and self.min_decimal_exponent == other.min_decimal_exponent
-            and self.max_decimal_exponent == other.max_decimal_exponent
+            and (self.direction == other.direction) or (self.direction is None and other.direction is None)
+            and (self.unit == other.unit) or (self.unit is None and other.unit is None)
+            and (self.significant_digits == other.significant_digits) or (self.significant_digits is None and other.significant_digits is None)
+            and (self.min_decimal_exponent == other.min_decimal_exponent) or (self.min_decimal_exponent is None and other.min_decimal_exponent is None)
+            and (self.max_decimal_exponent == other.max_decimal_exponent) or (self.max_decimal_exponent is None and other.max_decimal_exponent is None)
         )
 
 
@@ -421,12 +421,25 @@ class CubeSpec(NodeSpec):
         ]
 
     def __eq__(self, other: Any) -> bool:
+        print("!!!Comparing cubes", self.rendered_name, other.rendered_name,
+              "super:", super().__eq__(other),
+                "columns:", (self.columns or []) == (other.columns or []),
+                "othercol", ([
+                        [attr for attr in col.attributes if attr != "primary_key"]
+                        for col in other.columns
+                ],
+                 not any(col.partition for col in other.columns)
+                ),
+                "metrics:", set(self.rendered_metrics) == set(other.rendered_metrics),
+                "dimensions:", set(self.rendered_dimensions) == set(other.rendered_dimensions),
+                "filters:", (self.rendered_filters or []) == (other.rendered_filters or [])
+        )
         return (
             super().__eq__(other)
             and (
                 (self.columns or []) == (other.columns or [])
                 or (
-                    self.columns is None
+                    not self.columns
                     and not any(
                         [attr for attr in col.attributes if attr != "primary_key"]
                         for col in other.columns

{datajunction_server-0.0.2.dev1.dist-info → datajunction_server-0.0.2.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.2.dev1
+Version: 0.0.2.dev2
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: Homepage, https://datajunction.io
 Project-URL: Repository, https://github.com/DataJunction/dj

{datajunction_server-0.0.2.dev1.dist-info → datajunction_server-0.0.2.dev2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-datajunction_server/__about__.py,sha256=i5HGYFn20M9TKP6zJEQt5IAdvxKsjPAjv0T3VYR1FUk,54
+datajunction_server/__about__.py,sha256=kVl_34fkA7KY3Y1J_D8v00tuvI2dTjfSCc1549SHP7g,54
 datajunction_server/__init__.py,sha256=nN5-uJoSVEwuc8n-wMygqeF0Xhxi_zqqbCgutZvAt3E,384
 datajunction_server/alembic.ini,sha256=mclJ_xx8pHfRyZ69SA9ZPqUwZaaQCTyxZ6wBmbrf1bo,3024
 datajunction_server/config.py,sha256=L1zkaiF82S-ciR-wVeILx7CWKSOPPJ90a9zooXVNHEc,5641
@@ -185,7 +185,7 @@ datajunction_server/models/column.py,sha256=3TCa9dDAb9Q2WEAzpcdqAjKSX3PutbwlS8qG
 datajunction_server/models/cube.py,sha256=p6KmqoOVGlziH5k0wXs6qBvgWWQs984Ho6SGplDbtAQ,4459
 datajunction_server/models/cube_materialization.py,sha256=ydMRepDM95b4BBVay_nOYlRtK7OFG3pCDDTRdHe2awU,15787
 datajunction_server/models/database.py,sha256=xhCllbq5ikFNnrPvzuchxQUC9RWogzh73Eqz7Jj0i38,499
-datajunction_server/models/deployment.py,sha256=L1n4LJV0Yaoq4i5bp9jXBF4hsPfgJXo8yl92xIVIeBQ,15485
+datajunction_server/models/deployment.py,sha256=AgVd2o1dSYtWzpqR3R61-Hja0OVWk_sExh408Gx4iOo,16631
 datajunction_server/models/dialect.py,sha256=uifriawtKR4vi-GG2rdp4eeQkAkD6iLNuarCLQanTxY,3825
 datajunction_server/models/dimensionlink.py,sha256=WaCarxhawOiQqtH1EVS0RQRu9D8Bx6GFonLsdSVgXSs,1551
 datajunction_server/models/engine.py,sha256=Ebuy4HLkURr7mj0pxTj_Y4fEmF0oDen393rnj9fBnR0,466
@@ -226,7 +226,7 @@ datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParser.py,sha2
 datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParser.tokens,sha256=JDrzbaKDwIaimAZPYIUzCgzkOEgq0X5-a6_lz78lqgs,8131
 datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParserListener.py,sha256=vp8wduYkB-T5Xr6HZCSdzAxTHHPrDI5UJZXRJSVhAGA,102464
 datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParserVisitor.py,sha256=w3V03LgPIHCiqojNyuekBDYqskjOKlKrd0sczQAB_WQ,60290
-datajunction_server-0.0.2.dev1.dist-info/METADATA,sha256=2PB2jL-NRUiaEjensn0-klnRc2he_c9JdUdGELk-v50,3769
-datajunction_server-0.0.2.dev1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-datajunction_server-0.0.2.dev1.dist-info/entry_points.txt,sha256=MOInJGdcQ10bDEl-XW4UMokEgx-ypINqBhObeDI8KiQ,74
-datajunction_server-0.0.2.dev1.dist-info/RECORD,,
+datajunction_server-0.0.2.dev2.dist-info/METADATA,sha256=1nsSX_VKvu5SkHpIuXNFyBudwMZRwU_1mF6AuDaTFhc,3769
+datajunction_server-0.0.2.dev2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+datajunction_server-0.0.2.dev2.dist-info/entry_points.txt,sha256=MOInJGdcQ10bDEl-XW4UMokEgx-ypINqBhObeDI8KiQ,74
+datajunction_server-0.0.2.dev2.dist-info/RECORD,,