refactor: move some hacks location

.github/workflows/test_integration_cli.yml

@@ -212,6 +212,7 @@ jobs:
             dbt: "1.1.*"
           - profile: "fal"
             dbt: "1.2.*"
+          # TODO: use dbt-athena-community instead
           # dbt-athena-adapter only supports dbt-core==1.0.* for now
           - profile: "athena"
             dbt: "1.1.*"

adapter/src/dbt/adapters/fal/wrappers.py

@@ -94,6 +94,15 @@ def __getattr__(self, name):
         else:
             getattr(super(), name)
 
+    def get_relation(self, database: str, schema: str, identifier: str):
+        # HACK: When compiling Python models, we get an all-False quoting policy
+        #       This does not happen in 1.4
+        if self._db_adapter.type() == "athena":
+            # and dbt-athena-community breaks for that case
+            self.config.quoting = {"database": True, "schema": True, "identifier": True}
+
+        return self._db_adapter.get_relation(database, schema, identifier)
+
 
 def find_funcs_in_stack(funcs: Set[str]) -> bool:
     import inspect

adapter/src/dbt/adapters/fal_experimental/impl.py

@@ -3,7 +3,7 @@
 from contextlib import contextmanager
 from typing import Iterator
 
-from dbt.adapters.base.impl import BaseAdapter, Optional
+from dbt.adapters.base.impl import BaseAdapter
 from dbt.adapters.base.meta import AdapterMeta, available
 from dbt.adapters.base.relation import BaseRelation
 from dbt.contracts.connection import AdapterResponse
@@ -61,13 +61,6 @@ def manifest(self) -> Manifest:
     def macro_manifest(self) -> MacroManifest:
         return self._db_adapter.load_macro_manifest()
 
-    def get_relation(self, database: str, schema: str, identifier: str) -> Optional[BaseRelation]:
-        # HACK: When compiling Python models, dbt-athena-community adapter loses quoting policy
-        # So we reset it manually for AthenaAdapter
-        if type(self._db_adapter).__name__ == "AthenaAdapter":
-            self.config.quoting = {'database': True, 'schema': True, 'identifier': True}
-        return BaseAdapter.get_relation(self, database, schema, identifier)
-
     @telemetry.log_call("experimental_submit_python_job", config=True)
     def submit_python_job(
         self, parsed_model: dict, compiled_code: str

adapter/src/dbt/adapters/fal_experimental/utils/environments.py

@@ -225,18 +225,21 @@ def _parse_remote_config(config: Dict[str, Any], parsed_config: Dict[str, Any])
         "target_environments": [env_definition]
     }
 
+def _get_package_from_type(adapter_type: str):
+    SPECIAL_ADAPTERS = {
+        # Documented in dbt website
+        "athena": "dbt-athena-community",
+    }
+    return SPECIAL_ADAPTERS.get(adapter_type, f"dbt-{adapter_type}")
+
 
 def _get_dbt_packages(
     adapter_type: str,
     is_teleport: bool = False,
     is_remote: bool = False
 ) -> Iterator[Tuple[str, Optional[str]]]:
-    dbt_adapter = f"dbt-{adapter_type}"
-    for dbt_plugin_name in ['dbt-core', dbt_adapter]:
-        if dbt_plugin_name == "dbt-athena":
-            # dbt-athena from PyPI doesn't support dbt 1.3, but dbt-athena-community does:
-            # https://github.com/dbt-athena/dbt-athena
-            dbt_plugin_name = "dbt-athena-community"
+    dbt_adapter = _get_package_from_type(adapter_type)
+    for dbt_plugin_name in ["dbt-core", dbt_adapter]:
         distribution = importlib_metadata.distribution(dbt_plugin_name)
 
         yield dbt_plugin_name, distribution.version