Skip to content

Commit 5b9d5cc

Browse files
MKleusbergMKleusberg
committed
Remove some debug messages. Change some error messages..
Remove some useless debug messages, e.g. because they just print an SQL string which you can see in the SQL log window anyway. Change some "critical" errors messages to just warning. No sense in printing a critical error message when the program can handle the problem by itself.
1 parent cf72bfb commit 5b9d5cc

File tree

5 files changed

+20
-34
lines changed

5 files changed

+20
-34
lines changed

‎src/EditTableDialog.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#include "sqlitedb.h"
99

10-
#include <QDebug>
11-
1210
EditTableDialog::EditTableDialog(DBBrowserDB* db, const QString& tableName, QWidget* parent)
1311
: QDialog(parent),
1412
ui(new Ui::EditTableDialog),
@@ -30,7 +28,6 @@ EditTableDialog::EditTableDialog(DBBrowserDB* db, const QString& tableName, QWid
3028

3129
// Existing table, so load and set the current layout
3230
QString sTablesql = pdb->getTableSQL(curTable);
33-
//qDebug() << sTablesql;
3431
m_table = sqlb::Table::parseSQL(sTablesql);
3532
populateFields();
3633
}

‎src/MainWindow.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,10 +612,7 @@ void MainWindow::editText(const QModelIndex& index)
612612
void MainWindow::doubleClickTable(const QModelIndex& index)
613613
{
614614
if(!index.isValid())
615-
{
616-
qDebug("no cell selected");
617615
return;
618-
}
619616

620617
// Don't allow editing of other objects than tables
621618
if(db.getObjectByName(ui->comboBrowseTable->currentText()).gettype() != "table")

‎src/sqlitedb.cpp‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -368,15 +368,15 @@ bool DBBrowserDB::executeMultiSQL(const QString& statement, bool dirty, bool log
368368
sqlite3_finalize(vm);
369369
lastErrorMessage = QObject::tr("Error in statement #%1: %2.\n"
370370
"Aborting execution.").arg(line).arg(sqlite3_errmsg(_db));
371-
qDebug(lastErrorMessage.toStdString().c_str());
371+
qWarning() << lastErrorMessage;
372372
return false;
373373
} else {
374374
sqlite3_finalize(vm);
375375
}
376376
} else {
377377
lastErrorMessage = QObject::tr("Error in statement #%1: %2.\n"
378378
"Aborting execution.").arg(line).arg(sqlite3_errmsg(_db));
379-
qDebug(lastErrorMessage.toStdString().c_str());
379+
qWarning() << lastErrorMessage;
380380
return false;
381381
}
382382
} while(tail && *tail != 0 && (res == SQLITE_OK || res == SQLITE_DONE));
@@ -399,15 +399,14 @@ int DBBrowserDB::addRecord(const QString& sTableName)
399399
// we should cache the parsed tables somewhere
400400
sqlb::Table table = sqlb::Table::parseSQL(getTableSQL(sTableName));
401401
QString sInsertstmt = table.emptyInsertStmt();
402-
qDebug() << sInsertstmt;
403402
lastErrorMessage = "";
404403
logSQL(sInsertstmt, kLogMsg_App);
405404
setRestorePoint();
406405

