Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-11-24 22:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

modified function. Added backend parameter for config function

Browse Source
This commit is contained in:
andrei 2022-03-21 11:51:53 +02:00
parent a6125f9b1f
commit 3ee57277ff
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
planetmint/backend/connection.py
View File

@ -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): 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"] 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"] 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") else kwargs["port"] 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") else kwargs["login"] 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") password = password or get_planetmint_config_value("password")
if backend == "tarantool_db": 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) Class = getattr(import_module(modulepath), class_name)
return Class(host=host, port=port, user=login, password=password) return Class(host=host, port=port, user=login, password=password)
elif backend == "localmongodb": elif backend == "localmongodb":
pass return ""

4
planetmint/backend/utils.py
View File

@ -31,8 +31,8 @@ def module_dispatch_registrar(module):
return dispatch_wrapper return dispatch_wrapper
def get_planetmint_config_value(key, default_value=None): def get_planetmint_config_value(key, default_value=None, backend=None):
return planetmint.config['database'].get(key, default_value) 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): def get_planetmint_config_value_or_key_error(key):

2
tests/backend/tarantool/test_queries.py
View File

@ -11,7 +11,7 @@ import pytest
# # from planetmint.backend.connection import Connection, query # # from planetmint.backend.connection import Connection, query
from planetmint.backend.connection import Connection from planetmint.backend.connection import Connection
conn = Connection().get_connection() conn = Connection(backend="tarantool_db").get_connection()
pytestmark = pytest.mark.bdb pytestmark = pytest.mark.bdb