From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 9 Jun 2020 18:15:39 +0000 (+0200)
Subject: Merge pull request #9190 from zeha/psql-prep
X-Git-Tag: dnsdist-1.5.0-rc3~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bbad27bcca28a79256890b7dd90c7d2392079e0;p=thirdparty%2Fpdns.git

Merge pull request #9190 from zeha/psql-prep

gpgsql: Reintroduce prepared statements
---

6bbad27bcca28a79256890b7dd90c7d2392079e0
diff --cc modules/gpgsqlbackend/spgsql.cc
index b7e0c4a247,aeab4470b6..fe6e06517a
--- a/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@@ -77,22 -68,14 +68,26 @@@ public
    SSqlStatement* execute() {
      prepareStatement();
      if (d_dolog) {
 -      g_log<<Logger::Warning<< "Query "<<((long)(void*)this)<<": " << d_query << endl;
 +      g_log<<Logger::Warning<< "Query "<<((long)(void*)this)<<": Statement: " << d_query << endl;
 +      if (d_paridx) {
 +        // Log message is similar, bot not exactly the same as the postgres server log.
 +        std::stringstream log_message;
 +        log_message<< "Query "<<((long)(void*)this)<<": Parameters: ";
 +        for (int i = 0; i < d_paridx; i++) {
 +          if (i != 0) {
 +            log_message << ", ";
 +          }
 +          log_message << "$" << (i + 1) << " = '" << paramValues[i] << "'";
 +        }
 +        g_log<<Logger::Warning<< log_message.str() << endl;
 +      }
        d_dtime.set();
      }
-     d_res_set = PQexecParams(d_db(), d_query.c_str(), d_nparams, NULL, paramValues, paramLengths, NULL, 0);
+     if (!d_stmt.empty()) {
+       d_res_set = PQexecPrepared(d_db(), d_stmt.c_str(), d_nparams, paramValues, paramLengths, nullptr, 0);
+     } else {
+       d_res_set = PQexecParams(d_db(), d_query.c_str(), d_nparams, nullptr, paramValues, paramLengths, nullptr, 0);
+     }
      ExecStatusType status = PQresultStatus(d_res_set);
      if (status != PGRES_COMMAND_OK && status != PGRES_TUPLES_OK && status != PGRES_NONFATAL_ERROR) {
        string errmsg(PQresultErrorMessage(d_res_set));