feat: [SNOW-1890085] dbt deploy: add support for dbt-adapter-version flag

Author: sfc-gh-jwilkowski

src/snowflake/cli/_plugins/dbt/commands.py

@@ -70,6 +70,9 @@ def deploy_dbt(
         None,
         help="Version of dbt tool to be used. Taken from dbt_project.yml if not provided.",
     ),
+    dbt_adapter_version: str = typer.Option(
+        help="dbt-snowflake adapter version to be used",
+    ),
     **options,
 ) -> CommandResult:
     """
@@ -81,7 +84,9 @@ def deploy_dbt(
     else:
         path = Path(source)
     return QueryResult(
-        DBTManager().deploy(path.resolve(), name, dbt_version, force=force)
+        DBTManager().deploy(
+            path.resolve(), name, dbt_version, dbt_adapter_version, force=force
+        )
     )
 
 

src/snowflake/cli/_plugins/dbt/manager.py

@@ -45,7 +45,12 @@ def list(self) -> SnowflakeCursor:  # noqa: A003
         return self.execute_query(query)
 
     def deploy(
-        self, path: Path, name: FQN, dbt_version: Optional[str], force: bool
+        self,
+        path: Path,
+        name: FQN,
+        dbt_version: Optional[str],
+        dbt_adapter_version: str,
+        force: bool,
     ) -> SnowflakeCursor:
         # TODO: what to do with force?
         if not path.joinpath("dbt_project.yml").exists():
@@ -72,7 +77,7 @@ def deploy(
             cli_console.step(f"Copied {len(results)} files")
 
         with cli_console.phase("Creating DBT project"):
-            query = f"CREATE OR REPLACE DBT PROJECT {name} FROM {stage_name} DBT_VERSION='{dbt_version}'"
+            query = f"CREATE OR REPLACE DBT PROJECT {name} FROM {stage_name} DBT_VERSION='{dbt_version}' DBT_ADAPTER_VERSION='{dbt_adapter_version}'"
             return self.execute_query(query)
 
     def execute(self, dbt_command: str, name: str, *dbt_cli_args):

tests/dbt/test_dbt_commands.py

@@ -61,13 +61,19 @@ def test_deploys_project_from_source(
     ):
 
         result = runner.invoke(
-            ["dbt", "deploy", "TEST_PIPELINE", f"--source={dbt_project_path}"]
+            [
+                "dbt",
+                "deploy",
+                "TEST_PIPELINE",
+                f"--source={dbt_project_path}",
+                "--dbt-adapter-version=3.4.5",
+            ]
         )
 
         assert result.exit_code == 0, result.output
         assert (
             mock_connect.mocked_ctx.get_query()
-            == "CREATE OR REPLACE DBT PROJECT TEST_PIPELINE FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage DBT_VERSION='1.2.3'"
+            == "CREATE OR REPLACE DBT PROJECT TEST_PIPELINE FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage DBT_VERSION='1.2.3' DBT_ADAPTER_VERSION='3.4.5'"
         )
         stage_fqn = FQN.from_string(f"dbt_TEST_PIPELINE_stage").using_context()
         mock_create.assert_called_once_with(stage_fqn, temporary=True)
@@ -87,13 +93,14 @@ def test_dbt_version_from_option_has_precedence_over_file(
                 "TEST_PIPELINE",
                 f"--source={dbt_project_path}",
                 "--dbt-version=2.3.4",
+                "--dbt-adapter-version=3.4.5",
             ]
         )
 
         assert result.exit_code == 0, result.output
         assert (
             mock_connect.mocked_ctx.get_query()
-            == "CREATE OR REPLACE DBT PROJECT TEST_PIPELINE FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage DBT_VERSION='2.3.4'"
+            == "CREATE OR REPLACE DBT PROJECT TEST_PIPELINE FROM @MockDatabase.MockSchema.dbt_TEST_PIPELINE_stage DBT_VERSION='2.3.4' DBT_ADAPTER_VERSION='3.4.5'"
         )
 
     def test_raises_when_dbt_project_is_not_available(
@@ -103,7 +110,13 @@ def test_raises_when_dbt_project_is_not_available(
         dbt_file.unlink()
 
         result = runner.invoke(
-            ["dbt", "deploy", "TEST_PIPELINE", f"--source={dbt_project_path}"]
+            [
+                "dbt",
+                "deploy",
+                "TEST_PIPELINE",
+                f"--source={dbt_project_path}",
+                "--dbt-adapter-version=3.4.5",
+            ],
         )
 
         assert result.exit_code == 1, result.output
@@ -118,7 +131,13 @@ def test_raises_when_dbt_project_version_is_not_specified(
             yaml.dump({}, fd)
 
         result = runner.invoke(
-            ["dbt", "deploy", "TEST_PIPELINE", f"--source={dbt_project_path}"]
+            [
+                "dbt",
+                "deploy",
+                "TEST_PIPELINE",
+                f"--source={dbt_project_path}",
+                "--dbt-adapter-version=3.4.5",
+            ]
         )
 
         assert result.exit_code == 1, result.output