Merge branch 'main' into feature/add-replace-support-mssql-hook

apache · Jul 18, 2024 · cb45727 · cb45727
2 parents 32cb295 + 67befb7
commit cb45727
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/airflow/providers/google/cloud/hooks/cloud_sql.py b/airflow/providers/google/cloud/hooks/cloud_sql.py
@@ -1148,7 +1148,7 @@ def get_database_hook(self, connection: Connection) -> PostgresHook | MySqlHook:
         connects directly to the Google Cloud SQL database.
         """
         if self.database_type == "postgres":
-            db_hook: PostgresHook | MySqlHook = PostgresHook(connection=connection, schema=self.database)
+            db_hook: PostgresHook | MySqlHook = PostgresHook(connection=connection, database=self.database)
         else:
             db_hook = MySqlHook(connection=connection, schema=self.database)
         self.db_hook = db_hook

diff --git a/tests/deprecations_ignore.yml b/tests/deprecations_ignore.yml
@@ -105,7 +105,6 @@
 - tests/providers/google/cloud/hooks/test_bigquery.py::TestTimePartitioningInRunJob::test_run_load_with_arg
 - tests/providers/google/cloud/hooks/test_bigquery.py::TestTimePartitioningInRunJob::test_run_query_with_arg
 - tests/providers/google/cloud/hooks/test_bigquery.py::TestTimePartitioningInRunJob::test_run_with_auto_detect
-- tests/providers/google/cloud/hooks/test_cloud_sql.py::TestCloudSqlDatabaseHook::test_cloudsql_database_hook_get_database_hook
 - tests/providers/google/cloud/hooks/test_gcs.py::TestGCSHook::test_list__error_match_glob_and_invalid_delimiter
 - tests/providers/google/cloud/hooks/test_life_sciences.py::TestLifeSciencesHookWithDefaultProjectIdFromConnection::test_error_operation
 - tests/providers/google/cloud/hooks/test_life_sciences.py::TestLifeSciencesHookWithDefaultProjectIdFromConnection::test_life_science_client_creation