diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2022-07-24 11:33:19 +0200 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2022-07-24 11:33:19 +0200 |
| commit | 57eab1b4810ae1ddb3e6a0b96120148e00a4a75b (patch) | |
| tree | 799195d8e6054468ddca9c19a96181fe032d6871 | |
| parent | 01a6bb1eea28f6c1b663c328a6e8b5ce3ec7259c (diff) | |
| download | sync-57eab1b4810ae1ddb3e6a0b96120148e00a4a75b.tar.gz sync-57eab1b4810ae1ddb3e6a0b96120148e00a4a75b.tar.bz2 sync-57eab1b4810ae1ddb3e6a0b96120148e00a4a75b.zip | |
-adapt to latest libgnunetpq
| -rw-r--r-- | src/syncdb/Makefile.am | 5 | ||||
| -rw-r--r-- | src/syncdb/drop.sql (renamed from src/syncdb/drop0001.sql) | 0 | ||||
| -rw-r--r-- | src/syncdb/plugin_syncdb_postgres.c | 18 | ||||
| -rw-r--r-- | src/syncdb/versioning.sql (renamed from src/syncdb/sync-0000.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 index 9253517..9253517 100644 --- a/src/syncdb/drop0001.sql +++ b/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 index 116f409..116f409 100644 --- a/src/syncdb/sync-0000.sql +++ b/src/syncdb/versioning.sql |