fix impl

Author: sdebruyn

dbt/adapters/sqlserver/sql_server_adapter.py

@@ -2,7 +2,11 @@
 
 import agate
 from dbt.adapters.base.relation import BaseRelation
+from dbt.adapters.cache import _make_ref_key_msg
 from dbt.adapters.sql import SQLAdapter
+from dbt.adapters.sql.impl import CREATE_SCHEMA_MACRO_NAME
+from dbt.events.functions import fire_event
+from dbt.events.types import SchemaCreation
 
 from dbt.adapters.sqlserver.sql_server_column import SQLServerColumn
 from dbt.adapters.sqlserver.sql_server_configs import SQLServerConfigs
@@ -14,6 +18,21 @@ class SQLServerAdapter(SQLAdapter):
     Column = SQLServerColumn
     AdapterSpecificConfigs = SQLServerConfigs
 
+    def create_schema(self, relation: BaseRelation) -> None:
+        relation = relation.without_identifier()
+        fire_event(SchemaCreation(relation=_make_ref_key_msg(relation)))
+        macro_name = CREATE_SCHEMA_MACRO_NAME
+        kwargs = {
+            "relation": relation,
+        }
+
+        if self.config.credentials.schema_authorization:
+            kwargs["schema_authorization"] = self.config.credentials.schema_authorization
+            macro_name = "sqlserver__create_schema_with_authorization"
+
+        self.execute_macro(macro_name, kwargs=kwargs)
+        self.commit_if_has_connection()
+
     @classmethod
     def date_function(cls):
         return "getdate()"

dbt/adapters/sqlserver/sql_server_credentials.py

@@ -21,6 +21,7 @@ class SQLServerCredentials(Credentials):
     encrypt: Optional[bool] = True  # default value in MS ODBC Driver 18 as well
     trust_cert: Optional[bool] = False  # default value in MS ODBC Driver 18 as well
     retries: int = 1
+    schema_authorization: Optional[str] = None
 
     _ALIASES = {
         "user": "UID",
@@ -33,6 +34,7 @@ class SQLServerCredentials(Credentials):
         "app_id": "client_id",
         "app_secret": "client_secret",
         "TrustServerCertificate": "trust_cert",
+        "schema_auth": "schema_authorization",
     }
 
     @property

dbt/include/sqlserver/macros/adapters/schema.sql

@@ -1,10 +1,19 @@
 {% macro sqlserver__create_schema(relation) -%}
-  {% set schema_authorization = config.get("schema_authorization") %}
   {% call statement('create_schema') -%}
     USE [{{ relation.database }}];
     IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ relation.schema }}')
     BEGIN
-    EXEC('CREATE SCHEMA [{{ relation.schema }}] {% if schema_authorization %} AUTHORIZATION: [{{ schema_authorization }}] {% endif %}')
+    EXEC('CREATE SCHEMA [{{ relation.schema }}]')
+    END
+  {% endcall %}
+{% endmacro %}
+
+{% macro sqlserver__create_schema_with_authorization(relation, schema_authorization) -%}
+  {% call statement('create_schema') -%}
+    USE [{{ relation.database }}];
+    IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ relation.schema }}')
+    BEGIN
+    EXEC('CREATE SCHEMA [{{ relation.schema }}] AUTHORIZATION [{{ schema_authorization }}]')
     END
   {% endcall %}
 {% endmacro %}

tests/conftest.py

@@ -13,27 +13,32 @@ def pytest_addoption(parser):
 
 
 @pytest.fixture(scope="class")
-def dbt_profile_target(request: FixtureRequest):
+def dbt_profile_target(request: FixtureRequest, profile_extra_options):
     profile = request.config.getoption("--profile")
 
     if profile == "ci_sql_server":
-        return _profile_ci_sql_server()
+        return _profile_ci_sql_server() | profile_extra_options
     if profile == "ci_azure_cli":
-        return _profile_ci_azure_cli()
+        return _profile_ci_azure_cli() | profile_extra_options
     if profile == "ci_azure_auto":
-        return _profile_ci_azure_auto()
+        return _profile_ci_azure_auto() | profile_extra_options
     if profile == "ci_azure_environment":
-        return _profile_ci_azure_environment()
+        return _profile_ci_azure_environment() | profile_extra_options
     if profile == "ci_azure_basic":
-        return _profile_ci_azure_basic()
+        return _profile_ci_azure_basic() | profile_extra_options
     if profile == "user":
-        return _profile_user()
+        return _profile_user() | profile_extra_options
     if profile == "user_azure":
-        return _profile_user_azure()
+        return _profile_user_azure() | profile_extra_options
 
     raise ValueError(f"Unknown profile: {profile}")
 
 
+@pytest.fixture(scope="class")
+def profile_extra_options():
+    return {}
+
+
 @pytest.fixture(scope="class")
 def is_azure(request: FixtureRequest) -> bool:
     profile = request.config.getoption("--profile")

tests/functional/adapter/test_schema.py

@@ -7,19 +7,16 @@ class TestSchemaCreation:
     def models(self):
         return {
             "dummy.sql": """
-{{ config(schema='custom_test_schema') }}
-select 1 as id
-""",
-            "dummy_with_auth.sql": """
-{{ config(schema='custom_test_schema', schema_authorization=env_var('DBT_TEST_USER_1')) }}
+{{ config(schema='with_custom_auth') }}
 select 1 as id
 """,
         }
 
+    @staticmethod
+    @pytest.fixture(scope="class")
+    def profile_extra_options():
+        return {"schema_authorization": "{{ env_var('DBT_TEST_USER_1') }}"}
+
     def test_schema_creation(self, project):
         res = run_dbt(["run", "-s", "dummy"])
         assert len(res) == 1
-
-    def test_schema_creation_with_auth(self, project):
-        res = run_dbt(["run", "-s", "dummy_with_auth"])
-        assert len(res) == 1