Add explicit normalisation for SQL text params in object types like V…

…IEW, TASK, etc.
littleK0i · Jan 29, 2025 · b7a090c · b7a090c
1 parent 02ef3bb
commit b7a090c
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 9 deletions.
diff --git a/snowddl/blueprint/blueprint.py b/snowddl/blueprint/blueprint.py
@@ -288,7 +288,7 @@ class PrimaryKeyBlueprint(SchemaObjectBlueprint):
 class ProcedureBlueprint(SchemaObjectBlueprint):
     full_name: SchemaObjectIdentWithArgs
     language: str
-    body: str
+    body: Optional[str] = None
     arguments: List[ArgumentWithType]
     returns: Union[DataType, List[NameWithType]]
     is_strict: bool = False

diff --git a/snowddl/parser/abc_parser.py b/snowddl/parser/abc_parser.py
@@ -100,6 +100,9 @@ def add_error(self, exc: Exception, path: Path, entity_name: Optional[str] = Non
 
         self.errors[error_key] = exc
 
+    def normalise_sql_text_param(self, text: str):
+        return text.lstrip(" \t\n\r").rstrip(" \t\n\r;")
+
     def normalise_params_list(self, params):
         if params is None:
             return None

diff --git a/snowddl/parser/aggregation_policy.py b/snowddl/parser/aggregation_policy.py
@@ -68,7 +68,7 @@ def process_aggregation_policy(self, f: ParsedFile):
 
         bp = AggregationPolicyBlueprint(
             full_name=SchemaObjectIdent(self.env_prefix, f.database, f.schema, f.name),
-            body=f.params["body"],
+            body=self.normalise_sql_text_param(f.params["body"]),
             references=references,
             comment=f.params.get("comment"),
         )

diff --git a/snowddl/parser/dynamic_table.py b/snowddl/parser/dynamic_table.py
@@ -89,7 +89,7 @@ def process_dynamic_table(self, f: ParsedFile):
 
         bp = DynamicTableBlueprint(
             full_name=SchemaObjectIdent(self.env_prefix, f.database, f.schema, f.name),
-            text=f.params["text"],
+            text=self.normalise_sql_text_param(f.params["text"]),
             columns=column_blueprints if column_blueprints else None,
             target_lag=self.normalise_target_lag(f.params["target_lag"]),
             warehouse=AccountObjectIdent(self.env_prefix, f.params["warehouse"]),

diff --git a/snowddl/parser/masking_policy.py b/snowddl/parser/masking_policy.py
@@ -83,7 +83,7 @@ def process_masking_policy(self, f: ParsedFile):
 
         bp = MaskingPolicyBlueprint(
             full_name=SchemaObjectIdent(self.env_prefix, f.database, f.schema, f.name),
-            body=f.params["body"],
+            body=self.normalise_sql_text_param(f.params["body"]),
             arguments=arguments,
             returns=DataType(f.params["returns"]),
             exempt_other_policies=f.params.get("exempt_other_policies", False),

diff --git a/snowddl/parser/materialized_view.py b/snowddl/parser/materialized_view.py
@@ -52,7 +52,7 @@ def process_materialized_view(self, f: ParsedFile):
 
         bp = MaterializedViewBlueprint(
             full_name=SchemaObjectIdent(self.env_prefix, f.database, f.schema, f.name),
-            text=f.params["text"],
+            text=self.normalise_sql_text_param(f.params["text"]),
             columns=column_blueprints if column_blueprints else None,
             is_secure=f.params.get("is_secure", False),
             cluster_by=f.params.get("cluster_by"),

diff --git a/snowddl/parser/projection_policy.py b/snowddl/parser/projection_policy.py
@@ -64,7 +64,7 @@ def process_projection_policy(self, f: ParsedFile):
 
         bp = ProjectionPolicyBlueprint(
             full_name=SchemaObjectIdent(self.env_prefix, f.database, f.schema, f.name),
-            body=f.params["body"],
+            body=self.normalise_sql_text_param(f.params["body"]),
             references=references,
             comment=f.params.get("comment"),
         )

diff --git a/snowddl/parser/row_access_policy.py b/snowddl/parser/row_access_policy.py
@@ -77,7 +77,7 @@ def process_row_access_policy(self, f: ParsedFile):
 
         bp = RowAccessPolicyBlueprint(
             full_name=SchemaObjectIdent(self.env_prefix, f.database, f.schema, f.name),
-            body=f.params["body"],
+            body=self.normalise_sql_text_param(f.params["body"]),
             arguments=arguments,
             references=references,
             comment=f.params.get("comment"),

diff --git a/snowddl/parser/task.py b/snowddl/parser/task.py
@@ -62,6 +62,7 @@
             "type": "string"
         }
     },
+    "required": ["body"],
     "additionalProperties": False
 }
 # fmt: on
@@ -86,7 +87,7 @@ def process_task(self, f: ParsedFile):
 
         bp = TaskBlueprint(
             full_name=SchemaObjectIdent(self.env_prefix, f.database, f.schema, f.name),
-            body=f.params["body"],
+            body=self.normalise_sql_text_param(f.params["body"]),
             schedule=f.params.get("schedule"),
             after=after,
             finalize=finalize,

diff --git a/snowddl/parser/view.py b/snowddl/parser/view.py
@@ -142,7 +142,7 @@ def process_view(self, f: ParsedFile):
 
         bp = ViewBlueprint(
             full_name=SchemaObjectIdent(self.env_prefix, f.database, f.schema, f.name),
-            text=f.params["text"],
+            text=self.normalise_sql_text_param(f.params["text"]),
             columns=column_blueprints if column_blueprints else None,
             is_secure=f.params.get("is_secure", False),
             change_tracking=f.params.get("change_tracking", False),