[taler-sync] 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 sync.

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

commit 57eab1b4810ae1ddb3e6a0b96120148e00a4a75b
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Sun Jul 24 11:33:19 2022 +0200

    -adapt to latest libgnunetpq
---
 src/syncdb/Makefile.am                       |  5 +++--
 src/syncdb/{drop0001.sql => drop.sql}        |  0
 src/syncdb/plugin_syncdb_postgres.c          | 18 ++++++++++++++++--
 src/syncdb/{sync-0000.sql => versioning.sql} |  0
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/syncdb/Makefile.am b/src/syncdb/Makefile.am
index 1c1ab91..3dbdd57 100644
--- a/src/syncdb/Makefile.am
+++ b/src/syncdb/Makefile.am
@@ -23,9 +23,9 @@ endif
 sqldir = $(prefix)/share/sync/sql/
 
 sql_DATA = \
-  sync-0000.sql \
+  versioning.sql \
   sync-0001.sql \
-  drop0001.sql
+  drop.sql
 
 bin_PROGRAMS = \
   sync-dbinit
@@ -81,6 +81,7 @@ test_sync_db_postgres_LDFLAGS = \
   -ltalerutil \
   $(XLIB)
 
+AM_TESTS_ENVIRONMENT=export SYNC_PREFIX=$${SYNC_PREFIX:-@libdir@};export 
PATH=$${SYNC_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
   test_sync_db-postgres
 
diff --git a/src/syncdb/drop0001.sql b/src/syncdb/drop.sql
similarity index 100%
rename from src/syncdb/drop0001.sql
rename to src/syncdb/drop.sql
diff --git a/src/syncdb/plugin_syncdb_postgres.c 
b/src/syncdb/plugin_syncdb_postgres.c
index ffdb955..684d009 100644
--- a/src/syncdb/plugin_syncdb_postgres.c
+++ b/src/syncdb/plugin_syncdb_postgres.c
@@ -78,16 +78,25 @@ postgres_drop_tables (void *cls)
 {
   struct PostgresClosure *pg = cls;
   struct GNUNET_PQ_Context *conn;
+  enum GNUNET_GenericReturnValue ret;
 
+  if (NULL != pg->conn)
+  {
+    GNUNET_PQ_disconnect (pg->conn);
+    pg->conn = NULL;
+    pg->init = false;
+  }
   conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
                                      "syncdb-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;
 }
 
 
@@ -314,7 +323,11 @@ postgres_preflight (void *cls)
     if (GNUNET_OK !=
         internal_setup (pg,
                         false))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to ensure DB is initialized\n");
       return GNUNET_SYSERR;
+    }
   }
   if (NULL == pg->transaction_name)
     return GNUNET_OK; /* all good */
@@ -1352,6 +1365,7 @@ libsync_plugin_db_postgres_done (void *cls)
   struct PostgresClosure *pg = plugin->cls;
 
   GNUNET_PQ_disconnect (pg->conn);
+  GNUNET_free (pg->currency);
   GNUNET_free (pg->sql_dir);
   GNUNET_free (pg);
   GNUNET_free (plugin);
diff --git a/src/syncdb/sync-0000.sql b/src/syncdb/versioning.sql
similarity index 100%
rename from src/syncdb/sync-0000.sql
rename to src/syncdb/versioning.sql

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