ignore prepared statement failures if statement is already known to enable connection pooling

1 files changed, 12 insertions, 2 deletions

diff --git a/src/pq/pq_prepare.c b/src/pq/pq_prepare.c
index 76fc5c374..fcf1cc793 100644
--- a/src/pq/pq_prepare.c
+++ b/src/pq/pq_prepare.c
@@ -106,12 +106,22 @@ GNUNET_PQ_prepare_statements (struct GNUNET_PQ_Context *db,
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                        "pq",
-                       _ ("PQprepare (`%s' as `%s') failed with error: %s\n"),
+                       "PQprepare (`%s' as `%s') failed with error: %s\n",
                        ps[i].sql,
                        ps[i].name,
                        PQerrorMessage (db->conn));
       PQclear (ret);
-      return GNUNET_SYSERR;
+      ret = PQdescribePrepared (db->conn,
+                                ps[i].name);
+      if (PGRES_COMMAND_OK != PQresultStatus (ret))
+      {
+        PQclear (ret);
+        return GNUNET_SYSERR;
+      }
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                       "pq",
+                       "Statement `%s' already known. Ignoring the issue in the hope that you are using connection pooling...\n",
+                       ps[i].name);
     }
     PQclear (ret);
   }