Commit 4d30dec7 authored by Huihui, Jonathan's avatar Huihui, Jonathan
Browse files

flesh out cme method

parent 8e1fa399

src/common/mixins/mssql.py

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

"""Allow opening with a pymssql connection."""

from common.env import check_environment as ce

from common.env import check_multi_environment as cme

import pymssql

import traceback

import logging
@@ -11,12 +12,12 @@ class MSSQLMixin(): 
    """Provides a convenient API-like interface to Microsoft SQL databases.

    The database object is the interface to the database.

    """

    DEFAULT_DB = ce('DATABASE_DB_MS', 'CommonDB')

    DEFAULT_USER = ce('DATABASE_USER_MS', 'sa')

    DEFAULT_PW = ce('DATABASE_PW_MS', '5nowDog5')

    DEFAULT_HOST = ce('DATABASE_HOST_MS', "mssql")

    DEFAULT_PORT = int(ce('DATABASE_PORT_MS', 1433))

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

    DEFAULT_DB = cme('DATABASE_DB', 'DATABASE_DB_MS', 'CommonDB')

    DEFAULT_USER = cme('DATABASE_USER', 'DATABASE_USER_MS', 'sa')

    DEFAULT_PW = cme('DATABASE_PW', 'DATABASE_PW_MS', '5nowDog5')

    DEFAULT_HOST = cme('DATABASE_HOST', 'DATABASE_HOST_MS', "mssql")

    DEFAULT_PORT = int(cme('DATABASE_PORT', 'DATABASE_PORT_MS', 1433))

    DEFAULT_SCHEMA = cme('DATABASE_SCHEMA', 'DATABASE_SCHEMA_MS', 'public')

    

    def __del__(self):

        """ Close the connection to database.

src/common/mixins/postgres.py

+9 −9
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
"""Allow opening with a psycopg2 connection."""

import psycopg2

from common.env import check_multi_environment as cme



from common.env import check_environment as ce

class PostgresMixin():

    """Serve common connection method for postgres.
@@ -12,14 +12,14 @@ class PostgresMixin(): 
           - DATABASE_SEARCH_PATH

    """

    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')

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

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

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

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

    DEFAULT_TIMEOUT = ce('DATABASE_TIMEOUT', 60)

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

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

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



    # define a URI string if URI is perferred to connect

    DEFAULT_URI = (DEFAULT_ENGINE + '://' +