407406
if (SQLITE_OK != sqlite3_exec(_db, sInsertstmt.toUtf8(), NULL, NULL, &errmsg))
408407
{
409408
lastErrorMessage = QString::fromUtf8(errmsg);
410-
qCritical() << "addRecord: " << lastErrorMessage;
409+
qWarning() << "addRecord: " << lastErrorMessage;
411410
return -1;
412411
} else {
413412
return sqlite3_last_insert_rowid(_db);
@@ -431,7 +430,7 @@ bool DBBrowserDB::deleteRecord(const QString& table, int rowid)
431430
ok=true;
432431
} else {
433432
lastErrorMessage = QString::fromUtf8(errmsg);
434-
qCritical() << "deleteRecord: " << lastErrorMessage;
433+
qWarning() << "deleteRecord: " << lastErrorMessage;
435434
}
436435
}
437436
return ok;
@@ -464,7 +463,7 @@ bool DBBrowserDB::updateRecord(const QString& table, const QString& column, int
464463
return true;
465464
} else {
466465
lastErrorMessage = sqlite3_errmsg(_db);
467-
qCritical() << "updateRecord: " << lastErrorMessage;
466+
qWarning() << "updateRecord: " << lastErrorMessage;
468467
return false;
469468
}
470469
}
@@ -501,15 +500,15 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const QString& from, co
501500
if(table.getname() == "" || table.getField(from).getname() == "")
502501
{
503502
lastErrorMessage = QObject::tr("renameColumn: cannot find table %1 with column %2").arg(tablename).arg(from);
504-
qDebug(lastErrorMessage.toStdString().c_str());
503+
qWarning() << lastErrorMessage;
505504
return false;
506505
}
507506

508507
// Create savepoint to be able to go back to it in case of any error
509508
if(!executeSQL("SAVEPOINT sqlitebrowser_rename_column"))
510509
{
511510
lastErrorMessage = QObject::tr("renameColumn: creating savepoint failed. DB says: %1").arg(lastErrorMessage);
512-
qDebug(lastErrorMessage.toStdString().c_str());
511+
qWarning() << lastErrorMessage;
513512
return false;
514513
}
515514

@@ -530,7 +529,7 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const QString& from, co
530529
if(!createTable("sqlitebrowser_rename_column_new_table", new_table_structure))
531530
{
532531
lastErrorMessage = QObject::tr("renameColumn: creating new table failed. DB says: %1").arg(lastErrorMessage);
533-
qDebug(lastErrorMessage.toStdString().c_str());
532+
qWarning() << lastErrorMessage;
534533
executeSQL("ROLLBACK TO SAVEPOINT sqlitebrowser_rename_column;");
535534
return false;
536535
}
@@ -540,7 +539,7 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const QString& from, co
540539
{
541540
lastErrorMessage = QObject::tr("renameColumn: copying data to new table failed. DB says:\n"
542541
"%1").arg(lastErrorMessage);
543-
qDebug(lastErrorMessage.toStdString().c_str());
542+
qWarning() << lastErrorMessage;
544543
executeSQL("ROLLBACK TO SAVEPOINT sqlitebrowser_rename_column;");
545544
return false;
546545
}
@@ -549,7 +548,7 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const QString& from, co
549548
if(!executeSQL(QString("DROP TABLE `%1`;").arg(tablename)))
550549
{
551550
lastErrorMessage = QObject::tr("renameColumn: deleting old table failed. DB says: %1").arg(lastErrorMessage);
552-
qDebug(lastErrorMessage.toStdString().c_str());
551+
qWarning() << lastErrorMessage;
553552
executeSQL("ROLLBACK TO SAVEPOINT sqlitebrowser_rename_column;");
554553
return false;
555554
}
@@ -565,7 +564,7 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const QString& from, co
565564
if(!executeSQL("RELEASE SAVEPOINT sqlitebrowser_rename_column;"))
566565
{
567566
lastErrorMessage = QObject::tr("renameColumn: releasing savepoint failed. DB says: %1").arg(lastErrorMessage);
568-
qDebug(lastErrorMessage.toStdString().c_str());
567+
qWarning() << lastErrorMessage;
569568
return false;
570569
}
571570

