Commit 9403483b authored by MacFarland's avatar MacFarland
Browse files

moving database import

parent f4f3aae7

src/common/mixins/multiple.py

+15 −26
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ from uuid import uuid4 
from concurrent.futures import ThreadPoolExecutor



from common.env import mock_env_vars

from common.database import Database

from common.logz import create_logger
@@ -22,6 +21,7 @@ class MultiDatabase: 
            self.logger.debug(f"Creating {db_type} database with id {db_id}")

            config = self._rename_env_vars(db_type, config)

            with mock_env_vars(config):

                from common.database import Database

                mixin = self._get_mixin_for_type(db_type=db_type)

                if mixin:

                    db_instance = type(
@@ -39,35 +39,24 @@ class MultiDatabase: 
                    return config[key]

            return default



        suffix = None

        if db_type.startswith("postgres") or db_type.startswith("pg"):

            suffix = 'PG'

        elif db_type.startswith("mssql"):

            suffix = 'MS'

        elif db_type.startswith("influx"):

            suffix = 'IN'



        if suffix is None:

            return config



        new_config = {}



        # Define mappings of old keys to new keys

        key_mappings = {

            'host': f'DATABASE_HOST_{suffix}',

            'dbHost': f'DATABASE_HOST_{suffix}',

            'port': f'DATABASE_PORT_{suffix}',

            'dbPort': f'DATABASE_PORT_{suffix}',

            'db': f'DATABASE_DB_{suffix}',

            'database': f'DATABASE_DB_{suffix}',

            'dbName': f'DATABASE_DB_{suffix}',

            'user': f'DATABASE_USER_{suffix}',

            'dbUser': f'DATABASE_USER_{suffix}',

            'pw': f'DATABASE_PW_{suffix}',

            'password': f'DATABASE_PW_{suffix}',

            'pass': f'DATABASE_PW_{suffix}',

            'dbPass': f'DATABASE_PW_{suffix}',

            'dbPassword': f'DATABASE_PW_{suffix}',

            'host': f'DATABASE_HOST',

            'dbHost': f'DATABASE_HOST',

            'port': f'DATABASE_PORT',

            'dbPort': f'DATABASE_PORT',

            'db': f'DATABASE_DB',

            'database': f'DATABASE_DB',

            'dbName': f'DATABASE_DB',

            'user': f'DATABASE_USER',

            'dbUser': f'DATABASE_USER',

            'pw': f'DATABASE_PW',

            'password': f'DATABASE_PW',

            'pass': f'DATABASE_PW',

            'dbPass': f'DATABASE_PW',

            'dbPassword': f'DATABASE_PW',

        }



        # Rename keys and pop old keys if replacements exist

src/pyproject.toml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta" 
[project]

name = "common_package"

authors = [   

    {name = "Josh Grant", email = "grantjn@ornl.gov"},

    {name = "Joshua Grant", email = "grantjn@ornl.gov"},

    {name = "Jonathan Huihui", email = "huihuijk@ornl.gov"},

    {name = "Bhaskar Bishnoi", email = "bishnoib@ornl.gov"},

    {name = "Kyle Medlen", email = "medlenwk@ornl.gov"},