From: Aki Tuomi <cmouse@desteem.org>
Date: Sun, 13 Sep 2015 16:45:32 +0000 (+0300)
Subject: Handle NULL and boolean properly in gPGSql
X-Git-Tag: auth-3.4.7~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2748%2Fhead;p=thirdparty%2Fpdns.git

Handle NULL and boolean properly in gPGSql
---

diff --git a/modules/gpgsqlbackend/spgsql.cc b/modules/gpgsqlbackend/spgsql.cc
index 84bff3cccb..49f7ae309f 100644
--- a/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@ -166,8 +166,16 @@ bool SPgSQL::getRow(row_t &row)
     return false;
   }
   
-  for(int i=0;i<PQnfields(d_result);i++)
-    row.push_back(PQgetvalue(d_result,d_count,i) ?: "");
+  for(int i=0;i<PQnfields(d_result);i++) {
+    if (PQgetisnull(d_result, d_count, i)) {
+      row.push_back("");
+    } else if (PQftype(d_result, i) == 16) { // BOOLEAN
+      char *val = PQgetvalue(d_result, d_count, i);
+      row.push_back(val[0] == 't' ? "1" : "0");
+    } else {
+      row.push_back(string(PQgetvalue(d_result, d_count, i)));
+    }
+  }
   d_count++;
   return true;
 }