@@ -679,7 +678,7 @@ bool DBBrowserDB::renameTable(const QString& from_table, const QString& to_table
679678
QString error = QObject::tr("Error renaming table '%1' to '%2'."
680679
"Message from database engine:\n%3").arg(from_table).arg(to_table).arg(lastErrorMessage);
681680
lastErrorMessage = error;
682-
qDebug(error.toStdString().c_str());
681+
qWarning() << lastErrorMessage;
683682
return false;
684683
} else {
685684
return true;
@@ -816,12 +815,11 @@ void DBBrowserDB::updateSchema( )
816815
if(val1 == "table" || val1 == "index" || val1 == "view" || val1 == "trigger")
817816
objMap.insert(val1, DBBrowserObject(val2, val3, val1));
818817
else
819-
qDebug(QObject::tr("unknown object type %1").arg(val1).toStdString().c_str());
818+
qWarning() << QObject::tr("unknown object type %1").arg(val1);
820819
}
821820
sqlite3_finalize(vm);
822821
}else{
823-
qDebug(QObject::tr("could not get list of db objects: %1, %2").
824-
arg(err).arg(sqlite3_errmsg(_db)).toStdString().c_str());
822+
qWarning() << QObject::tr("could not get list of db objects: %1, %2").arg(err).arg(sqlite3_errmsg(_db));
825823
}
826824

827825
//now get the field list for each table
@@ -956,16 +954,13 @@ QString DBBrowserDB::getPragma(const QString& pragma)
956954
if(err == SQLITE_OK){
957955
logSQL(sql, kLogMsg_App);
958956
if(sqlite3_step(vm) == SQLITE_ROW)
959-
{
960957
retval = QString::fromUtf8((const char *) sqlite3_column_text(vm, 0));
961-
//qDebug((pragma + ": " + retval).toStdString().c_str());
962-
} else {
963-
qDebug(QObject::tr("didn't receive any output from pragma %1").arg(pragma).toStdString().c_str());
964-
}
958+
else
959+
qWarning() << QObject::tr("didn't receive any output from pragma %1").arg(pragma);
960+
965961
sqlite3_finalize(vm);
966962
} else {
967-
qDebug(QObject::tr("could not execute pragma command: %1, %2").
968-
arg(err).arg(sqlite3_errmsg(_db)).toStdString().c_str());
963+
qWarning() << QObject::tr("could not execute pragma command: %1, %2").arg(err).arg(sqlite3_errmsg(_db));
969964
}
970965

971966
// Return it
@@ -976,13 +971,11 @@ bool DBBrowserDB::setPragma(const QString& pragma, const QString& value)
976971
{
977972
// Set the pragma value
978973
QString sql = QString("PRAGMA %1 = \"%2\";").arg(pragma).arg(value);
979-
//qDebug(sql.toStdString().c_str());
980974

981975
save();
982976
bool res = executeSQL(sql, false, true); // PRAGMA statements are usually not transaction bound, so we can't revert
983977
if( !res )
984-
qDebug(QObject::tr("Error setting pragma %1 to %2: %3").
985-
arg(pragma).arg(value).arg(lastErrorMessage).toStdString().c_str());
978+
qWarning() << QObject::tr("Error setting pragma %1 to %2: %3").arg(pragma).arg(value).arg(lastErrorMessage);
986979
return res;
987980
}
988981

‎src/sqlitetypes.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ Table CreateTableWalker::table()
269269
if( m_root ) //CREATE TABLE
270270
{
271271
antlr::RefAST s = m_root->getFirstChild();
272-
//qDebug() << m_root->toStringTree().cd;
273272
//skip to tablename
274273
while(s->getType() != Sqlite3Lexer::ID && s->getType() != Sqlite3Lexer::QUOTEDID) s = s->getNextSibling();
275274
tab.setName(identifier(s));

‎src/sqltextedit.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ void SqlTextEdit::keyPressEvent(QKeyEvent *e)
280280
table = identifier.left(dotpos);
281281
field = identifier.mid(dotpos + 1);
282282
}
283-
// qDebug() << identifier << ":" << table << ":" << field;
283+
284284
if( dotpos > 0 )
285285
{
286286
// swap model to field completion

0 commit comments

Comments
 (0)