Add is_ordered for SEQUENCE; Fix REFRESH_ON_CREATE for ALTER STAGE

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.23.0] - 2024-01-16
+
+- Added remaining parameters for `TASK`.
+- Added `is_ordered` for `SEQUENCE`.
+- Added converter for `TASKS` (thanks to Osborne Hardison).
+- Adjusted converter for `TABLE` to ignore event tables.
+- Fixed issue with ALTER for `STAGE` objects trying to apply `REFRESH_ON_CREATE` to existing objects, which is not allowed.
+
 ## [0.22.1] - 2024-01-06
 
 - Added `error_notification` for `PIPE`.

snowddl/blueprint/blueprint.py

@@ -284,6 +284,7 @@ class StageFileBlueprint(SchemaObjectBlueprint):
 class SequenceBlueprint(SchemaObjectBlueprint):
     start: int
     interval: int
+    is_ordered: Optional[bool] = None
 
 
 class StreamBlueprint(SchemaObjectBlueprint):

snowddl/parser/sequence.py

@@ -12,6 +12,9 @@
         "interval": {
             "type": "integer"
         },
+        "is_ordered": {
+            "type": "boolean"
+        },
         "comment": {
             "type": "string"
         }
@@ -30,6 +33,7 @@ def process_sequence(self, f: ParsedFile):
             full_name=SchemaObjectIdent(self.env_prefix, f.database, f.schema, f.name),
             start=f.params.get("start", 1),
             interval=f.params.get("interval", 1),
+            is_ordered=f.params.get("is_ordered"),
             comment=f.params.get("comment"),
         )
 

snowddl/resolver/sequence.py

@@ -1,4 +1,5 @@
 from snowddl.blueprint import SequenceBlueprint
+from snowddl.error import SnowDDLUnsupportedError
 from snowddl.resolver.abc_schema_object_resolver import AbstractSchemaObjectResolver, ResolveResult, ObjectType
 
 
@@ -25,6 +26,7 @@ def get_existing_objects_in_schema(self, schema: dict):
                 "owner": r["owner"],
                 "next_value": r["next_value"],
                 "interval": r["interval"],
+                "ordered": bool(r["ordered"] == "Y"),
                 "comment": r["comment"] if r["comment"] else None,
             }
 
@@ -57,6 +59,11 @@ def create_object(self, bp: SequenceBlueprint):
             },
         )
 
+        if bp.is_ordered is True:
+            query.append_nl("ORDER")
+        elif bp.is_ordered is False:
+            query.append_nl("NOORDER")
+
         if bp.comment:
             query.append_nl(
                 "COMMENT = {comment}",
@@ -83,6 +90,17 @@ def compare_object(self, bp: SequenceBlueprint, row: dict):
 
             result = ResolveResult.ALTER
 
+        if bp.is_ordered is not None and bp.is_ordered != row["ordered"]:
+            if bp.is_ordered is False:
+                self.engine.execute_safe_ddl(
+                    "ALTER SEQUENCE {full_name:i} SET NOORDER",
+                    {
+                        "full_name": bp.full_name,
+                    },
+                )
+            else:
+                raise SnowDDLUnsupportedError("Cannot change NOORDER sequence to ORDER")
+
         if bp.comment != row["comment"]:
             self.engine.execute_safe_ddl(
                 "ALTER SEQUENCE {full_name:i} SET COMMENT = {comment}",

snowddl/resolver/stage.py

@@ -210,7 +210,7 @@ def _compare_directory(self, bp: StageBlueprint, existing_properties):
                 },
             )
 
-            query.append_nl(self._build_directory(bp))
+            query.append_nl(self._build_directory(bp, existing_properties))
             self.engine.execute_safe_ddl(query)
 
         return is_alter_required
@@ -323,22 +323,29 @@ def _refresh_encryption(self, bp: StageBlueprint):
 
         return False
 
-    def _build_directory(self, bp: StageBlueprint):
+    def _build_directory(self, bp: StageBlueprint, existing_properties=None):
         query = self.engine.query_builder()
 
         if bp.directory:
-            query.append("DIRECTORY = (")
+            adjusted_directory = bp.directory
 
-            for k, v in bp.directory.items():
-                query.append(
-                    "{param_name:r} = {param_value:dp}",
-                    {
-                        "param_name": k,
-                        "param_value": v,
-                    },
-                )
-
-            query.append(")")
+            # REFRESH_ON_CREATE is only used for CREATE command, but is not available for ALTER, must be skipped
+            if existing_properties and "REFRESH_ON_CREATE" in adjusted_directory:
+                del adjusted_directory["REFRESH_ON_CREATE"]
+
+            if adjusted_directory:
+                query.append("DIRECTORY = (")
+
+                for k, v in adjusted_directory.items():
+                    query.append(
+                        "{param_name:r} = {param_value:dp}",
+                        {
+                            "param_name": k,
+                            "param_value": v,
+                        },
+                    )
+
+                query.append(")")
         else:
             query.append("DIRECTORY = ( ENABLE = FALSE )")
 

snowddl/version.py

@@ -1 +1 @@
-__version__ = "0.22.1"
+__version__ = "0.23.0"

test/_config/step1/db1/sc1/sequence/sq002_sq1.yaml

@@ -0,0 +1 @@
+is_ordered: true

test/_config/step2/db1/sc1/sequence/sq002_sq1.yaml

@@ -0,0 +1 @@
+is_ordered: false

test/sequence/sq002.py

@@ -0,0 +1,16 @@
+def test_step1(helper):
+    sequence = helper.show_sequence("db1", "sc1", "sq002_sq1")
+
+    assert sequence["ordered"] == "Y"
+
+
+def test_step2(helper):
+    sequence = helper.show_sequence("db1", "sc1", "sq002_sq1")
+
+    assert sequence["ordered"] == "N"
+
+
+def test_step3(helper):
+    sequence = helper.show_sequence("db1", "sc1", "sq002_sq1")
+
+    assert sequence is None

test/task/ts001.py

@@ -1,7 +1,7 @@
 def test_step1(helper):
     show = helper.show_task("db1", "sc1", "ts001_ts1")
 
-    assert str(show["warehouse"]).startswith(".TS001_WH1")
+    assert str(show["warehouse"]).endswith("TS001_WH1")
     assert show["schedule"] == "60 minutes"
     assert show["predecessors"] == "[]"
     assert show["state"] == "suspended"