refactor: [SNOW-1890085] post code review fixes

Author: sfc-gh-jwilkowski

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

@@ -29,7 +29,12 @@
 from snowflake.cli.api.constants import ObjectType
 from snowflake.cli.api.feature_flags import FeatureFlag
 from snowflake.cli.api.identifiers import FQN
-from snowflake.cli.api.output.types import CommandResult, MessageResult, QueryResult
+from snowflake.cli.api.output.types import (
+    CommandResult,
+    MessageResult,
+    QueryResult,
+    SingleQueryResult,
+)
 from snowflake.cli.api.secure_path import SecurePath
 
 app = SnowTyperFactory(
@@ -129,9 +134,10 @@ def _dbt_execute(
         name = ctx.parent.params["name"]
         run_async = ctx.parent.params["run_async"]
         execute_args = (dbt_command, name, run_async, *dbt_cli_args)
+        dbt_manager = DBTManager()
 
         if run_async is True:
-            result = DBTManager().execute(*execute_args)
+            result = dbt_manager.execute(*execute_args)
             return MessageResult(
                 f"Command submitted. You can check the result with `snow sql -q \"select execution_status from table(information_schema.query_history_by_user()) where query_id in ('{result.sfqid}');\"`"
             )
@@ -141,5 +147,6 @@ def _dbt_execute(
             TextColumn("[progress.description]{task.description}"),
             transient=True,
         ) as progress:
-            progress.add_task(description="Executing dbt command...", total=None)
-            return QueryResult(DBTManager().execute(*execute_args))
+            progress.add_task(description=f"Executing 'dbt {dbt_command}'", total=None)
+            result = dbt_manager.execute(*execute_args)
+            return SingleQueryResult(result)

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

@@ -44,7 +44,9 @@ def deploy(
     ) -> SnowflakeCursor:
         dbt_project_path = path / "dbt_project.yml"
         if not dbt_project_path.exists():
-            raise ClickException(f"dbt_project.yml does not exist in provided path.")
+            raise ClickException(
+                f"dbt_project.yml does not exist in directory {path.path.absolute()}."
+            )
 
         if self.exists(name=name) and force is not True:
             raise ClickException(
@@ -69,6 +71,6 @@ def deploy(
 
     def execute(self, dbt_command: str, name: str, run_async: bool, *dbt_cli_args):
         if dbt_cli_args:
-            dbt_command = dbt_command + " " + " ".join([arg for arg in dbt_cli_args])
-        query = f"EXECUTE DBT PROJECT {name} args='{dbt_command.strip()}'"
+            dbt_command = " ".join([dbt_command, *dbt_cli_args]).strip()
+        query = f"EXECUTE DBT PROJECT {name} args='{dbt_command}'"
         return self.execute_query(query, _exec_async=run_async)

src/snowflake/cli/api/sql_execution.py

@@ -87,20 +87,18 @@ def _execute_string(
 
     def execute_string(self, query: str, **kwargs) -> Iterable[SnowflakeCursor]:
         """Executes a single SQL query and returns the results"""
-        return self._execute_string(query, **kwargs)
+        return self._execute_string(dedent(query), **kwargs)
 
     def execute_query(self, query: str, **kwargs) -> SnowflakeCursor:
         """Executes a single SQL query and returns the last result"""
-        *_, last_result = list(self.execute_string(dedent(query), **kwargs))
+        *_, last_result = list(self.execute_string(query, **kwargs))
         return last_result
 
     def execute_queries(self, queries: str, **kwargs):
         """Executes multiple SQL queries (passed as one string) and returns the results as a list"""
 
         # Without remove_comments=True, connectors might throw an error if there is a comment at the end of the file
-        return list(
-            self.execute_string(dedent(queries), remove_comments=True, **kwargs)
-        )
+        return list(self.execute_string(queries, remove_comments=True, **kwargs))
 
 
 class SqlExecutor(BaseSqlExecutor):

tests/dbt/test_dbt_commands.py

@@ -177,7 +177,7 @@ def test_raises_when_dbt_project_is_not_available(
         )
 
         assert result.exit_code == 1, result.output
-        assert "dbt_project.yml does not exist in provided path." in result.output
+        assert f"dbt_project.yml does not exist in directory" in result.output
         assert mock_connect.mocked_ctx.get_query() == ""
 
     def test_raises_when_dbt_project_exists_and_is_not_force(