[taler-merchant] branch master updated: -adapt to latest libgnunetpq

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 14d37a71 -adapt to latest libgnunetpq
14d37a71 is described below

commit 14d37a7165923baa050efda895c480a822ce48bf
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Sun Jul 24 11:33:00 2022 +0200

    -adapt to latest libgnunetpq
---
 src/backenddb/Makefile.am                           | 4 ++--
 src/backenddb/{drop0001.sql => drop.sql}            | 0
 src/backenddb/plugin_merchantdb_postgres.c          | 7 +++++--
 src/backenddb/{merchant-0000.sql => versioning.sql} | 0
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
index 8adc1d76..c26d47bb 100644
--- a/src/backenddb/Makefile.am
+++ b/src/backenddb/Makefile.am
@@ -11,11 +11,11 @@ pkgcfg_DATA = \
 sqldir = $(prefix)/share/taler/sql/merchant/
 
 sql_DATA = \
-  merchant-0000.sql \
+  versioning.sql \
   merchant-0001.sql \
   merchant-0002.sql \
   merchant-0003.sql \
-  drop0001.sql
+  drop.sql
 
 if HAVE_POSTGRESQL
 if HAVE_GNUNETPQ
diff --git a/src/backenddb/drop0001.sql b/src/backenddb/drop.sql
similarity index 100%
rename from src/backenddb/drop0001.sql
rename to src/backenddb/drop.sql
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index 830a3182..fd8fe441 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -116,16 +116,19 @@ postgres_drop_tables (void *cls)
 {
   struct PostgresClosure *pc = cls;
   struct GNUNET_PQ_Context *conn;
+  enum GNUNET_GenericReturnValue ret;
 
   conn = GNUNET_PQ_connect_with_cfg (pc->cfg,
                                      "merchantdb-postgres",
-                                     "drop",
+                                     NULL,
                                      NULL,
                                      NULL);
   if (NULL == conn)
     return GNUNET_SYSERR;
+  ret = GNUNET_PQ_exec_sql (conn,
+                            "drop");
   GNUNET_PQ_disconnect (conn);
-  return GNUNET_OK;
+  return ret;
 }
 
 
diff --git a/src/backenddb/merchant-0000.sql b/src/backenddb/versioning.sql
similarity index 100%
rename from src/backenddb/merchant-0000.sql
rename to src/backenddb/versioning.sql

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.