clickzetta-semantic-model-generator 1.0.7__tar.gz → 1.0.10__tar.gz

{clickzetta_semantic_model_generator-1.0.7 → clickzetta_semantic_model_generator-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: clickzetta-semantic-model-generator
-Version: 1.0.7
+Version: 1.0.10
 Summary: Curate a Semantic Model for ClickZetta Lakehouse
 License: Apache Software License; BSD License
 Author: qililiang

{clickzetta_semantic_model_generator-1.0.7 → clickzetta_semantic_model_generator-1.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "clickzetta-semantic-model-generator"
-version = "1.0.7"
+version = "1.0.10"
 description = "Curate a Semantic Model for ClickZetta Lakehouse"
 authors = ["qililiang <qililiang@clickzetta.com>"]
 license = "Apache Software License; BSD License"

{clickzetta_semantic_model_generator-1.0.7 → clickzetta_semantic_model_generator-1.0.10}/semantic_model_generator/clickzetta_utils/clickzetta_connector.py

@@ -481,29 +481,20 @@ def _fetch_columns_via_show(
 
     rows: List[pd.DataFrame] = []
     category = _catalog_category(session, workspace)
-    is_shared_catalog = category in {"SHARED", "EXTERNAL"}
+    is_shared_catalog = category == "SHARED"
     catalog = workspace if is_shared_catalog else workspace.upper()
-    schema = (
-        table_schema or ""
-    )
-    if schema and not is_shared_catalog:
-        schema = schema.upper()
+    schema_token = table_schema or ""
+    if schema_token and not is_shared_catalog:
+        schema_token = schema_token.upper()
 
     for table_name in table_names:
-        qualified_parts = [
-            part
-            for part in (
-                catalog,
-                schema,
-                table_name.upper() if not is_shared_catalog else table_name,
-            )
-            if part
-        ]
-        qualified_table = ".".join(qualified_parts)
-        if is_shared_catalog:
-            query = f"SHOW COLUMNS IN SHARE {qualified_table}"
-        else:
-            query = f"SHOW COLUMNS IN {qualified_table}"
+        table_token = str(table_name).strip()
+        if not table_token:
+            continue
+        qualified_table = join_quoted_identifiers(
+            *(part for part in (catalog, schema_token, table_token) if part)
+        )
+        query = f"SHOW COLUMNS IN {qualified_table}"
         try:
             df = session.sql(query).to_pandas()
         except Exception as exc:
@@ -564,7 +555,7 @@ def get_valid_schemas_tables_columns_df(
     table_names: Optional[List[str]] = None,
 ) -> pd.DataFrame:
     category = _catalog_category(session, workspace)
-    skip_information_schema = category in {"SHARED", "EXTERNAL"}
+    skip_information_schema = category == "SHARED"
 
     result = pd.DataFrame()
     if not skip_information_schema:
@@ -591,7 +582,7 @@ def get_valid_schemas_tables_columns_df(
                     session=session, schema_name=schema_identifier
                 )
                 tables_for_show = [
-                    table.split(".")[-1].upper()
+                    table.split(".")[-1]
                     for table in tables_for_show
                     if table
                 ]
@@ -682,7 +673,7 @@ def fetch_tables_views_in_schema(
     workspace = parts[0]
     schema = parts[1] if len(parts) > 1 else ""
     category = _catalog_category(session, workspace)
-    is_shared_catalog = category in {"SHARED", "EXTERNAL"}
+    is_shared_catalog = category == "SHARED"
 
     workspace_token = workspace if is_shared_catalog else workspace.upper()
     schema_token = schema if is_shared_catalog else schema.upper()