rename path to backends instead of backend

Author: faviansamatha

aws_advanced_python_wrapper/sql_alchemy_connection_provider.py

@@ -88,7 +88,7 @@ def accepts_host_info(self, host_info: HostInfo, props: Properties) -> bool:
         if self._accept_url_func:
             return self._accept_url_func(host_info, props)
         url_type = SqlAlchemyPooledConnectionProvider._rds_utils.identify_rds_type(host_info.host)
-        return url_type in (RdsUrlType.RDS_INSTANCE, RdsUrlType.RDS_WRITER_CLUSTER)
+        return RdsUrlType.RDS_INSTANCE == url_type
 
     def accepts_strategy(self, role: HostRole, strategy: str) -> bool:
         return strategy == SqlAlchemyPooledConnectionProvider._LEAST_CONNECTIONS or strategy in self._accepted_strategies
@@ -137,6 +137,7 @@ def connect(
 
         if queue_pool is None:
             raise AwsWrapperError(Messages.get_formatted("SqlAlchemyPooledConnectionProvider.PoolNone", host_info.url))
+
         return queue_pool.connect()
 
     # The pool key should always be retrieved using this method, because the username

aws_advanced_python_wrapper/tortoise/backend/__init__.py renamed to aws_advanced_python_wrapper/tortoise/backends/__init__.py

@@ -48,7 +48,7 @@ async def setup_tortoise_dict_config(self, conn_utils):
         config = {
             "connections": {
                 "default": {
-                    "engine": "aws_advanced_python_wrapper.tortoise.backend.mysql",
+                    "engine": "aws_advanced_python_wrapper.tortoise.backends.mysql",
                     "credentials": {
                         "host": conn_utils.writer_cluster_host,
                         "port": conn_utils.port,
@@ -87,7 +87,7 @@ async def setup_tortoise_multi_db(self, conn_utils):
         config = {
             "connections": {
                 "default": {
-                    "engine": "aws_advanced_python_wrapper.tortoise.backend.mysql",
+                    "engine": "aws_advanced_python_wrapper.tortoise.backends.mysql",
                     "credentials": {
                         "host": conn_utils.writer_cluster_host,
                         "port": conn_utils.port,
@@ -98,7 +98,7 @@ async def setup_tortoise_multi_db(self, conn_utils):
                     }
                 },
                 "second_db": {
-                    "engine": "aws_advanced_python_wrapper.tortoise.backend.mysql",
+                    "engine": "aws_advanced_python_wrapper.tortoise.backends.mysql",
                     "credentials": {
                         "host": conn_utils.writer_cluster_host,
                         "port": conn_utils.port,
@@ -149,7 +149,7 @@ async def setup_tortoise_with_router(self, conn_utils):
         config = {
             "connections": {
                 "default": {
-                    "engine": "aws_advanced_python_wrapper.tortoise.backend.mysql",
+                    "engine": "aws_advanced_python_wrapper.tortoise.backends.mysql",
                     "credentials": {
                         "host": conn_utils.writer_cluster_host,
                         "port": conn_utils.port,

aws_advanced_python_wrapper/tortoise/backend/base/__init__.py renamed to aws_advanced_python_wrapper/tortoise/backends/base/__init__.py

@@ -19,7 +19,7 @@
 from tortoise.exceptions import (DBConnectionError, IntegrityError,
                                  OperationalError, TransactionManagementError)
 
-from aws_advanced_python_wrapper.tortoise.backend.mysql.client import (
+from aws_advanced_python_wrapper.tortoise.backends.mysql.client import (
     AwsMySQLClient, TransactionWrapper, _gen_savepoint_name,
     translate_exceptions)
 
@@ -117,7 +117,7 @@ async def test_create_connection_success(self):
                 connection_name="test_conn"
             )
 
-        with patch('aws_advanced_python_wrapper.tortoise.backend.mysql.client.logger'):
+        with patch('aws_advanced_python_wrapper.tortoise.backends.mysql.client.logger'):
             await client.create_connection(with_db=True)
 
         assert client._template["user"] == "test_user"
@@ -177,7 +177,7 @@ async def test_execute_insert(self):
             mock_connection.cursor.return_value.__aexit__ = AsyncMock()
             mock_cursor.execute = AsyncMock()
 
-            with patch('aws_advanced_python_wrapper.tortoise.backend.mysql.client.logger'):
+            with patch('aws_advanced_python_wrapper.tortoise.backends.mysql.client.logger'):
                 result = await client.execute_insert("INSERT INTO test VALUES (?)", ["value"])
 
             assert result == 123
@@ -208,7 +208,7 @@ async def test_execute_many_with_transactions(self):
             with patch.object(client, '_execute_many_with_transaction') as mock_execute_many_tx:
                 mock_execute_many_tx.return_value = None
 
-                with patch('aws_advanced_python_wrapper.tortoise.backend.mysql.client.logger'):
+                with patch('aws_advanced_python_wrapper.tortoise.backends.mysql.client.logger'):
                     await client.execute_many("INSERT INTO test VALUES (?)", [["val1"], ["val2"]])
 
                 mock_execute_many_tx.assert_called_once_with(
@@ -240,7 +240,7 @@ async def test_execute_query(self):
             mock_cursor.execute = AsyncMock()
             mock_cursor.fetchall = AsyncMock(return_value=[(1, "test"), (2, "test2")])
 
-            with patch('aws_advanced_python_wrapper.tortoise.backend.mysql.client.logger'):
+            with patch('aws_advanced_python_wrapper.tortoise.backends.mysql.client.logger'):
                 rowcount, results = await client.execute_query("SELECT * FROM test")
 
             assert rowcount == 2