mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Connection will be restored if server is gone away or drop limereport connection

Browse Source
This commit is contained in:
Arin Alexander 2017-02-10 23:08:49 +03:00
parent f613400839
commit 034f254d5c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
limereport/lrdatasourcemanager.cpp
View File

@ -702,12 +702,17 @@ bool DataSourceManager::initAndOpenDB(QSqlDatabase& db, ConnectionDesc& connecti
return connected; return connected;
} }
bool DataSourceManager::checkConnection(QSqlDatabase& db){
QSqlQuery query("Select 1",db);
return query.first();
}
bool DataSourceManager::connectConnection(ConnectionDesc *connectionDesc) bool DataSourceManager::connectConnection(ConnectionDesc *connectionDesc)
{ {
bool connected = false; bool connected = false;
clearErrors(); clearErrors();
QString lastError =""; QString lastError = "";
foreach(QString datasourceName, dataSourceNames()){ foreach(QString datasourceName, dataSourceNames()){
dataSourceHolder(datasourceName)->clearErrors(); dataSourceHolder(datasourceName)->clearErrors();
@ -715,7 +720,7 @@ bool DataSourceManager::connectConnection(ConnectionDesc *connectionDesc)
if (!QSqlDatabase::contains(connectionDesc->name())){ if (!QSqlDatabase::contains(connectionDesc->name())){
QSqlDatabase db = QSqlDatabase::addDatabase(connectionDesc->driver(),connectionDesc->name()); QSqlDatabase db = QSqlDatabase::addDatabase(connectionDesc->driver(),connectionDesc->name());
connected=initAndOpenDB(db, *connectionDesc); connected = initAndOpenDB(db, *connectionDesc);
if (!connected){ if (!connected){
setLastError(db.lastError().text()); setLastError(db.lastError().text());
return false; return false;
@ -726,7 +731,10 @@ bool DataSourceManager::connectConnection(ConnectionDesc *connectionDesc)
db.close(); db.close();
connected = initAndOpenDB(db, *connectionDesc); connected = initAndOpenDB(db, *connectionDesc);
} else { } else {
connected = db.isOpen(); // connected = db.isOpen();
connected = checkConnection(db);
if (!connected)
connected = initAndOpenDB(db, *connectionDesc);
} }
} }

1
limereport/lrdatasourcemanager.h
View File

@ -215,6 +215,7 @@ protected:
void setLastError(const QString& value); void setLastError(const QString& value);
void invalidateLinkedDatasources(QString datasourceName); void invalidateLinkedDatasources(QString datasourceName);
bool checkConnection(QSqlDatabase &db);
private slots: private slots:
void slotConnectionRenamed(const QString& oldName,const QString& newName); void slotConnectionRenamed(const QString& oldName,const QString& newName);
void slotQueryTextChanged(const QString& queryName, const QString& queryText); void slotQueryTextChanged(const QString& queryName, const QString& queryText);