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

Merge pull request #363 from schdub/issue362

Browse Source 
fix: renameColumn 'no error' after errors
This commit is contained in:
Oleg Polivets
2015-06-20 23:39:09 +03:00
parent 6b8f57d484 d4ce11b8ce
commit 3f29599ce8
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/sqlitedb.cpp
View File

@@ -931,18 +931,20 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const QString& name, sq
// Create the new table
if(!executeSQL(newSchema.sql()))
{
lastErrorMessage = tr("renameColumn: creating new table failed. DB says: %1").arg(lastErrorMessage);
qWarning() << lastErrorMessage;
QString error(tr("renameColumn: creating new table failed. DB says: %1").arg(lastErrorMessage));
qWarning() << error;
executeSQL("ROLLBACK TO SAVEPOINT sqlitebrowser_rename_column;");
lastErrorMessage = error;
return false;
}
// Copy the data from the old table to the new one
if(!executeSQL(QString("INSERT INTO sqlitebrowser_rename_column_new_table SELECT %1 FROM `%2`;").arg(select_cols).arg(tablename)))
{
lastErrorMessage = tr("renameColumn: copying data to new table failed. DB says:\n%1").arg(lastErrorMessage);
qWarning() << lastErrorMessage;
QString error(tr("renameColumn: copying data to new table failed. DB says:\n%1").arg(lastErrorMessage));
qWarning() << error;
executeSQL("ROLLBACK TO SAVEPOINT sqlitebrowser_rename_column;");
lastErrorMessage = error;
return false;
}
@@ -958,9 +960,10 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const QString& name, sq
// Delete the old table
if(!executeSQL(QString("DROP TABLE `%1`;").arg(tablename)))
{
lastErrorMessage = tr("renameColumn: deleting old table failed. DB says: %1").arg(lastErrorMessage);
qWarning() << lastErrorMessage;
QString error(tr("renameColumn: deleting old table failed. DB says: %1").arg(lastErrorMessage));
qWarning() << error;
executeSQL("ROLLBACK TO SAVEPOINT sqlitebrowser_rename_column;");
lastErrorMessage = error;
return false;
}