witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

fix(Abstract): in reconnect case, disable foreign key before init call

Browse source
This commit is contained in:
Ronan Abhamon 2018-02-28 10:43:16 +01:00
parent 7d491f8689
commit 10049e078f
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/db/abstract/abstract-db-p.h
View file

@ -35,6 +35,8 @@ public:
DbSession dbSession;
private:
void safeInit ();
AbstractDb::Backend backend;
L_DECLARE_PUBLIC(AbstractDb);

22
src/db/abstract/abstract-db.cpp
View file

@ -43,6 +43,15 @@ LINPHONE_BEGIN_NAMESPACE
}
#endif // if defined(SOCI_ENABLED) && (TARGET_OS_IPHONE || defined(__ANDROID__))
void AbstractDbPrivate::safeInit () {
#ifdef SOCI_ENABLED
L_Q();
dbSession.enableForeignKeys(false);
q->init();
dbSession.enableForeignKeys(true);
#endif // ifdef SOCI_ENABLED
}
AbstractDb::AbstractDb (AbstractDbPrivate &p) : Object(p) {}
bool AbstractDb::connect (Backend backend, const string &parameters) {
@ -66,11 +75,7 @@ bool AbstractDb::connect (Backend backend, const string &parameters) {
if (d->dbSession) {
try {
#ifdef SOCI_ENABLED
d->dbSession.enableForeignKeys(false);
init();
d->dbSession.enableForeignKeys(true);
#endif // ifdef SOCI_ENABLED
d->safeInit();
} catch (const exception &e) {
lWarning() << "Unable to init database: " << e.what();
@ -99,14 +104,11 @@ bool AbstractDb::forceReconnect () {
lInfo() << "Trying sql backend reconnect...";
try {
soci::session *session = d->dbSession.getBackendSession();
session->close();
for (int i = 0; i < retryCount; ++i) {
try {
lInfo() << "Reconnect... Try: " << i;
session->reconnect();
init();
d->dbSession.getBackendSession()->reconnect(); // Equivalent to close and connect.
d->safeInit();
lInfo() << "Database reconnection successful!";
return true;
} catch (const soci::soci_error &e) {