projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #92 from mamarley/nodbnoemit
[quassel.git]
/
src
/
core
/
abstractsqlstorage.cpp
diff --git
a/src/core/abstractsqlstorage.cpp
b/src/core/abstractsqlstorage.cpp
index
ad08947
..
4554f3f
100644
(file)
--- a/
src/core/abstractsqlstorage.cpp
+++ b/
src/core/abstractsqlstorage.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-91,11
+91,14
@@
void AbstractSqlStorage::addConnectionToPool()
}
if (!db.open()) {
}
if (!db.open()) {
- qWarning() << "Unable to open database" << displayName() << "for thread" << QThread::currentThread();
- qWarning() << "-" << db.lastError().text();
+ q
u
Warning() << "Unable to open database" << displayName() << "for thread" << QThread::currentThread();
+ q
u
Warning() << "-" << db.lastError().text();
}
else {
}
else {
- initDbSession(db);
+ if (!initDbSession(db)) {
+ quWarning() << "Unable to initialize database" << displayName() << "for thread" << QThread::currentThread();
+ db.close();
+ }
}
}
}
}
@@
-406,7
+409,7
@@
void AbstractSqlMigrator::dumpStatus()
qWarning() << " bound Values:";
QList<QVariant> list = boundValues();
for (int i = 0; i < list.size(); ++i)
qWarning() << " bound Values:";
QList<QVariant> list = boundValues();
for (int i = 0; i < list.size(); ++i)
- qWarning() << i << ": " << list.at(i).toString().to
Ascii
().data();
+ qWarning() << i << ": " << list.at(i).toString().to
Latin1
().data();
qWarning() << " Error Number:" << lastError().number();
qWarning() << " Error Message:" << lastError().text();
}
qWarning() << " Error Number:" << lastError().number();
qWarning() << " Error Message:" << lastError().text();
}