Reformat code

littleK0i · Apr 19, 2024 · b0e28e0 · b0e28e0
1 parent e494261
commit b0e28e0
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 15 deletions.
diff --git a/snowddl/blueprint/ident.py b/snowddl/blueprint/ident.py
@@ -161,6 +161,7 @@ def database_full_name(self):
     def schema_full_name(self):
         return SchemaIdent(self.env_prefix, self.database, self.schema)
 
+
 class SchemaObjectIdentWithArgs(SchemaObjectIdent):
     def __init__(self, env_prefix, database, schema, name, data_types: List[BaseDataType]):
         super().__init__(env_prefix, database, schema, name)

diff --git a/snowddl/cache/intention_cache.py b/snowddl/cache/intention_cache.py
@@ -37,7 +37,9 @@ def check_parent_drop_intention(self, object_type: ObjectType, object_full_name:
         schema_object_name = ".".join(object_full_name_parts[:3])
 
         # All schemas and schema objects are implicitly dropped by DATABASE
-        if issubclass(blueprint_cls, (SchemaBlueprint, SchemaObjectBlueprint)) and (database_name in self.drop_intention[ObjectType.DATABASE]):
+        if issubclass(blueprint_cls, (SchemaBlueprint, SchemaObjectBlueprint)) and (
+            database_name in self.drop_intention[ObjectType.DATABASE]
+        ):
             return True
 
         # All schema objects are implicitly dropped by SCHEMA
@@ -50,9 +52,9 @@ def check_parent_drop_intention(self, object_type: ObjectType, object_full_name:
 
         # All table constraints are implicitly dropped by various TABLE types which support constraints
         if issubclass(blueprint_cls, (ForeignKeyBlueprint, PrimaryKeyBlueprint, UniqueKeyBlueprint)) and (
-                schema_object_name in self.drop_intention[ObjectType.TABLE] or
-                schema_object_name in self.drop_intention[ObjectType.EXTERNAL_TABLE] or
-                schema_object_name in self.drop_intention[ObjectType.HYBRID_TABLE]
+            schema_object_name in self.drop_intention[ObjectType.TABLE]
+            or schema_object_name in self.drop_intention[ObjectType.EXTERNAL_TABLE]
+            or schema_object_name in self.drop_intention[ObjectType.HYBRID_TABLE]
         ):
             return True
 

diff --git a/snowddl/parser/hybrid_table.py b/snowddl/parser/hybrid_table.py
@@ -182,11 +182,14 @@ def process_table(self, f: ParsedFile):
             unique_keys = [[Ident(c) for c in columns] for columns in f.params.get("unique_keys")]
 
         if f.params.get("foreign_keys"):
-            foreign_keys = [ForeignKeyReference(
-                columns=[Ident(c) for c in fk["columns"]],
-                ref_table_name=build_schema_object_ident(self.env_prefix, fk["ref_table"], f.database, f.schema),
-                ref_columns=[Ident(c) for c in fk["ref_columns"]],
-            ) for fk in f.params.get("foreign_keys")]
+            foreign_keys = [
+                ForeignKeyReference(
+                    columns=[Ident(c) for c in fk["columns"]],
+                    ref_table_name=build_schema_object_ident(self.env_prefix, fk["ref_table"], f.database, f.schema),
+                    ref_columns=[Ident(c) for c in fk["ref_columns"]],
+                )
+                for fk in f.params.get("foreign_keys")
+            ]
 
             depends_on = set(fk.ref_table_name for fk in foreign_keys)
 

diff --git a/snowddl/resolver/hybrid_table.py b/snowddl/resolver/hybrid_table.py
@@ -1,6 +1,15 @@
 from re import compile
 
-from snowddl.blueprint import Ident, DataType, HybridTableBlueprint, SchemaObjectIdent, TableColumn, PrimaryKeyBlueprint, UniqueKeyBlueprint, ForeignKeyBlueprint
+from snowddl.blueprint import (
+    Ident,
+    DataType,
+    HybridTableBlueprint,
+    SchemaObjectIdent,
+    TableColumn,
+    PrimaryKeyBlueprint,
+    UniqueKeyBlueprint,
+    ForeignKeyBlueprint,
+)
 from snowddl.resolver.abc_schema_object_resolver import AbstractSchemaObjectResolver, ResolveResult, ObjectType
 
 collate_type_syntax_re = compile(r"^(.*) COLLATE \'(.*)\'$")

diff --git a/test/conftest.py b/test/conftest.py
@@ -395,7 +395,7 @@ def show_indexes(self, database, schema, name):
             },
         )
 
-        return {r['name']: r for r in cur}
+        return {r["name"]: r for r in cur}
 
     def is_edition_enterprise(self):
         return self.edition >= Edition.ENTERPRISE

diff --git a/test/hybrid_table/ht001.py b/test/hybrid_table/ht001.py
@@ -15,7 +15,11 @@ def test_step1(helper):
 
     assert 2 == len(foreign_keys)
     assert {"columns": ["NUM2"], "ref_table": f"{helper.env_prefix}DB1.SC1.HT001_HT2", "ref_columns": ["ID"]} in foreign_keys
-    assert {"columns": ["VAR1", "VAR2"], "ref_table": f"{helper.env_prefix}DB1.SC1.HT001_HT2", "ref_columns": ["FIRST_NAME", "LAST_NAME"]} in foreign_keys
+    assert {
+        "columns": ["VAR1", "VAR2"],
+        "ref_table": f"{helper.env_prefix}DB1.SC1.HT001_HT2",
+        "ref_columns": ["FIRST_NAME", "LAST_NAME"],
+    } in foreign_keys
 
     assert "SYS_INDEX_HT001_HT1_PRIMARY" in indexes
     assert "SYS_INDEX_HT001_HT1_UNIQUE_NUM2" in indexes
@@ -37,9 +41,9 @@ def test_step2(helper):
     # TODO: uncomment these checks when Snowflake fixes foreign keys for Hybrid Tables
     # As of 19 Apr 2024, it is no longer possible to add foreign key to existing Hybrid Table
 
-    #assert 2 == len(foreign_keys)
-    #assert {"columns": ["NUM2"], "ref_table": f"{helper.env_prefix}DB1.SC1.HT001_HT2", "ref_columns": ["ID"]} in foreign_keys
-    #assert {"columns": ["VAR1", "VAR2"], "ref_table": f"{helper.env_prefix}DB1.SC1.HT001_HT2", "ref_columns": ["FIRST_NAME", "LAST_NAME"]} in foreign_keys
+    # assert 2 == len(foreign_keys)
+    # assert {"columns": ["NUM2"], "ref_table": f"{helper.env_prefix}DB1.SC1.HT001_HT2", "ref_columns": ["ID"]} in foreign_keys
+    # assert {"columns": ["VAR1", "VAR2"], "ref_table": f"{helper.env_prefix}DB1.SC1.HT001_HT2", "ref_columns": ["FIRST_NAME", "LAST_NAME"]} in foreign_keys
 
 
 def test_step3(helper):