Commit 98b2196d authored by Huihui, Jonathan's avatar Huihui, Jonathan
Browse files

add cme to env variable search instead of ce

parent 73f6a73a

src/common/mixins/postgres.py

+10 −10
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# -*- coding: utf-8 -*-

"""Allow opening with a psycopg2 connection."""

import psycopg2

from common.env import check_environment as ce

from common.env import check_multi_environment as cme



class PostgresMixin():

    """Serve common connection method for postgres.
@@ -11,15 +11,15 @@ class PostgresMixin(): 
       operating system variable:

           - DATABASE_SEARCH_PATH

    """

    DEFAULT_DB = ce('DATABASE_DB_PG', 'postgres')

    DEFAULT_USER = ce('DATABASE_USER_PG', 'postgres')

    DEFAULT_PW = ce('DATABASE_PW_PG', 'postgres')

    DEFAULT_HOST = ce('DATABASE_HOST_PG', "localhost")

    DEFAULT_PORT = int(ce('DATABASE_PORT_PG', 5432))

    DEFAULT_TIMEOUT = ce('DATABASE_TIMEOUT', 60)

    DEFAULT_SCHEMA = ce('DATABASE_SCHEMA_PG', 'public')

    DEFAULT_ENGINE = ce('DATABASE_ENGINE_PG', 'postgresql')

    DEFAULT_SEARCH_PATH = ce('DATABASE_SEARCH_PATH', 'public')

    DEFAULT_DB = cme('DATABASE_DB', 'DATABASE_DB_PG', 'postgres')

    DEFAULT_USER = cme('DATABASE_USER_PG', 'postgres')

    DEFAULT_PW = cme('DATABASE_PW_PG', 'postgres')

    DEFAULT_HOST = cme('DATABASE_HOST_PG', "localhost")

    DEFAULT_PORT = int(cme('DATABASE_PORT_PG', 5432))

    DEFAULT_TIMEOUT = cme('DATABASE_TIMEOUT', 60)

    DEFAULT_SCHEMA = cme('DATABASE_SCHEMA_PG', 'public')

    DEFAULT_ENGINE = cme('DATABASE_ENGINE_PG', 'postgresql')

    DEFAULT_SEARCH_PATH = cme('DATABASE_SEARCH_PATH', 'public')



    # define a URI string if URI is perferred to connect

    DEFAULT_URI = (DEFAULT_ENGINE + '://' +