Commit 25780fa3 authored by MacFarland's avatar MacFarland
Browse files

taking dbtype out of rename env vars

parent 6a5a4e9a

src/common/mixins/multiple.py

+15 −15
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class MultiDatabase: 
                    self.logger.warning(f"Skipping unknown Database type: {db_type}")



    @staticmethod

    def _rename_env_vars(db_type, config):

    def _rename_env_vars(config):

        def get_pref_value(config, keys, default=None):

            for key in keys:

                if key in config:
@@ -42,20 +42,20 @@ class MultiDatabase: 


        # Define mappings of old keys to new keys

        key_mappings = {

            "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",

            "host": "DATABASE_HOST",

            "dbHost": "DATABASE_HOST",

            "port": "DATABASE_PORT",

            "dbPort": "DATABASE_PORT",

            "db": "DATABASE_DB",

            "database": "DATABASE_DB",

            "dbName": "DATABASE_DB",

            "user": "DATABASE_USER",

            "dbUser": "DATABASE_USER",

            "pw": "DATABASE_PW",

            "password": "DATABASE_PW",

            "pass": "DATABASE_PW",

            "dbPass": "DATABASE_PW",

            "dbPassword": "DATABASE_PW",

        }



        # Rename keys and pop old keys if replacements exist