Loading RELEASE_NOTES.md +3 −0 Original line number Diff line number Diff line # VERSION 0.1.19 - Fix bugs in postgres mixin introduced by 0.1.18 # VERSION 0.1.18 - Updated environment varables to coalesce from `DATABASE_*` to `PG_*` Loading src/common/mixins/postgres.py +6 −13 Original line number Diff line number Diff line Loading @@ -15,19 +15,12 @@ class PostgresMixin(): """ DEFAULT_DB = ce('DATABASE_DB_PG', ce('DATABASE_DB', ce('PG_DATABASE', 'postgres'))) DEFAULT_USER = ce('DATABASE_USER_PG', ce('DATABASE_USER', ce('PG_USER', 'postgres'))) cme('DATABASE_USER_PG', 'postgres', 'DATABASE_USER', 'postgres') DEFAULT_PW = cme('DATABASE_PW_PG', 'postgres', 'DATABASE_PW', 'postgres') DEFAULT_HOST = cme('DATABASE_HOST_PG', "localhost", 'DATABASE_HOST', "localhost") DEFAULT_PORT = int(cme('DATABASE_PORT_PG', 5432, 'DATABASE_PORT', 5432)) DEFAULT_TIMEOUT = ce('DATABASE_TIMEOUT', 60) DEFAULT_SCHEMA = cme('DATABASE_SCHEMA_PG', 'public', 'DATABASE_SCHEMA', 'public') DEFAULT_ENGINE = cme('DATABASE_ENGINE_PG', 'postgresql', 'DATABASE_ENGINE', 'postgresql') DEFAULT_PW = ce('DATABASE_PW_PG',ce('DATABASE_PW',ce('PG_PASSWORD','postgres'))) DEFAULT_HOST = ce('DATABASE_HOST_PG',ce('DATABASE_HOST', ce('PG_HOST','localhost'))) DEFAULT_PORT = int(ce('DATABASE_PORT_PG',ce('DATABASE_PORT',ce('PG_PORT',5432)))) DEFAULT_TIMEOUT = ce('DATABASE_TIMEOUT', ce('PG_TIMEOUT', 60)) DEFAULT_SCHEMA = ce('DATABASE_SCHEMA_PG',ce('DATABASE_SCHEMA',ce('PG_SCHEMA','public'))) DEFAULT_ENGINE = ce('DATABASE_ENGINE_PG',ce('DATABASE_ENGINE','postgresql')) DEFAULT_SEARCH_PATH = ce('DATABASE_SEARCH_PATH', 'public') # define a URI string if URI is perferred to connect Loading src/scripts/test-db-conn +5 −0 Original line number Diff line number Diff line #!/usr/bin/env bash # -*- coding: utf-8 -*- # eval $(cat db_env) ./test-db-conn PG_DATABASE=postgres PG_HOST=postgres PG_PORT=5432 PG_USER=postgres PG_PASSWORD=postgres MAX_RETRIES=60 while :; do Loading Loading
RELEASE_NOTES.md +3 −0 Original line number Diff line number Diff line # VERSION 0.1.19 - Fix bugs in postgres mixin introduced by 0.1.18 # VERSION 0.1.18 - Updated environment varables to coalesce from `DATABASE_*` to `PG_*` Loading
src/common/mixins/postgres.py +6 −13 Original line number Diff line number Diff line Loading @@ -15,19 +15,12 @@ class PostgresMixin(): """ DEFAULT_DB = ce('DATABASE_DB_PG', ce('DATABASE_DB', ce('PG_DATABASE', 'postgres'))) DEFAULT_USER = ce('DATABASE_USER_PG', ce('DATABASE_USER', ce('PG_USER', 'postgres'))) cme('DATABASE_USER_PG', 'postgres', 'DATABASE_USER', 'postgres') DEFAULT_PW = cme('DATABASE_PW_PG', 'postgres', 'DATABASE_PW', 'postgres') DEFAULT_HOST = cme('DATABASE_HOST_PG', "localhost", 'DATABASE_HOST', "localhost") DEFAULT_PORT = int(cme('DATABASE_PORT_PG', 5432, 'DATABASE_PORT', 5432)) DEFAULT_TIMEOUT = ce('DATABASE_TIMEOUT', 60) DEFAULT_SCHEMA = cme('DATABASE_SCHEMA_PG', 'public', 'DATABASE_SCHEMA', 'public') DEFAULT_ENGINE = cme('DATABASE_ENGINE_PG', 'postgresql', 'DATABASE_ENGINE', 'postgresql') DEFAULT_PW = ce('DATABASE_PW_PG',ce('DATABASE_PW',ce('PG_PASSWORD','postgres'))) DEFAULT_HOST = ce('DATABASE_HOST_PG',ce('DATABASE_HOST', ce('PG_HOST','localhost'))) DEFAULT_PORT = int(ce('DATABASE_PORT_PG',ce('DATABASE_PORT',ce('PG_PORT',5432)))) DEFAULT_TIMEOUT = ce('DATABASE_TIMEOUT', ce('PG_TIMEOUT', 60)) DEFAULT_SCHEMA = ce('DATABASE_SCHEMA_PG',ce('DATABASE_SCHEMA',ce('PG_SCHEMA','public'))) DEFAULT_ENGINE = ce('DATABASE_ENGINE_PG',ce('DATABASE_ENGINE','postgresql')) DEFAULT_SEARCH_PATH = ce('DATABASE_SEARCH_PATH', 'public') # define a URI string if URI is perferred to connect Loading
src/scripts/test-db-conn +5 −0 Original line number Diff line number Diff line #!/usr/bin/env bash # -*- coding: utf-8 -*- # eval $(cat db_env) ./test-db-conn PG_DATABASE=postgres PG_HOST=postgres PG_PORT=5432 PG_USER=postgres PG_PASSWORD=postgres MAX_RETRIES=60 while :; do Loading