Skip to content

Commit d868f4c

Browse files
MKleusbergMKleusberg
committed
Make last database error message private
It's not supposed to be edited by anyone else.
1 parent 4558086 commit d868f4c

8 files changed

Lines changed: 24 additions & 26 deletions

‎src/CreateIndexDialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,5 @@ void CreateIndexDialog::accept()
9797
if(pdb.executeSQL(sql))
9898
QDialog::accept();
9999
else
100-
QMessageBox::warning(this, QApplication::applicationName(), tr("Creating the index failed:\n%1").arg(pdb.lastErrorMessage));
100+
QMessageBox::warning(this, QApplication::applicationName(), tr("Creating the index failed:\n%1").arg(pdb.lastError()));
101101
}

‎src/DbStructureModel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ bool DbStructureModel::dropMimeData(const QMimeData* data, Qt::DropAction action
272272
reloadData();
273273
return true;
274274
} else {
275-
QMessageBox::warning(0, QApplication::applicationName(), m_db.lastErrorMessage);
275+
QMessageBox::warning(0, QApplication::applicationName(), m_db.lastError());
276276
return false;
277277
}
278278
}

‎src/EditTableDialog.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void EditTableDialog::accept()
158158
QMessageBox::warning(
159159
this,
160160
QApplication::applicationName(),
161-
tr("Error creating table. Message from database engine:\n%1").arg(pdb.lastErrorMessage));
161+
tr("Error creating table. Message from database engine:\n%1").arg(pdb.lastError()));
162162
return;
163163
}
164164
} else {
@@ -169,7 +169,7 @@ void EditTableDialog::accept()
169169
{
170170
if(!pdb.renameTable(curTable, ui->editTableName->text()))
171171
{
172-
QMessageBox::warning(this, QApplication::applicationName(), pdb.lastErrorMessage);
172+
QMessageBox::warning(this, QApplication::applicationName(), pdb.lastError());
173173
return;
174174
}
175175
}
@@ -487,7 +487,7 @@ void EditTableDialog::itemChanged(QTreeWidgetItem *item, int column)
487487
if(callRenameColumn)
488488
{
489489
if(!pdb.renameColumn(curTable, m_table, oldFieldName, field))
490-
QMessageBox::warning(this, qApp->applicationName(), tr("Modifying this column failed. Error returned from database:\n%1").arg(pdb.lastErrorMessage));
490+
QMessageBox::warning(this, qApp->applicationName(), tr("Modifying this column failed. Error returned from database:\n%1").arg(pdb.lastError()));
491491
}
492492
}
493493

@@ -575,7 +575,7 @@ void EditTableDialog::removeField()
575575
{
576576
if(!pdb.renameColumn(curTable, m_table, ui->treeWidget->currentItem()->text(0), sqlb::FieldPtr()))
577577
{
578-
QMessageBox::warning(0, QApplication::applicationName(), pdb.lastErrorMessage);
578+
QMessageBox::warning(0, QApplication::applicationName(), pdb.lastError());
579579
} else {
580580
//relayout
581581
QString sTablesql = pdb.getObjectByName(curTable).getsql();
@@ -659,7 +659,7 @@ void EditTableDialog::moveCurrentField(bool down)
659659
(down ? 1 : -1)
660660
))
661661
{
662-
QMessageBox::warning(0, QApplication::applicationName(), pdb.lastErrorMessage);
662+
QMessageBox::warning(0, QApplication::applicationName(), pdb.lastError());
663663
} else {
664664
// Reload table SQL
665665
QString sTablesql = pdb.getObjectByName(curTable).getsql();
@@ -712,7 +712,7 @@ void EditTableDialog::setWithoutRowid(bool without_rowid)
712712
if(!pdb.renameColumn(curTable, m_table, QString(), sqlb::FieldPtr(), 0))
713713
{
714714
QMessageBox::warning(this, QApplication::applicationName(),
715-
tr("Setting the rowid column for the table failed. Error message:\n%1").arg(pdb.lastErrorMessage));
715+
tr("Setting the rowid column for the table failed. Error message:\n%1").arg(pdb.lastError()));
716716
}
717717
}
718718
}
@@ -731,7 +731,7 @@ void EditTableDialog::setTemporary(bool is_temp)
731731
if(!pdb.renameColumn(curTable, m_table, QString(), sqlb::FieldPtr(), 0))
732732
{
733733
QMessageBox::warning(this, QApplication::applicationName(),
734-
tr("Setting the temporary flag for the table failed. Error message:\n%1").arg(pdb.lastErrorMessage));
734+
tr("Setting the temporary flag for the table failed. Error message:\n%1").arg(pdb.lastError()));
735735
}
736736
}
737737
}

