merchant

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

-adapt to latest libgnunetpq

Diffstat:
M
src/backenddb/Makefile.am
 | 
4
++--
R
src/backenddb/drop0001.sql -> src/backenddb/drop.sql
 | 
0

M
src/backenddb/plugin_merchantdb_postgres.c
 | 
7
+++++--
R
src/backenddb/merchant-0000.sql -> src/backenddb/versioning.sql
 | 
0

4 files changed, 7 insertions(+), 4 deletions(-)
diff --git 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
diff --git 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