Add tests to see if pre_model_hook works for tests around snowflake_warehouse

dbt/adapters/snowflake/impl.py

@@ -7,6 +7,7 @@
 from dbt.adapters.base.meta import available
 from dbt.adapters.capability import CapabilityDict, CapabilitySupport, Support, Capability
 from dbt.adapters.sql import SQLAdapter
+from dbt.adapters.events.logging import AdapterLogger
 from dbt.adapters.sql.impl import (
     LIST_SCHEMAS_MACRO_NAME,
     LIST_RELATIONS_MACRO_NAME,
@@ -19,6 +20,8 @@
 from dbt_common.exceptions import CompilationError, DbtDatabaseError, DbtRuntimeError
 from dbt_common.utils import filter_null_values
 
+logger = AdapterLogger("Snowflake")
+
 
 @dataclass
 class SnowflakeConfig(AdapterConfig):
@@ -99,15 +102,20 @@ def _use_warehouse(self, warehouse: str):
     def pre_model_hook(self, config: Mapping[str, Any]) -> Optional[str]:
         default_warehouse = self.config.credentials.warehouse
         warehouse = config.get("snowflake_warehouse", default_warehouse)
+        logger.info("Running pre_model_hook:")
+        logger.info(f"Default warehouse: {default_warehouse}, Selected warehouse: {warehouse}")
         if warehouse == default_warehouse or warehouse is None:
             return None
         previous = self._get_warehouse()
         self._use_warehouse(warehouse)
+        logger.info(f"Changed wareho use from {previous} to {warehouse}")
         return previous
 
     def post_model_hook(self, config: Mapping[str, Any], context: Optional[str]) -> None:
+        logger.info(f"Running post_model_hook with config, and context: {context}")
         if context is not None:
             self._use_warehouse(context)
+            logger.info(f"Restored warehouse to {context}")
 
     def list_schemas(self, database: str) -> List[str]:
         try:

dev-requirements.txt

@@ -1,5 +1,5 @@
-# install latest changes in dbt-core
-git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core
+# install latest changes in dbt-core"
+git+https://github.com/dbt-labs/dbt-core.git@mcknight/10198#egg=dbt-core&subdirectory=core
 git+https://github.com/dbt-labs/dbt-adapters.git
 git+https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-tests-adapter
 git+https://github.com/dbt-labs/dbt-common.git

tests/functional/warehouse_test/test_warehouses.py

@@ -3,35 +3,34 @@
 
 import os
 
-
 models__override_warehouse_sql = """
 {{ config(snowflake_warehouse=env_var('SNOWFLAKE_TEST_ALT_WAREHOUSE', 'DBT_TEST_ALT'), materialized='table') }}
 select current_warehouse() as warehouse
-
 """
 
 models__expected_warehouse_sql = """
 {{ config(materialized='table') }}
 select '{{ env_var("SNOWFLAKE_TEST_ALT_WAREHOUSE", "DBT_TEST_ALT") }}' as warehouse
-
 """
 
 models__invalid_warehouse_sql = """
 {{ config(snowflake_warehouse='DBT_TEST_DOES_NOT_EXIST') }}
 select current_warehouse() as warehouse
-
 """
 
 project_config_models__override_warehouse_sql = """
 {{ config(materialized='table') }}
 select current_warehouse() as warehouse
-
 """
 
 project_config_models__expected_warehouse_sql = """
 {{ config(materialized='table') }}
 select '{{ env_var("SNOWFLAKE_TEST_ALT_WAREHOUSE", "DBT_TEST_ALT") }}' as warehouse
+"""
 
+project_config_models__invalid_warehouse_sql = """
+{{ config(materialized='table') }}
+select current_warehouse() as warehouse
 """
 
 
@@ -90,3 +89,25 @@ def test_snowflake_override_ok(self, project):
             ]
         )
         check_relations_equal(project.adapter, ["OVERRIDE_WAREHOUSE", "EXPECTED_WAREHOUSE"])
+
+
+class TestInvalidConfigWarehouse:
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "invalid_warehouse.sql": project_config_models__invalid_warehouse_sql,
+        }
+
+    @pytest.fixture(scope="class")
+    def project_config_update(self):
+        return {
+            "config-version": 2,
+            "models": {
+                "test": {
+                    "snowflake_warehouse": "DBT_TEST_DOES_NOT_EXIST",
+                },
+            },
+        }
+
+    def test_snowflake_override_invalid(self, project):
+        run_dbt(["run", "--models", "invalid_warehouse"], expect_pass=False)