mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 11:00:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Show better error message when recreating objects after renaming column fails

Browse Source 
When renaming a column of a table it might be necessary to recreate any
triggers nd indices referencing this column. There are several reasons
why this might fail and which are difficult to catch for us. For this
reason we just show an error message to the user in these cases so they
can fix the statements and run them manually. Previously to this commit
this error message contained a list of all SQL statements which were
tried to execute. So if you had 10 references to the table (not the
column!) and 7 of them could be recreated, the error message would still
have shown all 10 SQL statements. With this commit it only shows the
remaining 3 statements. This should make the dialog much easier to print
for large databases and makes it much easier for the user to grasp.
This commit is contained in:
Martin Kleusberg
2017-01-20 12:58:32 +01:00
parent dc934a7ec7
commit 0f0b18d427
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sqlitedb.cpp
View File

@@ -1080,7 +1080,7 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const sqlb::Table& tabl
}
// Save all indices, triggers and views associated with this table because SQLite deletes them when we drop the table in the next step
QString otherObjectsSql;
QStringList otherObjectsSql;
for(auto it=objMap.constBegin();it!=objMap.constEnd();++it)
{
// If this object references the table and it's not the table itself save it's SQL string
@@ -1096,11 +1096,11 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const sqlb::Table& tabl
if(idx.column(i)->name() == name)
idx.column(i)->setName(to->name());
}
otherObjectsSql += idx.sql() + "\n";
otherObjectsSql << idx.sql();
} else {
// If it's a view or a trigger we don't have any chance to corrections yet. Just store the statement as is and
// hope for the best.
otherObjectsSql += (*it).getsql().trimmed() + ";\n";
otherObjectsSql << (*it).getsql().trimmed() + ";";
}
}
}
@@ -1133,12 +1133,18 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const sqlb::Table& tabl
setPragma("defer_foreign_keys", foreignKeysOldSettings);
// Restore the saved triggers, views and indices
if(!executeMultiSQL(otherObjectsSql, true, true))
QString errored_sqls;
foreach(const QString& sql, otherObjectsSql)
{
if(!executeSQL(sql, true, true))
errored_sqls += sql + "\n";
}
if(!errored_sqls.isEmpty())
{
QMessageBox::information(0, qApp->applicationName(), tr("Restoring some of the objects associated with this table failed. "
"This is most likely because some column names changed. "
"Here's the SQL statement which you might want to fix and execute manually:\n\n")
+ otherObjectsSql);
+ errored_sqls);
}
// Release the savepoint - everything went fine