chore: bump dbt to 1.7.0

.github/workflows/functional-tests-workflow.yml

@@ -35,10 +35,10 @@ jobs:
         with:
           ref: ${{ inputs.checkout-ref }}
           repository: ${{ inputs.checkout-repository }}
-      - name: Set up Python 3.10
+      - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.8'
       - name: Install dependencies
         run: |
           make install_deps

dbt/adapters/athena/__version__.py

@@ -1 +1 @@
-version = "1.6.4"
+version = "1.7.0"

dbt/adapters/athena/impl.py

@@ -527,6 +527,9 @@ def _get_one_catalog(
         schemas: Dict[str, Optional[Set[str]]],
         manifest: Manifest,
     ) -> agate.Table:
+        """
+        This function is invoked by Adapter.get_catalog for each schema.
+        """
         data_catalog = self._get_data_catalog(information_schema.path.database)
         data_catalog_type = get_catalog_type(data_catalog)
 
@@ -581,6 +584,10 @@ def _get_one_catalog(
         return self._join_catalog_table_owners(filtered_table, manifest)
 
     def _get_catalog_schemas(self, manifest: Manifest) -> AthenaSchemaSearchMap:
+        """
+        Get the schemas from the catalog.
+        It's called by the `get_catalog` method.
+        """
         info_schema_name_map = AthenaSchemaSearchMap()
         nodes: Iterator[CompiledNode] = chain(
             [node for node in manifest.nodes.values() if (node.is_relational and not node.is_ephemeral_model)],
@@ -658,6 +665,26 @@ def list_relations_without_caching(self, schema_relation: AthenaRelation) -> Lis
 
         return relations
 
+    def _get_one_catalog_by_relations(
+        self,
+        information_schema: InformationSchema,
+        relations: List[BaseRelation],
+        manifest: Manifest,
+    ) -> agate.Table:
+        """
+        Overwrite of _get_one_catalog_by_relations for Athena, in order to use glue apis.
+        This function is invoked by Adapter.get_catalog_by_relations. And
+        """
+        _table_definitions = []
+        for _rel in relations:
+            glue_table_definition = self.get_glue_table(_rel)
+            if glue_table_definition:
+                final_table_definition = self._get_one_table_for_catalog(glue_table_definition, _rel.database)
+                _table_definitions.append(final_table_definition)
+        table = agate.Table.from_object(_table_definitions)
+        filtered_table = self._catalog_filter_table(table, manifest)
+        return self._join_catalog_table_owners(filtered_table, manifest)
+
     @available
     def swap_table(self, src_relation: AthenaRelation, target_relation: AthenaRelation) -> None:
         conn = self.connections.get_thread_connection()

dbt/include/athena/macros/adapters/metadata.sql

@@ -11,3 +11,7 @@
 {% macro athena__list_relations_without_caching(schema_relation) %}
   {{ return(adapter.list_relations_without_caching(schema_relation)) }}
 {% endmacro %}
+
+{% macro athena__get_catalog_relations(information_schema, relations) %}
+  {{ return(adapter.get_catalog_by_relations()) }}
+{% endmacro %}

dev-requirements.txt

@@ -1,7 +1,7 @@
 autoflake~=1.7
 black~=23.10
 boto3-stubs[s3]~=1.28
-dbt-tests-adapter~=1.6.6
+dbt-tests-adapter~=1.7.0
 flake8~=6.1
 Flake8-pyproject~=1.2
 isort~=5.11

setup.py

@@ -31,7 +31,7 @@ def _get_package_version() -> str:
     return f'{parts["major"]}.{parts["minor"]}.{parts["patch"]}'
 
 
-dbt_version = "1.6"
+dbt_version = "1.7"
 package_version = _get_package_version()
 description = "The athena adapter plugin for dbt (data build tool)"
 
@@ -55,7 +55,7 @@ def _get_package_version() -> str:
         # In order to control dbt-core version and package version
         "boto3~=1.26",
         "boto3-stubs[athena,glue,lakeformation,sts]~=1.26",
-        "dbt-core~=1.6.0",
+        "dbt-core~=1.7.0",
         "pyathena>=2.25,<4.0",
         "pydantic>=1.10,<3.0",
         "tenacity~=8.2",

tests/conftest.py

@@ -4,8 +4,9 @@
 import pytest
 
 from dbt.events.base_types import EventLevel
-from dbt.events.eventmgr import LineFormat, NoFilter
+from dbt.events.eventmgr import LineFormat
 from dbt.events.functions import EVENT_MANAGER, _get_stdout_config
+from dbt.events.logger import NoFilter
 
 # Import the functional fixtures as a plugin
 # Note: fixtures with session scope need to be local

tests/functional/adapter/test_constraints.py

@@ -12,7 +12,9 @@ class TestAthenaConstraintQuotedColumn(BaseConstraintQuotedColumn):
     def models(self):
         return {
             "my_model.sql": my_model_with_quoted_column_name_sql,
-            "constraints_schema.yml": model_quoted_column_schema_yml.replace("text", "string"),
+            # we replace text type with varchar
+            # do not replace text with string, because then string is replaced with a capital TEXT that leads to failure
+            "constraints_schema.yml": model_quoted_column_schema_yml.replace("text", "varchar"),
         }
 
     @pytest.fixture(scope="class")

tests/functional/adapter/test_docs.py

@@ -0,0 +1,26 @@
+import pytest
+
+from dbt.contracts.results import RunStatus
+from dbt.tests.util import run_dbt
+
+model_sql = """
+select 1 as id
+"""
+
+
+class TestDocsGenerate:
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {"model.sql": model_sql}
+
+    def test_generate_docs(
+        self,
+        project,
+    ):
+        results = run_dbt(["run"])
+        assert len(results) == 1
+
+        docs_generate = run_dbt(["--warn-error", "docs", "generate"])
+        assert len(docs_generate._compile_results.results) == 1
+        assert docs_generate._compile_results.results[0].status == RunStatus.Success
+        assert docs_generate.errors is None