‎src/ImportCsvDialog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,13 @@ void ImportCsvDialog::accept()
209209
// db needs to be saved or an error will occur
210210
QString restorepointName = QString("CSVIMPORT_%1").arg(QDateTime::currentMSecsSinceEpoch());
211211
if(!pdb->setSavepoint(restorepointName))
212-
return rollback(this, pdb, progress, restorepointName, 0, tr("Creating restore point failed: %1").arg(pdb->lastErrorMessage));
212+
return rollback(this, pdb, progress, restorepointName, 0, tr("Creating restore point failed: %1").arg(pdb->lastError()));
213213

214214
// Create table
215215
if(!importToExistingTable)
216216
{
217217
if(!pdb->createTable(ui->editName->text(), fieldList))
218-
return rollback(this, pdb, progress, restorepointName, 0, tr("Creating the table failed: %1").arg(pdb->lastErrorMessage));
218+
return rollback(this, pdb, progress, restorepointName, 0, tr("Creating the table failed: %1").arg(pdb->lastError()));
219219
}
220220

221221
// now lets import all data, one row at a time
@@ -246,7 +246,7 @@ void ImportCsvDialog::accept()
246246
sql.append(");");
247247

248248
if(!pdb->executeSQL(sql, false, false))
249-
return rollback(this, pdb, progress, restorepointName, std::distance(itBegin, it) + 1, tr("Inserting row failed: %1").arg(pdb->lastErrorMessage));
249+
return rollback(this, pdb, progress, restorepointName, std::distance(itBegin, it) + 1, tr("Inserting row failed: %1").arg(pdb->lastError()));
250250

251251
// Update progress bar and check if cancel button was clicked
252252
unsigned int prog = std::distance(csv.csv().begin(), it);

‎src/MainWindow.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ bool MainWindow::fileOpen(const QString& fileName, bool dontAddToRecentFiles, bo
303303
loadPragmas();
304304
retval = true;
305305
} else {
306-
QMessageBox::warning(this, qApp->applicationName(), tr("Could not open database file.\nReason: %1").arg(db.lastErrorMessage));
306+
QMessageBox::warning(this, qApp->applicationName(), tr("Could not open database file.\nReason: %1").arg(db.lastError()));
307307
return false;
308308
}
309309
}
@@ -567,7 +567,7 @@ void MainWindow::addRecord()
567567
{
568568
selectTableLine(row);
569569
} else {
570-
QMessageBox::warning( this, QApplication::applicationName(), tr("Error adding record:\n") + db.lastErrorMessage);
570+
QMessageBox::warning(this, QApplication::applicationName(), tr("Error adding record:\n") + db.lastError());
571571
}
572572
}
573573

