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

Improved error reporting

Browse source
This commit is contained in:
eelke 2022-08-14 08:04:21 +02:00
parent 6cf7b52453
commit 457b09f15c
12 changed files with 110 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pgsql/Pgsql_Connection.cpp
View file

@ -115,19 +115,21 @@ Result Connection::queryParam(const QString &command, const Params &params)
}
bool Connection::sendQuery(const char *query)
void Connection::sendQuery(const char *query)
{
int res = PQsendQuery(conn, query);
return res == 1;
if (res == 0)
throw PgConnectionError(PQerrorMessage(conn));
}
bool Connection::sendQueryParams(const char * command, const Params &params)
void Connection::sendQueryParams(const char * command, const Params &params)
{
int res = PQsendQueryParams(conn, command, params.size(), params.types(),
params.values(), params.lengths(), params.formats(),
0); // text format
return res == 1;
if (res == 0)
throw PgConnectionError(PQerrorMessage(conn));
}
std::shared_ptr<Result> Connection::getResult()

12
pgsql/Pgsql_Connection.h
View file

@ -85,17 +85,17 @@ namespace Pgsql {
Result queryParam(const char * command, const Params &params);
Result queryParam(const QString &command, const Params &params);
bool sendQuery(const char * query);
bool sendQuery(const std::string &command)
void sendQuery(const char * query);
void sendQuery(const std::string &command)
{
return sendQuery(command.c_str());
sendQuery(command.c_str());
}
bool sendQuery(const QString &command)
void sendQuery(const QString &command)
{
return sendQuery(command.toUtf8().data());
sendQuery(command.toUtf8().data());
}
bool sendQueryParams(const char * command, const Params &params);
void sendQueryParams(const char * command, const Params &params);
std::shared_ptr<Result> getResult();
std::shared_ptr<Result> getResultNoThrow();

16
pgsql/Pgsql_Transaction.cpp
View file

@ -84,32 +84,32 @@ namespace Pgsql {
return m_conn->queryParam(command, params);
}
bool Transaction::sendQuery(const char * query)
void Transaction::sendQuery(const char * query)
{
BOOST_ASSERT(m_conn != nullptr);
BOOST_ASSERT(m_committed == false);
BOOST_ASSERT(m_rolledback == false);
return m_conn->sendQuery(query);
m_conn->sendQuery(query);
}
bool Transaction::sendQuery(const std::string &command)
void Transaction::sendQuery(const std::string &command)
{
return sendQuery(command.c_str());
sendQuery(command.c_str());
}
bool Transaction::sendQuery(const QString &command)
void Transaction::sendQuery(const QString &command)
{
return sendQuery(command.toUtf8().data());
sendQuery(command.toUtf8().data());
}
bool Transaction::sendQueryParams(const char * command, const Params &params)
void Transaction::sendQueryParams(const char * command, const Params &params)
{
BOOST_ASSERT(m_conn != nullptr);
BOOST_ASSERT(m_committed == false);
BOOST_ASSERT(m_rolledback == false);
return m_conn->sendQueryParams(command, params);
m_conn->sendQueryParams(command, params);
}
std::shared_ptr<Result> Transaction::getResult()

8
pgsql/Pgsql_Transaction.h
View file

@ -25,10 +25,10 @@ namespace Pgsql {
Result query(const QString &command);
Result queryParam(const char * command, const Params &params);
Result queryParam(const QString &command, const Params &params);
bool sendQuery(const char * query);
bool sendQuery(const std::string &command);
bool sendQuery(const QString &command);
bool sendQueryParams(const char * command, const Params &params);
void sendQuery(const char * query);
void sendQuery(const std::string &command);
void sendQuery(const QString &command);
void sendQueryParams(const char * command, const Params &params);
std::shared_ptr<Result> getResult();
bool consumeInput();
bool isBusy();