eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix problems with reconnects where dialog keeps popping up.

Browse source
This commit is contained in:
eelke 2025-04-01 20:26:44 +02:00
parent a6be979f8e
commit 581e92723d
6 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pglab/crud/CrudModel.cpp
View file

@ -247,9 +247,9 @@ void CrudModel::initRowMapping()
m_rowMapping.emplace_back(i); m_rowMapping.emplace_back(i);
} }
void CrudModel::connectionStateChanged(ASyncDBConnection::StateData state) void CrudModel::connectionStateChanged()
{ {
switch (state.State) { switch (m_dbConn.state()) {
case ASyncDBConnection::State::NotConnected: case ASyncDBConnection::State::NotConnected:
break; break;
case ASyncDBConnection::State::Connecting: case ASyncDBConnection::State::Connecting:

2
pglab/crud/CrudModel.h
View file

@ -264,7 +264,7 @@ private:
private slots: private slots:
void loadIntoModel(std::shared_ptr<Pgsql::Result> data); void loadIntoModel(std::shared_ptr<Pgsql::Result> data);
void connectionStateChanged(ASyncDBConnection::StateData state); void connectionStateChanged();
}; };
#endif // CRUDMODEL_H #endif // CRUDMODEL_H

7
pglab/querytool/QueryTool.cpp
View file

@ -322,13 +322,14 @@ void QueryTool::queryTextChanged()
setQueryTextChanged(true); setQueryTextChanged(true);
} }
void QueryTool::connectionStateChanged(ASyncDBConnection::StateData state) void QueryTool::connectionStateChanged()
{ {
QString iconname; QString iconname;
switch (state.State) {
switch (m_dbConnection.state()) {
case ASyncDBConnection::State::NotConnected: case ASyncDBConnection::State::NotConnected:
QMessageBox::warning(this, "pglab", tr("Warning connection and any of its session state has been lost")); QMessageBox::warning(this, "pglab", tr("Warning connection and any of its session state has been lost"));
startConnect(); //startConnect();
iconname = "red.png"; iconname = "red.png";
break; break;
case ASyncDBConnection::State::Connecting: case ASyncDBConnection::State::Connecting:

2
pglab/querytool/QueryTool.h
View file

@ -113,7 +113,7 @@ private slots:
void query_ready(std::shared_ptr<Pgsql::Result>, qint64 elapsedms); void query_ready(std::shared_ptr<Pgsql::Result>, qint64 elapsedms);
void queryTextChanged(); void queryTextChanged();
void connectionStateChanged(ASyncDBConnection::StateData state); void connectionStateChanged();
void receiveNotice(Pgsql::ErrorDetails notice); void receiveNotice(Pgsql::ErrorDetails notice);
void startConnect(); void startConnect();

4
pglablib/ASyncDBConnection.cpp
View file

@ -259,7 +259,7 @@ void ASyncDBConnectionThread::doStateCallback(ASyncDBConnection::StateData state
{ {
qDebug() << "State change " + state.Message; qDebug() << "State change " + state.Message;
m_state = state.State; m_state = state.State;
Q_EMIT asyncConnObject->onStateChanged(state); Q_EMIT asyncConnObject->onStateChanged();
} }
bool ASyncDBConnectionThread::waitForAndSendCommand() bool ASyncDBConnectionThread::waitForAndSendCommand()
@ -435,7 +435,7 @@ void ASyncDBConnection::doStateCallback(State state)
m_connection.setNoticeReceiver( m_connection.setNoticeReceiver(
[this](const PGresult *result) { processNotice(result); }); [this](const PGresult *result) { processNotice(result); });
} }
Q_EMIT onStateChanged(state); Q_EMIT onStateChanged();
} }

2
pglablib/ASyncDBConnection.h
View file

@ -63,7 +63,7 @@ public:
bool cancel(); bool cancel();
Q_SIGNALS: Q_SIGNALS:
void onStateChanged(ASyncDBConnection::StateData state); void onStateChanged();
void onNotice(Pgsql::ErrorDetails notice); void onNotice(Pgsql::ErrorDetails notice);
private: private: