moose-lib 0.6.164__tar.gz → 0.6.166__tar.gz

{moose_lib-0.6.164 → moose_lib-0.6.166}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moose_lib
-Version: 0.6.164
+Version: 0.6.166
 Home-page: https://www.fiveonefour.com/moose
 Author: Fiveonefour Labs Inc.
 Author-email: support@fiveonefour.com

{moose_lib-0.6.164 → moose_lib-0.6.166}/moose_lib/dmv2/olap_table.py

@@ -155,9 +155,10 @@ class OlapConfig(BaseModel):
         if self.engine:
             from ..blocks import S3Engine, S3QueueEngine, BufferEngine, DistributedEngine
 
-            # All non-MergeTree engines don't support ORDER BY
-            non_mergetree_engines = (S3Engine, S3QueueEngine, BufferEngine, DistributedEngine)
-            if isinstance(self.engine, non_mergetree_engines):
+            # S3QueueEngine, BufferEngine, and DistributedEngine don't support ORDER BY
+            # Note: S3Engine DOES support ORDER BY (unlike S3Queue)
+            engines_without_order_by = (S3QueueEngine, BufferEngine, DistributedEngine)
+            if isinstance(self.engine, engines_without_order_by):
                 engine_name = type(self.engine).__name__
 
                 if has_fields or has_expr:
@@ -166,6 +167,11 @@ class OlapConfig(BaseModel):
                         f"Remove order_by_fields or order_by_expression from your configuration."
                     )
 
+            # All non-MergeTree engines don't support SAMPLE BY
+            engines_without_sample_by = (S3Engine, S3QueueEngine, BufferEngine, DistributedEngine)
+            if isinstance(self.engine, engines_without_sample_by):
+                engine_name = type(self.engine).__name__
+
                 if self.sample_by_expression:
                     raise ValueError(
                         f"{engine_name} does not support SAMPLE BY clause. "

{moose_lib-0.6.164 → moose_lib-0.6.166}/moose_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moose_lib
-Version: 0.6.164
+Version: 0.6.166
 Home-page: https://www.fiveonefour.com/moose
 Author: Fiveonefour Labs Inc.
 Author-email: support@fiveonefour.com

{moose_lib-0.6.164 → moose_lib-0.6.166}/tests/test_s3queue_config.py

@@ -291,18 +291,12 @@ def test_non_mergetree_engines_reject_unsupported_clauses():
     """Test that non-MergeTree engines reject unsupported ORDER BY and SAMPLE BY clauses."""
     from moose_lib.blocks import S3Engine, S3QueueEngine, BufferEngine, DistributedEngine
 
-    # Test S3Engine rejects ORDER BY
-    with pytest.raises(ValueError, match="S3Engine does not support ORDER BY clauses"):
-        OlapConfig(
-            engine=S3Engine(path="s3://bucket/file.json", format="JSONEachRow"),
-            order_by_fields=["id"]
-        )
-
-    with pytest.raises(ValueError, match="S3Engine does not support ORDER BY clauses"):
-        OlapConfig(
-            engine=S3Engine(path="s3://bucket/file.json", format="JSONEachRow"),
-            order_by_expression="(id, name)"
-        )
+    # Test S3Engine DOES support ORDER BY (should not raise)
+    config_s3_with_order_by = OlapConfig(
+        engine=S3Engine(path="s3://bucket/file.json", format="JSONEachRow"),
+        order_by_fields=["id"]
+    )
+    assert config_s3_with_order_by.order_by_fields == ["id"]
 
     # Test S3Engine rejects SAMPLE BY
     with pytest.raises(ValueError, match="S3Engine does not support SAMPLE BY clause"):