sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

postgis: avoid empty error messages (closes #955) and more verbosity in general if postgres connection fails

Browse source
This commit is contained in:
Dane Springmeyer 2011-11-16 11:27:48 -08:00
parent d1b53c4305
commit dddd6fa781
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
plugins/input/postgis/connection.hpp
View file

@ -26,6 +26,10 @@
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
// std
#include <sstream>
#include <iostream>
extern "C" { extern "C" {
#include "libpq-fe.h" #include "libpq-fe.h"
} }
@ -43,17 +47,28 @@ public:
:cursorId(0), :cursorId(0),
closed_(false) closed_(false)
{ {
conn_=PQconnectdb(connection_str.c_str()); conn_ = PQconnectdb(connection_str.c_str());
if (PQstatus(conn_) != CONNECTION_OK) if (PQstatus(conn_) != CONNECTION_OK)
{ {
std::ostringstream s("Postgis Plugin: PSQL error"); // note: empty ctor is intentional here
// as somehow constructor string can dissapear
std::ostringstream s;
s << "Postgis Plugin: ";
if (conn_ ) if (conn_ )
{ {
std::string msg = PQerrorMessage( conn_ ); std::string msg = PQerrorMessage( conn_ );
if ( ! msg.empty() ) if ( ! msg.empty() )
{ {
s << ":\n" << msg.substr( 0, msg.size() - 1 ); s << msg.substr( 0, msg.size() - 1 );
} }
else
{
s << "unable to connect to postgres server";
}
}
else
{
s << "unable to connect to postgres server";
} }
throw mapnik::datasource_exception( s.str() ); throw mapnik::datasource_exception( s.str() );
} }
@ -61,8 +76,8 @@ public:
bool execute(const std::string& sql) const bool execute(const std::string& sql) const
{ {
PGresult *result=PQexec(conn_,sql.c_str()); PGresult *result = PQexec(conn_,sql.c_str());
bool ok=(result && PQresultStatus(result)==PGRES_COMMAND_OK); bool ok=(result && (PQresultStatus(result) == PGRES_COMMAND_OK));
PQclear(result); PQclear(result);
return ok; return ok;
} }
@ -72,13 +87,13 @@ public:
PGresult *result=0; PGresult *result=0;
if (type==1) if (type==1)
{ {
result=PQexecParams(conn_,sql.c_str(),0,0,0,0,0,1); result = PQexecParams(conn_,sql.c_str(),0,0,0,0,0,1);
} }
else else
{ {
result=PQexec(conn_,sql.c_str()); result = PQexec(conn_,sql.c_str());
} }
if(!result || PQresultStatus(result) != PGRES_TUPLES_OK) if(!result || (PQresultStatus(result) != PGRES_TUPLES_OK))
{ {
std::ostringstream s("Postgis Plugin: PSQL error"); std::ostringstream s("Postgis Plugin: PSQL error");
if (conn_ ) if (conn_ )
@ -106,7 +121,7 @@ public:
bool isOK() const bool isOK() const
{ {
return (PQstatus(conn_)!=CONNECTION_BAD); return (PQstatus(conn_) != CONNECTION_BAD);
} }
void close() void close()