Commit 67f9261a authored by Huihui, Jonathan's avatar Huihui, Jonathan
Browse files

fix ordering in function call

parent af3f2663

src/common/mixins/mssql.py

+5 −5
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ class MSSQLMixin(): 
    """Provides a convenient API-like interface to Microsoft SQL databases.

    The database object is the interface to the database.

    """

    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_DB = cme('DATABASE_DB_MS', 'CommonDB', 'DATABASE_DB')

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

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

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

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

    

    def __del__(self):

        """ Close the connection to database.

src/common/mixins/postgres.py

+7 −7
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ class PostgresMixin(): 
       operating system variable:

           - DATABASE_SEARCH_PATH

    """

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

    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_DB = cme('DATABASE_DB_PG', 'postgres', 'DATABASE_DB')

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

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

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

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

    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_SCHEMA = cme('DATABASE_SCHEMA_PG', 'public', 'DATABASE_SCHEMA')

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

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



    # define a URI string if URI is perferred to connect