1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00

CLI load into existing table gracefully - PR Change 2

- Add message for other errors raised by the same exception that handles
the "table already exists" error.
- Add error message for any other unexpected exception thrown when
trying to create a table.
This commit is contained in:
rluzuriaga 2020-04-06 12:55:05 -07:00
parent d8a2c176b5
commit 149e07a957

View file

@ -207,8 +207,20 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
if "already exists" in str(error.orig):
print("\n\nERROR: The table '{}' already exists in the database. "
"Did you mean to use 'pokedex load -D'".format(table))
sys.exit(1)
# If it happens to be some other error but raised by the same
# exception, then an unexpected error message is sent with
# the error included
else:
print("\n\n UNEXPECTED ERROR: ", error)
sys.exit(1)
# In case any other exception not specified above is raised, an
# unexpected exception error is sent with the error included.
except Exception as error:
print("\n\nUNEXPECTED Error: ", error)
sys.exit(1)
print_status('%s/%s' % (n, len(table_objs)))
print_done()