Added database hint macro, changes in profiles, removed sql/basic authentication profiles

prdpsvs · prdpsvs · commit 11acff05b076 · 2023-05-26T10:07:51.000-07:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "justMyCode": false
+        }
+    ]
+}
diff --git a/23.1.2 b/23.1.2
diff --git a/dbt/adapters/fabric/fabric_adapter.py b/dbt/adapters/fabric/fabric_adapter.py
@@ -28,7 +28,7 @@ def create_schema(self, relation: BaseRelation) -> None:
 
         if self.config.credentials.schema_authorization:
             kwargs["schema_authorization"] = self.config.credentials.schema_authorization
-            macro_name = "sqlserver__create_schema_with_authorization"
+            macro_name = "fabric__create_schema_with_authorization"
 
         self.execute_macro(macro_name, kwargs=kwargs)
         self.commit_if_has_connection()
diff --git a/dbt/include/fabric/macros/adapters/metadata.sql b/dbt/include/fabric/macros/adapters/metadata.sql
@@ -1,3 +1,12 @@
+{% macro use_database_hint() %}
+    {{ return(adapter.dispatch('use_database_hint')()) }}
+{% endmacro %}
+
+{% macro default__use_database_hint() %}{% endmacro %}
+{% macro fabric__use_database_hint() %}
+    {# USE [{{ relation.database }}]; #}
+{% endmacro %}
+
 {% macro information_schema_hints() %}
     {{ return(adapter.dispatch('information_schema_hints')()) }}
 {% endmacro %}
@@ -129,7 +138,7 @@
 
 {% macro fabric__list_schemas(database) %}
   {% call statement('list_schemas', fetch_result=True, auto_begin=False) -%}
-    USE {{ database }};
+    {{ use_database_hint() }}
     select  name as [schema]
     from sys.schemas
   {% endcall %}
@@ -138,7 +147,7 @@
 
 {% macro fabric__check_schema_exists(information_schema, schema) -%}
   {% call statement('check_schema_exists', fetch_result=True, auto_begin=False) -%}
-    --USE {{ database_name }}
+
     SELECT count(*) as schema_exist FROM sys.schemas WHERE name = '{{ schema }}'
   {%- endcall %}
   {{ return(load_result('check_schema_exists').table) }}
diff --git a/dbt/include/fabric/macros/adapters/relation.sql b/dbt/include/fabric/macros/adapters/relation.sql
@@ -14,7 +14,7 @@
 
 {% macro fabric__drop_relation_script(relation) -%}
     {% call statement('find_references', fetch_result=true) %}
-        USE [{{ relation.database }}];
+        {{ use_database_hint() }}
         select
             sch.name as schema_name,
             obj.name as view_name
@@ -43,11 +43,10 @@
     {%- else -%}
         {{ exceptions.raise_not_implemented('Invalid relation being dropped: ' ~ relation) }}
     {% endif %}
-    USE [{{ relation.database }}];
-    if object_id ('{{ relation.include(database=False) }}','{{ object_id_type }}') is not null
-        begin
-            drop {{ relation.type }} {{ relation.include(database=False) }}
-        end
+
+    {{ use_database_hint() }}
+    DROP {{ relation.type }} IF EXISTS {{ relation.include(database=False) }}
+
 {% endmacro %}
 
 {% macro fabric__rename_relation(from_relation, to_relation) -%}
@@ -60,24 +59,40 @@
         and TABLE_NAME = '{{ from_relation.identifier }}'
     {% endcall %}
     {% set view_def_full = load_result('get_view_definition')['data'][0][0] %}
-    {{ log("Found view definition " ~ view_def_full) }}
+
     {% set view_def_sql_matches = modules.re.match('^create\\s+view\\s+[0-9a-z.\\"\\[\\]_]+\\s+as\\s+\\(?(.*)\\)?\\s+;?\\s+$', view_def_full, modules.re.I) %}
     {% if not view_def_sql_matches %}
         {{ exceptions.raise_compiler_error("Could not extract view definition to rename") }}
     {% endif %}
     {% set view_def_sql = view_def_sql_matches.group(1) %}
-    {{ log("Found view SQL " ~ view_def_sql) }}
+
     {% call statement('create_new_view') %}
         {{ create_view_as(to_relation, view_def_sql) }}
     {% endcall %}
     {% call statement('drop_old_view') %}
-        drop view {{ from_relation.include(database=False) }};
+        DROP VIEW IF EXISTS {{ from_relation.include(database=False) }};
     {% endcall %}
   {% endif %}
   {% if from_relation.type == 'table' %}
       {% call statement('rename_relation') %}
         create table {{ to_relation.include(database=False) }} as select * from {{ from_relation.include(database=False) }}
       {%- endcall %}
-      {{ sqlserver__drop_relation(from_relation) }}
+      {{ fabric__drop_relation(from_relation) }}
   {% endif %}
 {% endmacro %}
+
+-- DROP synapsevnext__truncate_relation when TRUNCATE TABLE is supported
+{% macro fabric__truncate_relation(relation) -%}
+
+  {% set tempTableName %}
+    {{ relation.identifier.replace("#", "") }}_{{ range(21000, 109000) | random }}
+  {% endset %}
+
+  {% call statement('truncate_relation') -%}
+    CREATE TABLE {{ tempTableName }} AS SELECT * FROM {{ relation }} WHERE 1=2
+    DROP TABLE IF EXISTS {{ relation }}
+    CREATE TABLE {{ relation }} AS SELECT * FROM {{ tempTableName }}
+    DROP TABLE IF EXISTS {{ tempTableName }}
+  {%- endcall %}
+
+{% endmacro %}
diff --git a/dbt/include/fabric/macros/adapters/schema.sql b/dbt/include/fabric/macros/adapters/schema.sql
@@ -1,6 +1,6 @@
 {% macro fabric__create_schema(relation) -%}
   {% call statement('create_schema') -%}
-    USE [{{ relation.database }}];
+    {{ use_database_hint() }}
     IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ relation.schema }}')
     BEGIN
     EXEC('CREATE SCHEMA [{{ relation.schema }}]')
@@ -10,7 +10,7 @@
 
 {% macro fabric__create_schema_with_authorization(relation, schema_authorization) -%}
   {% call statement('create_schema') -%}
-    USE [{{ relation.database }}];
+    {{ use_database_hint() }}
     IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ relation.schema }}')
     BEGIN
     EXEC('CREATE SCHEMA [{{ relation.schema }}] AUTHORIZATION [{{ schema_authorization }}]')
@@ -31,8 +31,6 @@
   {%- endfor %}
 
   {% call statement('drop_schema') -%}
-      IF EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ relation.schema }}')
-      BEGIN
-      EXEC('DROP SCHEMA {{ relation.schema }}')
-      END  {% endcall %}
+      EXEC('DROP SCHEMA IF EXISTS {{ relation.schema }}')
+  {% endcall %}
 {% endmacro %}
diff --git a/dbt/include/fabric/macros/materializations/models/table/create_table_as.sql b/dbt/include/fabric/macros/materializations/models/table/create_table_as.sql
@@ -9,13 +9,12 @@
    {% do run_query(fabric__drop_relation_script(tmp_relation)) %}
    {% do run_query(fabric__drop_relation_script(relation)) %}
 
-   USE [{{ relation.database }}];
-   EXEC('create view {{ tmp_relation.include(database=False) }} as {{ temp_view_sql }}');
+   {{ use_database_hint() }}
+   {{ fabric__create_view_as(tmp_relation, temp_view_sql) }}
+   {# EXEC('create view {{ tmp_relation.include(database=False) }} as {{ temp_view_sql }}'); #}
 
-   {{ log(relation.include(database=False), info=True) }}
-
-   CREATE TABLE {{ relation.include(database=(not temporary), schema=(not temporary)) }}
-   AS (SELECT * FROM {{ tmp_relation.include(database=False) }})
+   CREATE TABLE {{ relation }}
+   AS (SELECT * FROM {{ tmp_relation }})
 
    {{ fabric__drop_relation_script(tmp_relation) }}
 
diff --git a/dbt/include/fabric/macros/materializations/models/view/create_view_as.sql b/dbt/include/fabric/macros/materializations/models/view/create_view_as.sql
@@ -6,6 +6,8 @@
 {% macro fabric__create_view_exec(relation, sql) -%}
     {#- TODO: add contracts here when in dbt 1.5 -#}
     {%- set temp_view_sql = sql.replace("'", "''") -%}
+
+    {{ use_database_hint() }}
     execute('create view {{ relation.include(database=False) }} as
         {{ temp_view_sql }}
     ');
diff --git a/test.env.sample b/test.env.sample
@@ -1,11 +1,8 @@
-SQLSERVER_TEST_DRIVER=ODBC Driver 18 for SQL Server
-SQLSERVER_TEST_HOST=127.0.0.1
-SQLSERVER_TEST_USER=SA
-SQLSERVER_TEST_PASS=L0calTesting!
-SQLSERVER_TEST_PORT=1433
-SQLSERVER_TEST_DBNAME=TestDB
-SQLSERVER_TEST_ENCRYPT=True
+FABRIC_TEST_DRIVER=ODBC Driver 18 for SQL Server
+FABRIC_TEST_HOST=127.0.0.1
+FABRIC_TEST_USER=SA
+FABRIC_TEST_PASS=L0calTesting!
+FABRIC_TEST_PORT=1433
+FABRIC_TEST_DBNAME=TestDB
+FABRIC_TEST_ENCRYPT=True
 SQLSERVER_TEST_TRUST_CERT=True
-DBT_TEST_USER_1=DBT_TEST_USER_1
-DBT_TEST_USER_2=DBT_TEST_USER_2
-DBT_TEST_USER_3=DBT_TEST_USER_3
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -19,18 +19,12 @@ def pytest_addoption(parser):
 def dbt_profile_target(request: FixtureRequest, dbt_profile_target_update):
     profile = request.config.getoption("--profile")
 
-    if profile == "ci_sql_server":
-        target = _profile_ci_sql_server()
-    elif profile == "ci_azure_cli":
+    if profile == "ci_azure_cli":
         target = _profile_ci_azure_cli()
     elif profile == "ci_azure_auto":
         target = _profile_ci_azure_auto()
     elif profile == "ci_azure_environment":
         target = _profile_ci_azure_environment()
-    elif profile == "ci_azure_basic":
-        target = _profile_ci_azure_basic()
-    elif profile == "user":
-        target = _profile_user()
     elif profile == "user_azure":
         target = _profile_user_azure()
     else:
@@ -45,17 +39,11 @@ def dbt_profile_target_update():
     return {}
 
 
-@pytest.fixture(scope="class")
-def is_azure(request: FixtureRequest) -> bool:
-    profile = request.config.getoption("--profile")
-    return "azure" in profile
-
-
 def _all_profiles_base():
     return {
         "type": "fabric",
-        "driver": os.getenv("SQLSERVER_TEST_DRIVER", "ODBC Driver 18 for SQL Server"),
-        "port": int(os.getenv("SQLSERVER_TEST_PORT", "1433")),
+        "driver": os.getenv("FABRIC_TEST_DRIVER", "ODBC Driver 18 for SQL Server"),
+        "port": int(os.getenv("FABRIC_TEST_PORT", "1433")),
         "retries": 2,
     }
 
@@ -72,16 +60,6 @@ def _profile_ci_azure_base():
     }
 
 
-def _profile_ci_azure_basic():
-    return {
-        **_profile_ci_azure_base(),
-        **{
-            "user": os.getenv("DBT_AZURESQL_UID"),
-            "pass": os.getenv("DBT_AZURESQL_PWD"),
-        },
-    }
-
-
 def _profile_ci_azure_cli():
     return {
         **_profile_ci_azure_base(),
@@ -109,47 +87,18 @@ def _profile_ci_azure_environment():
     }
 
 
-def _profile_ci_sql_server():
-    return {
-        **_all_profiles_base(),
-        **{
-            "host": "fabric",
-            "user": "SA",
-            "pass": "5atyaNadella",
-            "database": "TestDB",
-            "encrypt": True,
-            "trust_cert": True,
-        },
-    }
-
-
-def _profile_user():
-    profile = {
-        **_all_profiles_base(),
-        **{
-            "host": os.getenv("SQLSERVER_TEST_HOST"),
-            "user": os.getenv("SQLSERVER_TEST_USER"),
-            "pass": os.getenv("SQLSERVER_TEST_PASS"),
-            "database": os.getenv("SQLSERVER_TEST_DBNAME"),
-            "encrypt": bool(os.getenv("SQLSERVER_TEST_ENCRYPT", "False")),
-            "trust_cert": bool(os.getenv("SQLSERVER_TEST_TRUST_CERT", "False")),
-        },
-    }
-    return profile
-
-
 def _profile_user_azure():
     profile = {
         **_all_profiles_base(),
         **{
-            "host": os.getenv("SQLSERVER_TEST_HOST"),
-            "authentication": os.getenv("SQLSERVER_TEST_AUTH", "auto"),
+            "host": os.getenv("FABRIC_TEST_HOST"),
+            "authentication": os.getenv("FABRIC_TEST_AUTH", "auto"),
             "encrypt": True,
             "trust_cert": True,
-            "database": os.getenv("SQLSERVER_TEST_DBNAME"),
-            "client_id": os.getenv("SQLSERVER_TEST_CLIENT_ID"),
-            "client_secret": os.getenv("SQLSERVER_TEST_CLIENT_SECRET"),
-            "tenant_id": os.getenv("SQLSERVER_TEST_TENANT_ID"),
+            "database": os.getenv("FABRIC_TEST_DBNAME"),
+            "client_id": os.getenv("FABRIC_TEST_CLIENT_ID"),
+            "client_secret": os.getenv("FABRIC_TEST_CLIENT_SECRET"),
+            "tenant_id": os.getenv("FABRIC_TEST_TENANT_ID"),
         },
     }
     return profile
