From 74ce7e1d04c3dc5dc27ca3780d7772279ef3a915 Mon Sep 17 00:00:00 2001 From: Matias Carrasco Kind Date: Tue, 23 May 2017 13:11:31 -0500 Subject: [PATCH 1/6] migration changes newsci --> dessci, dessci --> oldsci --- easyaccess/config_ea.py | 14 +++++++------- easyaccess/eaparser.py | 4 ++-- easyaccess/easyaccess.py | 28 ++++++++++++++-------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/easyaccess/config_ea.py b/easyaccess/config_ea.py index 1a6bb10..8e7bdd0 100644 --- a/easyaccess/config_ea.py +++ b/easyaccess/config_ea.py @@ -23,7 +23,7 @@ configcomment = """# # Easyaccess default parameters # -# database : Default is dessci, change to desoper, destest and others +# database : Default is dessci, change to desoper, destest, oldsci and others # Make sure the db-"database" section is in the .desservices.ini # editor : Default editor to open from inside easyaccess if $EDITOR is not set # prefetch : Prefetch number of rows to get from oracle (not the number of total rows) @@ -165,10 +165,10 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None): if not db[:3] == 'db-': db = 'db-' + db - if db == 'db-dessci': + if db == 'db-oldsci': db_alter = 'db-desoper' elif db == 'db-desoper': - db_alter = 'db-dessci' + db_alter = 'db-oldsci' else: db_alter = None config = configparser.ConfigParser() @@ -183,11 +183,11 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None): if verbose: print() - databases = ['db-desoper', 'db-dessci', 'db-destest', 'db-newsci'] # most used ones anyways + databases = ['db-desoper', 'db-dessci', 'db-destest', 'db-oldsci'] # most used ones anyways if db not in databases and not config.has_section(db): check_db = input( - '\nDB entered is not dessci, desoper, destest or newsci ' + '\nDB entered is not dessci, desoper, destest or oldsci ' 'or in DES_SERVICE file, continue anyway [y]/n\n') if check_db in ('n', 'N', 'no', 'No', 'NO'): sys.exit(0) @@ -196,7 +196,7 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None): if verbose: print('\nAdding section %s to des_service file\n' % db) configwrite = True - if db == 'db-newsci': + if db == 'db-dessci': kwargs = {'host': server_2, 'port': port_n, 'service_name': 'dessci'} else: kwargs = {'host': server_n, 'port': port_n, 'service_name': db[3:]} @@ -254,7 +254,7 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None): if not config.has_option(db, 'passwd'): configwrite = True config.set(db, 'passwd', pw1) - if db == 'db-newsci': + if db == 'db-dessci': if not config.has_option(db, 'name'): configwrite = True config.set(db, 'name', 'dessci') diff --git a/easyaccess/eaparser.py b/easyaccess/eaparser.py index 30c79d9..1f8cb27 100644 --- a/easyaccess/eaparser.py +++ b/easyaccess/eaparser.py @@ -43,8 +43,8 @@ def get_args(config_file): parser.add_argument("--memsize", dest='memsize', type=int, default=None, help=" Size of chunk to be read at a time in Mb. Use with --load_table or " "--append_table") - parser.add_argument("-s", "--db", dest='db', choices=['dessci', 'desoper', 'destest', 'newsci'], - help="Override database name [dessci,desoper,destest,newsci]") + parser.add_argument("-s", "--db", dest='db', choices=['dessci', 'desoper', 'destest', 'oldsci'], + help="Override database name [dessci,desoper,destest,oldsci]") parser.add_argument("-q", "--quiet", action="store_true", dest='quiet', help="Silence initialization, no loading bar") parser.add_argument("-u", "--user", dest='user') diff --git a/easyaccess/easyaccess.py b/easyaccess/easyaccess.py index 3203124..6dfbe0d 100755 --- a/easyaccess/easyaccess.py +++ b/easyaccess/easyaccess.py @@ -939,7 +939,7 @@ def query_results(self, query): def get_tables_names(self): - if self.dbname in ('dessci', 'desoper', 'destest', 'newsci'): + if self.dbname in ('dessci', 'desoper', 'destest', 'oldsci'): query = """ select table_name from DES_ADMIN.CACHE_TABLES union select table_name from user_tables @@ -964,7 +964,7 @@ def get_tables_names_user(self, user): user.upper(), "cyan", self.ct)) print(tnames) else: - if self.dbname in ('dessci', 'desoper'): + if self.dbname in ('dessci', 'desoper', 'oldsci'): query = """ select count(username) as cc from des_users where upper(username) = upper('%s')""" % user @@ -982,9 +982,9 @@ def get_tables_names_user(self, user): user.upper(), 'cyan', self.ct)) def get_userlist(self): - if self.dbname in ('dessci', 'desoper'): + if self.dbname in ('dessci', 'desoper', 'oldsci'): query = 'select distinct username from des_users order by username' - if self.dbname in ('destest', 'newsci'): + if self.dbname in ('destest'): query = 'select distinct username from dba_users order by username' temp = self.cur.execute(query) tnames = pd.DataFrame(temp.fetchall()) @@ -1380,7 +1380,7 @@ def do_execproc(self, line): def do_set_password(self, arg): """ - DB:Set a new password on this and all other DES instances (DESSCI, DESOPER) + DB:Set a new password on this DES instance Usage: set_password """ @@ -1403,9 +1403,9 @@ def do_set_password(self, arg): self.query_and_print(query, print_time=False, suc_arg=confirm) self.desconfig.set('db-'+self.dbname, 'passwd', pw1) config_mod.write_desconfig(desfile, self.desconfig) - if self.dbname not in ('dessci', 'desoper'): + if self.dbname not in ('oldsci', 'desoper'): return - dbases = ['DESSCI', 'DESOPER'] + dbases = ['OLDSCI', 'DESOPER'] for db in dbases: kwargs = {'host': self.dbhost, 'port': self.port, 'service_name': self.service_name} dsn = cx_Oracle.makedsn(**kwargs) @@ -1418,7 +1418,7 @@ def do_set_password(self, arg): temp_con.commit() temp_cur.close() temp_con.close() - self.desconfig.set('db-dessci', 'passwd', pw1) + self.desconfig.set('db-oldsci', 'passwd', pw1) self.desconfig.set('db-desoper', 'passwd', pw1) config_mod.write_desconfig(desfile, self.desconfig) except: @@ -1462,7 +1462,7 @@ def do_show_db(self, arg): def do_change_db(self, line): """ - DB: Change to another database, namely dessci, desoper or destest + DB: Change to another database, namely dessci, desoper, destest or oldsci Usage: change_db DB # Changes to DB, it does not refresh metadata, e.g.: change_db desoper @@ -1472,7 +1472,7 @@ def do_change_db(self, line): return self.do_help('change_db') line = " ".join(line.split()) key_db = line.split()[0] - if key_db in ('dessci', 'desoper', 'destest', 'newsci'): + if key_db in ('dessci', 'desoper', 'destest', 'oldsci'): if key_db == self.dbname: print(colored("Already connected to : %s" % key_db, "green", self.ct)) return @@ -1523,7 +1523,7 @@ def do_change_db(self, line): return def complete_change_db(self, text, line, start_index, end_index): - options_db = ['desoper', 'dessci', 'destest', 'newsci'] + options_db = ['desoper', 'dessci', 'destest', 'oldsci'] if text: return [option for option in options_db if option.startswith(text.lower())] else: @@ -1538,7 +1538,7 @@ def do_whoami(self, arg): # It might be useful to print user roles as well # select GRANTED_ROLE from USER_ROLE_PRIVS - if self.dbname in ('dessci', 'desoper'): + if self.dbname in ('dessci', 'desoper', 'oldsci'): sql_getUserDetails = """ select d.username, d.email, d.firstname as first, d.lastname as last, trunc(sysdate-t.ptime,0)||' days ago' last_passwd_change, @@ -1595,7 +1595,7 @@ def do_find_user(self, line): return self.do_help('find_user') line = " ".join(line.split()) keys = line.split() - if self.dbname in ('dessci', 'desoper'): + if self.dbname in ('dessci', 'desoper', 'oldsci'): query = 'select * from des_users where ' if self.dbname in ('destest'): query = 'select * from dba_users where ' @@ -2555,7 +2555,7 @@ def __init__(self, section='', user=None, passwd=None, quiet=False, refresh=Fals Parameters: ----------- - section : DB connection : dessci, desoper, destest, newsci + section : DB connection : dessci, desoper, destest, oldsci user : Manualy use username passwd : password for username (if not enter is prompted) quiet : Don't print much From 55cf2d1d51448eab4253f97b5d1cd3b339ee9534 Mon Sep 17 00:00:00 2001 From: Matias Carrasco Kind Date: Tue, 23 May 2017 13:14:00 -0500 Subject: [PATCH 2/6] version 74ce7e1 --- easyaccess/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easyaccess/version.py b/easyaccess/version.py index f30aafe..1d5cabc 100644 --- a/easyaccess/version.py +++ b/easyaccess/version.py @@ -24,7 +24,7 @@ def last_pip_version(): return sorted(uploads, key=lambda x: x[1])[-1][0] -version_tag = (1, 4, 1, 'dev-e5fc75') +version_tag = (1, 4, 1, 'dev-74ce7e1') __version__ = '.'.join(map(str, version_tag[:3])) if len(version_tag) > 3: From c3d80ad30d7223f9dcea18af3cc43a7d087d871d Mon Sep 17 00:00:00 2001 From: Matias Carrasco Kind Date: Tue, 23 May 2017 13:29:39 -0500 Subject: [PATCH 3/6] fix deprecated message --- easyaccess/config_ea.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easyaccess/config_ea.py b/easyaccess/config_ea.py index 8e7bdd0..4eff10f 100644 --- a/easyaccess/config_ea.py +++ b/easyaccess/config_ea.py @@ -213,7 +213,7 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None): except: (type, value, traceback) = sys.exc_info() print() - if value.message.code == 28001: + if value.args[0].code == 28001: print("ORA-28001: the password has expired or cannot be the default one") print("Need to create a new password\n") password = pw1 @@ -236,7 +236,7 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None): print('\n Check your credentials and/or database access\n') sys.exit(0) print(value) - if value.message.code == 1017: + if value.args[0].code == 1017: pass else: sys.exit(0) From b83844a262b40e204eaa30b64a639ee5e9a7cc7c Mon Sep 17 00:00:00 2001 From: Matias Carrasco Kind Date: Tue, 23 May 2017 13:30:00 -0500 Subject: [PATCH 4/6] version c3d80ad --- easyaccess/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easyaccess/version.py b/easyaccess/version.py index 1d5cabc..e839a6a 100644 --- a/easyaccess/version.py +++ b/easyaccess/version.py @@ -24,7 +24,7 @@ def last_pip_version(): return sorted(uploads, key=lambda x: x[1])[-1][0] -version_tag = (1, 4, 1, 'dev-74ce7e1') +version_tag = (1, 4, 1, 'dev-c3d80ad') __version__ = '.'.join(map(str, version_tag[:3])) if len(version_tag) > 3: From d5cc31b15f55a941f3c9553b7de4c4f34e523939 Mon Sep 17 00:00:00 2001 From: Matias Carrasco Kind Date: Tue, 23 May 2017 14:13:04 -0500 Subject: [PATCH 5/6] fix minor bugs --- easyaccess/config_ea.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/easyaccess/config_ea.py b/easyaccess/config_ea.py index 4eff10f..56c3ea8 100644 --- a/easyaccess/config_ea.py +++ b/easyaccess/config_ea.py @@ -198,6 +198,8 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None): configwrite = True if db == 'db-dessci': kwargs = {'host': server_2, 'port': port_n, 'service_name': 'dessci'} + elif db == 'db-oldsci': + kwargs = {'host': server_n, 'port': port_n, 'service_name': 'dessci'} else: kwargs = {'host': server_n, 'port': port_n, 'service_name': db[3:]} dsn = cx_Oracle.makedsn(**kwargs) @@ -261,6 +263,13 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None): if not config.has_option(db, 'server'): configwrite = True config.set(db, 'server', server_2) + if db == 'db-oldsci': + if not config.has_option(db, 'name'): + configwrite = True + config.set(db, 'name', 'dessci') + if not config.has_option(db, 'server'): + configwrite = True + config.set(db, 'server', server_n) else: if not config.has_option(db, 'name'): configwrite = True From 8553d475126c19d2de54fb2cf43bfa0e8bd72a37 Mon Sep 17 00:00:00 2001 From: Matias Carrasco Kind Date: Tue, 23 May 2017 14:13:29 -0500 Subject: [PATCH 6/6] version d5cc31b --- easyaccess/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easyaccess/version.py b/easyaccess/version.py index e839a6a..29cf5a6 100644 --- a/easyaccess/version.py +++ b/easyaccess/version.py @@ -24,7 +24,7 @@ def last_pip_version(): return sorted(uploads, key=lambda x: x[1])[-1][0] -version_tag = (1, 4, 1, 'dev-c3d80ad') +version_tag = (1, 4, 1, 'dev-d5cc31b') __version__ = '.'.join(map(str, version_tag[:3])) if len(version_tag) > 3: