Implement drop_glue_database macro and method (#758)

dbt-adapters/.changes/1.14.0.md

@@ -1,3 +1 @@
 ## dbt-adapters 1.14.0 - February 07, 2025
-
-

dbt-adapters/CHANGELOG.md

@@ -281,4 +281,3 @@ and is generated by [Changie](https://github.com/miniscruff/changie)
 ### Security
 
 * Pin `black>=24.3` in `pyproject.toml` ([#140](https://github.com/dbt-labs/dbt-adapters/issues/140))
-

dbt-adapters/src/dbt/adapters/sql/connections.py

@@ -102,7 +102,7 @@ def _execute_query_with_retry(
 
                 fire_event(
                     AdapterEventDebug(
-                        message=f"Got a retryable error {type(e)}. {retry_limit-attempt} retries left. Retrying in 1 second.\nError:\n{e}"
+                        message=f"Got a retryable error {type(e)}. {retry_limit - attempt} retries left. Retrying in 1 second.\nError:\n{e}"
                     )
                 )
                 time.sleep(1)

dbt-athena/.changes/1.9.1.md

@@ -1,3 +1 @@
 ## dbt-athena 1.9.1 - February 07, 2025
-
-

dbt-athena/.changes/unreleased/Features-20250129-121455.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Implement drop_glue_database macro and method
+time: 2025-01-29T12:14:55.46675+01:00
+custom:
+    Author: svdimchenko
+    Issue: "408"

dbt-athena/CHANGELOG.md

@@ -19,4 +19,3 @@ and is generated by [Changie](https://github.com/miniscruff/changie)
 For information on prior major and minor releases, see their changelogs:
 
 - [1.8](https://github.com/dbt-labs/dbt-athena/blob/main/CHANGELOG.md)
-

dbt-athena/src/dbt/adapters/athena/impl.py

@@ -9,7 +9,7 @@
 from functools import lru_cache
 from textwrap import dedent
 from threading import Lock
-from typing import Any, Dict, FrozenSet, Iterable, List, Optional, Set, Tuple, Type
+from typing import TYPE_CHECKING, Any, Dict, FrozenSet, Iterable, List, Optional, Set, Tuple, Type
 from urllib.parse import urlparse
 from uuid import uuid4
 
@@ -69,6 +69,10 @@
 from dbt.adapters.contracts.relation import RelationConfig
 from dbt.adapters.sql import SQLAdapter
 
+
+if TYPE_CHECKING:
+    from mypy_boto3_glue.client import GlueClient
+
 boto3_client_lock = Lock()
 
 
@@ -1242,6 +1246,23 @@ def delete_from_glue_catalog(self, relation: AthenaRelation) -> None:
                 LOGGER.error(e)
                 raise e
 
+    @available
+    def drop_glue_database(self, database_name: str, catalog_name: str = "awsdatacatalog") -> None:
+        conn = self.connections.get_thread_connection()
+        creds = conn.credentials
+        client = conn.handle
+        catalog = self._get_data_catalog(catalog_name)
+        catalog_id = get_catalog_id(catalog)
+
+        with boto3_client_lock:
+            glue_client: GlueClient = client.session.client(
+                "glue",
+                region_name=client.region_name,
+                config=get_boto3_config(num_retries=creds.effective_num_retries),
+            )
+            glue_client.delete_database(Name=database_name, CatalogId=catalog_id)
+            LOGGER.debug(f"Glue database successfully deleted: {catalog_name}.{database_name}")
+
     @available.parse_none
     def valid_snapshot_target(self, relation: BaseRelation) -> None:
         """Log an error to help developers migrate to the new snapshot logic"""

dbt-athena/src/dbt/include/athena/macros/adapters/schema.sql

@@ -13,3 +13,8 @@
     drop schema if exists {{ relation.without_identifier().render_hive() }} cascade
   {% endcall %}
 {% endmacro %}
+
+
+{% macro drop_glue_database(database_name, catalog_name='awsdatacatalog') -%}
+  {{ adapter.drop_glue_database(database_name, catalog_name) }}
+{% endmacro %}

dbt-athena/tests/unit/test_adapter.py

@@ -12,6 +12,7 @@
 from dbt_common.exceptions import ConnectionError, DbtRuntimeError
 from moto import mock_aws
 from moto.core import DEFAULT_ACCOUNT_ID
+from mypy_boto3_glue.client import GlueClient
 
 from dbt.adapters.athena import AthenaAdapter
 from dbt.adapters.athena import Plugin as AthenaPlugin
@@ -1361,6 +1362,17 @@ def test_format_unsupported_type(self):
         with pytest.raises(ValueError):
             self.adapter.format_value_for_partition("test", "unsupported_type")
 
+    @mock_aws
+    def test_drop_glue_database(self):
+        glue_client: GlueClient = boto3.client("glue", region_name=AWS_REGION)
+        test_input = {"Name": "test"}
+        glue_client.create_database(DatabaseInput=test_input)
+        database_list = glue_client.get_databases()["DatabaseList"]
+        assert [test_input["Name"]] == [db["Name"] for db in database_list]
+        self.adapter.acquire_connection("dummy")
+        self.adapter.drop_glue_database(database_name=test_input["Name"])
+        assert glue_client.get_databases()["DatabaseList"] == []
+
 
 class TestAthenaFilterCatalog:
     def test__catalog_filter_table(self):

dbt-tests-adapter/.changes/1.11.0.md

@@ -1,3 +1 @@
 ## dbt-tests-adapter 1.11.0 - February 07, 2025
-
-

dbt-tests-adapter/CHANGELOG.md

@@ -11,6 +11,3 @@ and is generated by [Changie](https://github.com/miniscruff/changie)
 - For details on how to document a change, see the [contributing guide](/CONTRIBUTING.md#changelog-entry)
 
 ## dbt-tests-adapter 1.11.0 - February 07, 2025
-
-
-