diff --git a/api/config.py b/api/config.py index 66775854a..9ea3d2c07 100644 --- a/api/config.py +++ b/api/config.py @@ -74,7 +74,6 @@ class Config(object): # ORACLE - LEGACY NRO NAMESDB NRO_USER = os.getenv('NRO_USER', '') - NRO_SCHEMA = os.getenv('NRO_SCHEMA', None) NRO_PASSWORD = os.getenv('NRO_PASSWORD', '') NRO_DB_NAME = os.getenv('NRO_DB_NAME', '') NRO_HOST = os.getenv('ORACLE_HOST', '') diff --git a/api/namex/VERSION.py b/api/namex/VERSION.py index e039f78cc..59abaf7f3 100644 --- a/api/namex/VERSION.py +++ b/api/namex/VERSION.py @@ -1,2 +1,2 @@ -__version__ = '1.1.59' +__version__ = '1.1.60' diff --git a/api/namex/services/nro/oracle_services.py b/api/namex/services/nro/oracle_services.py index 63029cdd1..ac99a99ba 100644 --- a/api/namex/services/nro/oracle_services.py +++ b/api/namex/services/nro/oracle_services.py @@ -179,12 +179,7 @@ def set_request_status_to_h(self, nr_num, examiner_username ): try: cursor = con.cursor() - # set the fqpn if the schema is required, which is set y the deployer/configurator - # if the environment variable is missing from the Flask Config, then skip setting it. - if current_app.config.get('NRO_SCHEMA'): - func_name = '{}.nro_datapump_pkg.name_examination_func'.format(current_app.config.get('NRO_SCHEMA')) - else: - func_name = 'nro_datapump_pkg.name_examination_func' + func_name = 'nro_datapump_pkg.name_examination_func' func_vars = [nr_num, # p_nr_number 'H', # p_status diff --git a/jobs/consumed-datafix/config.py b/jobs/consumed-datafix/config.py index ed3f0bce2..d912bc91e 100644 --- a/jobs/consumed-datafix/config.py +++ b/jobs/consumed-datafix/config.py @@ -32,7 +32,6 @@ class BaseConfig(object): ) NRO_USER = os.getenv('NRO_USER', '') - NRO_SCHEMA = os.getenv('NRO_SCHEMA', None) NRO_PASSWORD = os.getenv('NRO_PASSWORD', '') NRO_DB_NAME = os.getenv('NRO_DB_NAME', '') NRO_HOST = os.getenv('NRO_HOST', '') diff --git a/jobs/corp-check/config.py b/jobs/corp-check/config.py index ed3f0bce2..d912bc91e 100644 --- a/jobs/corp-check/config.py +++ b/jobs/corp-check/config.py @@ -32,7 +32,6 @@ class BaseConfig(object): ) NRO_USER = os.getenv('NRO_USER', '') - NRO_SCHEMA = os.getenv('NRO_SCHEMA', None) NRO_PASSWORD = os.getenv('NRO_PASSWORD', '') NRO_DB_NAME = os.getenv('NRO_DB_NAME', '') NRO_HOST = os.getenv('NRO_HOST', '') diff --git a/jobs/missing-coprs/config.py b/jobs/missing-coprs/config.py index ed3f0bce2..d912bc91e 100644 --- a/jobs/missing-coprs/config.py +++ b/jobs/missing-coprs/config.py @@ -32,7 +32,6 @@ class BaseConfig(object): ) NRO_USER = os.getenv('NRO_USER', '') - NRO_SCHEMA = os.getenv('NRO_SCHEMA', None) NRO_PASSWORD = os.getenv('NRO_PASSWORD', '') NRO_DB_NAME = os.getenv('NRO_DB_NAME', '') NRO_HOST = os.getenv('NRO_HOST', '') diff --git a/jobs/nro-extractor/config.py b/jobs/nro-extractor/config.py index d1ab4f6cc..f20b349a0 100644 --- a/jobs/nro-extractor/config.py +++ b/jobs/nro-extractor/config.py @@ -32,7 +32,6 @@ class BaseConfig(object): ) NRO_USER = os.getenv('NRO_USER', '') - NRO_SCHEMA = os.getenv('NRO_SCHEMA', None) NRO_PASSWORD = os.getenv('NRO_PASSWORD', '') NRO_DB_NAME = os.getenv('NRO_DB_NAME', '') NRO_HOST = os.getenv('NRO_HOST', '') diff --git a/services/namex-pay/config.py b/services/namex-pay/config.py index a9d69f226..ad2a323b3 100644 --- a/services/namex-pay/config.py +++ b/services/namex-pay/config.py @@ -76,7 +76,6 @@ class Config(): # pylint: disable=too-few-public-methods # ORACLE - LEGACY NRO NAMESDB NRO_USER = os.getenv('NRO_USER', '') - NRO_SCHEMA = os.getenv('NRO_SCHEMA', None) NRO_PASSWORD = os.getenv('NRO_PASSWORD', '') NRO_DB_NAME = os.getenv('NRO_DB_NAME', '') NRO_HOST = os.getenv('ORACLE_HOST', '')