ISSUE #346

* Add retro-compatibility.

Author: Sergio García Prado

packages/core/minos-microservice-common/minos/common/database/abc.py

@@ -33,6 +33,7 @@
 )
 from .pools import (
     DatabaseClientPool,
+    PostgreSqlPool,
 )
 
 
@@ -42,26 +43,32 @@ class DatabaseMixin(SetupMixin):
     @Inject()
     def __init__(
         self,
-        pool: Optional[DatabaseClientPool] = None,
+        database_pool: Optional[DatabaseClientPool] = None,
         pool_factory: Optional[PoolFactory] = None,
+        postgresql_pool: Optional[PostgreSqlPool] = None,
         *args,
         **kwargs,
     ):
         super().__init__(*args, **kwargs, pool_factory=pool_factory)
-        if pool is None and pool_factory is not None:
-            pool = pool_factory.get_pool("database")
+        if database_pool is None and pool_factory is not None:
+            database_pool = pool_factory.get_pool("database")
 
-        if not isinstance(pool, DatabaseClientPool):
-            raise NotProvidedException(f"A {DatabaseClientPool!r} instance is required. Obtained: {pool}")
+        if database_pool is None and postgresql_pool is not None:
+            warnings.warn("'postgresql_pool' argument has been deprecated", DeprecationWarning)
+            database_pool = postgresql_pool
 
-        self._pool = pool
+        if not isinstance(database_pool, DatabaseClientPool):
+            raise NotProvidedException(f"A {DatabaseClientPool!r} instance is required. Obtained: {database_pool}")
+
+        self._pool = database_pool
 
     @property
     def database(self) -> str:
         """Get the database's database.
 
         :return: A ``str`` value.
         """
+        warnings.warn("'database' has been deprecated. Use 'pool.database' instead.", DeprecationWarning)
         return self.pool.database
 
     @property
@@ -70,6 +77,7 @@ def host(self) -> str:
 
         :return: A ``str`` value.
         """
+        warnings.warn("'host' has been deprecated. Use 'pool.host' instead.", DeprecationWarning)
         return self.pool.host
 
     @property
@@ -78,6 +86,7 @@ def port(self) -> int:
 
         :return: An ``int`` value.
         """
+        warnings.warn("'port' has been deprecated. Use 'pool.port' instead.", DeprecationWarning)
         return self.pool.port
 
     @property
@@ -86,6 +95,7 @@ def user(self) -> str:
 
         :return: A ``str`` value.
         """
+        warnings.warn("'user' has been deprecated. Use 'pool.user' instead.", DeprecationWarning)
         return self.pool.user
 
     @property
@@ -94,6 +104,7 @@ def password(self) -> str:
 
         :return: A ``str`` value.
         """
+        warnings.warn("'password' has been deprecated. Use 'pool.password' instead.", DeprecationWarning)
         return self.pool.password
 
     async def submit_query_and_fetchone(self, *args, **kwargs) -> tuple:

packages/core/minos-microservice-common/minos/common/pools.py

@@ -87,7 +87,7 @@ def _get_pool_cls(self, type_: str) -> type[Pool]:
         pool_cls = self._default_classes.get(type_)
 
         if pool_cls is None:
-            pool_cls = self._config.get_pools().get(type_)
+            pool_cls = self._config.get_pools().get("types", dict()).get(type_)
 
         if pool_cls is None:
             raise ValueError(

packages/core/minos-microservice-common/tests/test_common/test_database/test_abc.py

@@ -9,6 +9,7 @@
     NotProvidedException,
     PoolFactory,
     PostgreSqlMinosDatabase,
+    PostgreSqlPool,
 )
 from minos.common.testing import (
     PostgresAsyncTestCase,
@@ -35,32 +36,56 @@ async def test_constructor_with_pool_factory(self):
     async def test_constructor_raises(self):
         with self.assertRaises(NotProvidedException):
             # noinspection PyArgumentEqualDefault
-            DatabaseMixin(pool=None, pool_factory=None)
+            DatabaseMixin(database_pool=None, pool_factory=None)
+
+    async def test_constructor_with_postgresql_pool(self):
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            pool = PostgreSqlPool.from_config(self.config)
+            # noinspection PyTypeChecker,PyArgumentEqualDefault
+            database = DatabaseMixin(database_pool=None, pool_factory=None, postgresql_pool=pool)
+
+        self.assertEqual(pool, database.pool)
 
     def test_database(self):
         pool = DatabaseClientPool.from_config(self.config)
         database = DatabaseMixin(pool)
-        self.assertEqual(pool.database, database.database)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            # noinspection PyDeprecation
+            self.assertEqual(pool.database, database.database)
 
     def test_user(self):
         pool = DatabaseClientPool.from_config(self.config)
         database = DatabaseMixin(pool)
-        self.assertEqual(pool.user, database.user)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            # noinspection PyDeprecation
+            self.assertEqual(pool.user, database.user)
 
     def test_password(self):
         pool = DatabaseClientPool.from_config(self.config)
         database = DatabaseMixin(pool)
-        self.assertEqual(pool.password, database.password)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            # noinspection PyDeprecation
+            self.assertEqual(pool.password, database.password)
 
     def test_host(self):
         pool = DatabaseClientPool.from_config(self.config)
         database = DatabaseMixin(pool)
-        self.assertEqual(pool.host, database.host)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            # noinspection PyDeprecation
+            self.assertEqual(pool.host, database.host)
 
     def test_port(self):
         pool = DatabaseClientPool.from_config(self.config)
         database = DatabaseMixin(pool)
-        self.assertEqual(pool.port, database.port)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            # noinspection PyDeprecation
+            self.assertEqual(pool.port, database.port)
 
     async def test_pool(self):
         async with DatabaseMixin() as database: