Skip to content

Commit fcd13bc

Browse files
dkubekRezney
authored andcommitted
Fix broken queries on rerun
After the update to the leapp db table names, the rerun command fails. This commit fixes the issue by using the current schema.
1 parent 0b00cc6 commit fcd13bc

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

leapp/utils/audit/contextclone.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ def _dup_audit(db, message, data_source, newcontext, oldcontext):
7070
return lookup
7171

7272

73-
def _dup_metadata(db, newcontext, oldcontext):
74-
for row in _fetch_table_for_context(db, 'metadata', oldcontext):
75-
# id context kind name metadata
76-
row_id, kind, name, metadata = _row_tuple(row, 'id', 'kind', 'name', 'metadata')
73+
def _dup_entity(db, newcontext, oldcontext):
74+
for row in _fetch_table_for_context(db, 'entity', oldcontext):
75+
# id context kind name metadata_hash
76+
row_id, kind, name, metadata_hash = _row_tuple(row, 'id', 'kind', 'name', 'metadata_hash')
7777

7878
db.execute(
79-
'INSERT INTO metadata (context, kind, name, metadata) VALUES(?, ?, ?, ?)',
80-
(newcontext, kind, name, metadata))
79+
'INSERT INTO entity (context, kind, name, metadata_hash) VALUES(?, ?, ?, ?)',
80+
(newcontext, kind, name, metadata_hash))
8181

8282

8383
def _dup_dialog(db, data_source, newcontext, oldcontext):
@@ -102,5 +102,5 @@ def clone_context(oldcontext, newcontext, use_db=None):
102102
message = _dup_message(db=db, data_source=data_source, newcontext=newcontext, oldcontext=oldcontext)
103103
# Last clone message entries and use the lookup table generated by the data_source and message duplications
104104
_dup_audit(db=db, data_source=data_source, message=message, newcontext=newcontext, oldcontext=oldcontext)
105-
_dup_metadata(db=db, oldcontext=oldcontext, newcontext=newcontext)
105+
_dup_entity(db=db, oldcontext=oldcontext, newcontext=newcontext)
106106
_dup_dialog(db=db, data_source=data_source, oldcontext=oldcontext, newcontext=newcontext)

0 commit comments

Comments
 (0)