From b01fefc235266e8288b5a1ebf4b86dd1a2cba309 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Tue, 19 May 2020 21:57:04 -0700 Subject: [PATCH] Check for existing column names when importing --- plexpy/database.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plexpy/database.py b/plexpy/database.py index 400d4bfd..0a85f19c 100644 --- a/plexpy/database.py +++ b/plexpy/database.py @@ -114,11 +114,14 @@ def import_tautulli_db(database=None, method=None, backup=False): db.action('DELETE FROM sqlite_sequence WHERE name = ?', [table_name]) # Get the list of columns to import - columns = db.select('PRAGMA import_db.table_info({table})'.format(table=table_name)) + current_columns = db.select('PRAGMA table_info({table})'.format(table=table_name)) + current_columns = [c['name'] for c in current_columns] + import_columns = db.select('PRAGMA import_db.table_info({table})'.format(table=table_name)) + if method == 'merge': - import_columns = [c['name'] for c in columns if not c['pk']] + import_columns = [c['name'] for c in import_columns if c['name'] in current_columns and not c['pk']] else: - import_columns = [c['name'] for c in columns] + import_columns = [c['name'] for c in import_columns if c['name'] in current_columns] insert_columns = ', '.join(import_columns) table_columns[table_name] = insert_columns