From 3ee57277ff83fe0903d54ce7160ed08ccf06cb9e Mon Sep 17 00:00:00 2001 From: andrei Date: Mon, 21 Mar 2022 11:51:53 +0200 Subject: [PATCH] modified function. Added backend parameter for config function --- planetmint/backend/connection.py | 8 ++++---- planetmint/backend/utils.py | 4 ++-- tests/backend/tarantool/test_queries.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/planetmint/backend/connection.py b/planetmint/backend/connection.py index 68e9558..765b920 100644 --- a/planetmint/backend/connection.py +++ b/planetmint/backend/connection.py @@ -25,9 +25,9 @@ logger = logging.getLogger(__name__) def Connection(host: str = None, port: int = None, login: str = None, password: str = None, backend: str = None, **kwargs): backend = backend or get_planetmint_config_value("backend") if not kwargs.get("backend") else kwargs["backend"] - host = host or get_planetmint_config_value("host") if not kwargs.get("host") else kwargs["host"] - port = port or get_planetmint_config_value("port") if not kwargs.get("port") else kwargs["port"] - login = login or get_planetmint_config_value("login") if not kwargs.get("login") else kwargs["login"] + host = host or get_planetmint_config_value("host") if kwargs.get("host") is None else kwargs["host"] + port = port or get_planetmint_config_value("port") if not kwargs.get("port") is None else kwargs["port"] + login = login or get_planetmint_config_value("login") if not kwargs.get("login") is None else kwargs["login"] password = password or get_planetmint_config_value("password") if backend == "tarantool_db": @@ -35,4 +35,4 @@ def Connection(host: str = None, port: int = None, login: str = None, password: Class = getattr(import_module(modulepath), class_name) return Class(host=host, port=port, user=login, password=password) elif backend == "localmongodb": - pass + return "" diff --git a/planetmint/backend/utils.py b/planetmint/backend/utils.py index 4e6138a..afccc4f 100644 --- a/planetmint/backend/utils.py +++ b/planetmint/backend/utils.py @@ -31,8 +31,8 @@ def module_dispatch_registrar(module): return dispatch_wrapper -def get_planetmint_config_value(key, default_value=None): - return planetmint.config['database'].get(key, default_value) +def get_planetmint_config_value(key, default_value=None, backend=None): + return planetmint.config['database'].get(key, default_value) if backend is None else planetmint.config['database'][backend].get(key, default_value) def get_planetmint_config_value_or_key_error(key): diff --git a/tests/backend/tarantool/test_queries.py b/tests/backend/tarantool/test_queries.py index 4653e37..630140e 100644 --- a/tests/backend/tarantool/test_queries.py +++ b/tests/backend/tarantool/test_queries.py @@ -11,7 +11,7 @@ import pytest # # from planetmint.backend.connection import Connection, query from planetmint.backend.connection import Connection -conn = Connection().get_connection() +conn = Connection(backend="tarantool_db").get_connection() pytestmark = pytest.mark.bdb