Ticket #661: 0001-ticket-661-fix-compilation-with-PG-9.patch

applications/rasgeo/RasdamanHelper2.cc

@@ -45 +45 @@
 #include "gdal_priv.h"
 #include "gdal_rat.h"
 
+#include <pg_config.h>
+#include <postgresql/libpq-fe.h>
+
 // some string constants
 #define PSPREFIX "ps"
 #define crsURIprefix "%SECORE_URL%/crs/"
@@ -1577 +1580 @@
         query.str("");
         PQclear(res);
 
-        char* litstr = PQescapeLiteral(const_cast<PGconn*>(petaconn),
+        char* litstr = escapeLiteral(const_cast<PGconn*>(petaconn),
                 values[k].c_str(), values[k].size());
 
         // write the name of the table into the ps_extra_metadata table
@@ -1738 +1741 @@
     query << "select distinct k0.oid from ";
     for (int k=0; k < availkeys.size(); ++k)
     {
-        char* key = PQescapeLiteral(conn, availkeys[k].c_str(), availkeys[k].size());
-        char* val = PQescapeLiteral(conn, availvals[k].c_str(), availvals[k].size());
+        char* key = escapeLiteral(conn, availkeys[k].c_str(), availkeys[k].size());
+        char* val = escapeLiteral(conn, availvals[k].c_str(), availvals[k].size());
 
         if (k > 0)
         {
@@ -2261 +2264 @@
     for (c=0; c < ncols; c++)
     {
         std::string gdalcolname = pRAT->GetNameOfCol(c);
-        char* colname = PQescapeIdentifier(const_cast<PGconn*>(conn),
+        char* colname = escapeIdentifier(const_cast<PGconn*>(conn),
                 gdalcolname.c_str(), gdalcolname.size());
 
         coltypes.push_back(pRAT->GetTypeOfCol(c));
@@ -2320 +2323 @@
             case GFT_String:
                 {
                     std::string valstr = pRAT->GetValueAsString(r,c);
-                    char* litstr = PQescapeLiteral(const_cast<PGconn*>(conn),
+                    char* litstr = escapeLiteral(const_cast<PGconn*>(conn),
                                 valstr.c_str(), valstr.size());
                     query << litstr;
                     PQfreemem((void*)litstr);
@@ -3672 +3675 @@
     }
     return stype;
 }
+
+char*
+RasdamanHelper2::escapeLiteral(PGconn* conn, char* str, size_t strsize) throw (r_Error)
+{
+#if PG_VERSION_NUM >= 90000
+    return PQescapeLiteral(conn, str, strsize);
+#elif PG_VERSION_NUM >= 80000
+    char* to = (char*) malloc(strsize * 2 + 1);
+    if (to)
+    {
+        int error;
+        PQescapeStringConn(conn, to, str, strsize, &error);
+        if (error)
+        {
+            std::cerr << "RasdamanHelper2::escapeLiteral - failed escaping string." << std::endl;
+            throw r_Error(r_Error::r_Error_General);
+        }
+    }
+    else
+    {
+        std::cerr << "RasdamanHelper2::escapeLiteral - failed allocating memory." << std::endl;
+        throw r_Error(r_Error::r_Error_MemoryAllocation);
+    }
+    return to;
+#endif
+}
+
+char*
+RasdamanHelper2::escapeIdentifier(PGconn* conn, char* str, size_t strsize) throw (r_Error)
+{
+#if PG_VERSION_NUM >= 90000
+    return PQescapeIdentifier(conn, str, strsize);
+#elif PG_VERSION_NUM >= 80000
+    return escapeLiteral(conn, str, strsize);
+#endif
+}
+ No newline at end of file

applications/rasgeo/RasdamanHelper2.hh

@@ -445 +445 @@
     /* just to make PG-heavy code a little bit easier to read ...*/
     bool PGDATAFAILED(std::string fun, std::string msg, PGresult* res);
     bool PGFAILED(std::string fun, std::string msg, PGresult* res);
+    
+private:
+    /// proxy to PQEscapeLiteral
+    char* escapeLiteral(PGconn* conn, char* str, size_t strsize) throw (r_Error);
+    
+    /// proxy to PQEscapeIdentifier
+    char* escapeIdentifier(PGconn* conn, char* str, size_t strsize) throw (r_Error);
 
 };