Merge branch 'main' into release-3.0.0

Author: kukushking

awswrangler/data_api/rds.py

@@ -88,9 +88,7 @@ def _execute_statement(self, sql: str, database: Optional[str] = None) -> str:
 
         if response is None:
             self.logger.exception("Maximum BadRequestException retries reached for query %s", sql)
-            raise self.client.exceptions.BadRequestException(
-                f"Query failed - BadRequestException received after {total_tries} tries and sleeping {total_sleep}s"
-            ) from last_exception
+            raise last_exception  # type: ignore
 
         request_id: str = uuid.uuid4().hex
         self.results[request_id] = response

tests/conftest.py

@@ -130,32 +130,32 @@ def workgroup3(bucket, kms_key):
 @pytest.fixture(scope="session")
 def databases_parameters(cloudformation_outputs, db_password):
     parameters = dict(postgresql={}, mysql={}, redshift={}, sqlserver={}, mysql_serverless={}, oracle={})
-    parameters["postgresql"]["host"] = cloudformation_outputs["PostgresqlAddress"]
+    parameters["postgresql"]["host"] = cloudformation_outputs.get("PostgresqlAddress")
     parameters["postgresql"]["port"] = 3306
     parameters["postgresql"]["schema"] = "public"
     parameters["postgresql"]["database"] = "postgres"
-    parameters["mysql"]["host"] = cloudformation_outputs["MysqlAddress"]
+    parameters["mysql"]["host"] = cloudformation_outputs.get("MysqlAddress")
     parameters["mysql"]["port"] = 3306
     parameters["mysql"]["schema"] = "test"
     parameters["mysql"]["database"] = "test"
-    parameters["redshift"]["secret_arn"] = cloudformation_outputs["RedshiftSecretArn"]
-    parameters["redshift"]["host"] = cloudformation_outputs["RedshiftAddress"]
-    parameters["redshift"]["port"] = cloudformation_outputs["RedshiftPort"]
-    parameters["redshift"]["identifier"] = cloudformation_outputs["RedshiftIdentifier"]
+    parameters["redshift"]["secret_arn"] = cloudformation_outputs.get("RedshiftSecretArn")
+    parameters["redshift"]["host"] = cloudformation_outputs.get("RedshiftAddress")
+    parameters["redshift"]["port"] = cloudformation_outputs.get("RedshiftPort")
+    parameters["redshift"]["identifier"] = cloudformation_outputs.get("RedshiftIdentifier")
     parameters["redshift"]["schema"] = "public"
     parameters["redshift"]["database"] = "test"
-    parameters["redshift"]["role"] = cloudformation_outputs["RedshiftRole"]
+    parameters["redshift"]["role"] = cloudformation_outputs.get("RedshiftRole")
     parameters["password"] = db_password
     parameters["user"] = "test"
-    parameters["sqlserver"]["host"] = cloudformation_outputs["SqlServerAddress"]
+    parameters["sqlserver"]["host"] = cloudformation_outputs.get("SqlServerAddress")
     parameters["sqlserver"]["port"] = 1433
     parameters["sqlserver"]["schema"] = "dbo"
     parameters["sqlserver"]["database"] = "test"
-    parameters["mysql_serverless"]["secret_arn"] = cloudformation_outputs["MysqlServerlessSecretArn"]
+    parameters["mysql_serverless"]["secret_arn"] = cloudformation_outputs.get("MysqlServerlessSecretArn")
     parameters["mysql_serverless"]["schema"] = "test"
     parameters["mysql_serverless"]["database"] = "test"
-    parameters["mysql_serverless"]["arn"] = cloudformation_outputs["MysqlServerlessClusterArn"]
-    parameters["oracle"]["host"] = cloudformation_outputs["OracleAddress"]
+    parameters["mysql_serverless"]["arn"] = cloudformation_outputs.get("MysqlServerlessClusterArn")
+    parameters["oracle"]["host"] = cloudformation_outputs.get("OracleAddress")
     parameters["oracle"]["port"] = 1521
     parameters["oracle"]["schema"] = "TEST"
     parameters["oracle"]["database"] = "ORCL"

tests/test_data_api.py

@@ -129,3 +129,8 @@ def test_data_api_mysql_column_subset_select(mysql_serverless_connector, mysql_s
     )
     expected_dataframe = pd.DataFrame([["test"]], columns=["name"])
     pd.testing.assert_frame_equal(dataframe, expected_dataframe)
+
+
+def test_data_api_exception(mysql_serverless_connector, mysql_serverless_table):
+    with pytest.raises(boto3.client("rds-data").exceptions.BadRequestException):
+        wr.data_api.rds.read_sql_query("CUPCAKE", con=mysql_serverless_connector)