@@ -587,7 +587,7 @@ void MainWindow::deleteRecord()
587587
int selected_rows_count = last_selected_row - first_selected_row + 1;
588588
if(!m_browseTableModel->removeRows(first_selected_row, selected_rows_count))
589589
{
590-
QMessageBox::warning(this, QApplication::applicationName(), tr("Error deleting record:\n%1").arg(db.lastErrorMessage));
590+
QMessageBox::warning(this, QApplication::applicationName(), tr("Error deleting record:\n%1").arg(db.lastError()));
591591
break;
592592
}
593593
}
@@ -747,7 +747,7 @@ void MainWindow::deleteObject()
747747
QString statement = QString("DROP %1 %2;").arg(type.toUpper()).arg(sqlb::escapeIdentifier(table));
748748
if(!db.executeSQL( statement))
749749
{
750-
QString error = tr("Error: could not delete the %1. Message from database engine:\n%2").arg(type).arg(db.lastErrorMessage);
750+
QString error = tr("Error: could not delete the %1. Message from database engine:\n%2").arg(type).arg(db.lastError());
751751
QMessageBox::warning(this, QApplication::applicationName(), error);
752752
} else {
753753
populateTable();
@@ -1116,7 +1116,7 @@ void MainWindow::fileSave()
11161116
if(!db.releaseAllSavepoints())
11171117
{
11181118
QMessageBox::warning(this, QApplication::applicationName(), tr("Error while saving the database file. This means that not all changes to the database were "
1119-
"saved. You need to resolve the following error first.\n\n%1").arg(db.lastErrorMessage));
1119+
"saved. You need to resolve the following error first.\n\n%1").arg(db.lastError()));
11201120
}
11211121
}
11221122
}
@@ -1184,7 +1184,7 @@ void MainWindow::importDatabaseFromSQL()
11841184
QFile f(fileName);
11851185
f.open(QIODevice::ReadOnly);
11861186
if(!db.executeMultiSQL(f.readAll(), newDbFile.size() == 0))
1187-
QMessageBox::warning(this, QApplication::applicationName(), tr("Error importing data: %1").arg(db.lastErrorMessage));
1187+
QMessageBox::warning(this, QApplication::applicationName(), tr("Error importing data: %1").arg(db.lastError()));
11881188
else
11891189
QMessageBox::information(this, QApplication::applicationName(), tr("Import completed."));
11901190
f.close();
@@ -1633,7 +1633,7 @@ void MainWindow::loadExtension()
16331633
if(db.loadExtension(file))
16341634
QMessageBox::information(this, QApplication::applicationName(), tr("Extension successfully loaded."));
16351635
else
1636-
QMessageBox::warning(this, QApplication::applicationName(), tr("Error loading extension: %1").arg(db.lastErrorMessage));
1636+
QMessageBox::warning(this, QApplication::applicationName(), tr("Error loading extension: %1").arg(db.lastError()));
16371637
}
16381638

16391639
void MainWindow::loadExtensionsFromSettings()
@@ -1645,7 +1645,7 @@ void MainWindow::loadExtensionsFromSettings()
16451645
foreach(QString ext, list)
16461646
{
16471647
if(db.loadExtension(ext) == false)
1648-
QMessageBox::warning(this, QApplication::applicationName(), tr("Error loading extension: %1").arg(db.lastErrorMessage));
1648+
QMessageBox::warning(this, QApplication::applicationName(), tr("Error loading extension: %1").arg(db.lastError()));
16491649
}
16501650
}
16511651

‎src/SqlExecutionArea.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void SqlExecutionArea::saveAsView()
109109
if(db.executeSQL(QString("CREATE VIEW %1 AS %2;").arg(sqlb::escapeIdentifier(name)).arg(model->query())))
110110
QMessageBox::information(this, qApp->applicationName(), tr("View successfully created."));
111111
else
112-
QMessageBox::warning(this, qApp->applicationName(), tr("Error creating view: %1").arg(db.lastErrorMessage));
112+
QMessageBox::warning(this, qApp->applicationName(), tr("Error creating view: %1").arg(db.lastError()));
113113
}
114114

115115
void SqlExecutionArea::reloadSettings()

‎src/sqlitedb.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class DBBrowserDB : public QObject
6060
bool dump(const QString & filename, const QStringList &tablesToDump, bool insertColNames, bool insertNew, bool exportSchema, bool exportData);
6161
bool executeSQL(QString statement, bool dirtyDB = true, bool logsql = true);
6262
bool executeMultiSQL(const QString& statement, bool dirty = true, bool log = false);
63+
const QString& lastError() const { return lastErrorMessage; }
6364

6465
/**
6566
* @brief getRow Executes a sqlite statement to get the rowdata(columns)
@@ -126,18 +127,15 @@ class DBBrowserDB : public QObject
126127

127128
objectMap objMap;
128129

129-
QString lastErrorMessage;
130-
131130
signals:
132131
void sqlExecuted(QString sql, int msgtype);
133132
void dbChanged(bool dirty);
134133
void structureUpdated();
135134

136135
private:
137136
QString curDBFilename;
138-
137+
QString lastErrorMessage;
139138
QStringList savepointList;
140-
141139
bool isEncrypted;
142140
bool isReadOnly;
143141

‎src/sqlitetablemodel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ bool SqliteTableModel::setTypedData(const QModelIndex& index, bool isBlob, const
310310
emit(dataChanged(index, index));
311311
return true;
312312
} else {
313-
QMessageBox::warning(0, qApp->applicationName(), tr("Error changing data:\n%1").arg(m_db.lastErrorMessage));
313+
QMessageBox::warning(0, qApp->applicationName(), tr("Error changing data:\n%1").arg(m_db.lastError()));
314314
return false;
315315
}
316316
}

0 commit comments

Comments
 (0)