diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-05-16 11:27:04 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-05-16 11:27:04 +0200 |
| commit | de6225f820a6e1627786874d8df9df99b5f5e4bc (patch) | |
| tree | 98425261cb06c5824a8e173919d834d0a033ca1b | |
| parent | 75855e0fce31ff32654daad2e70e0f2186f3e9b0 (diff) | |
| download | merchant-de6225f820a6e1627786874d8df9df99b5f5e4bc.tar.gz merchant-de6225f820a6e1627786874d8df9df99b5f5e4bc.tar.bz2 merchant-de6225f820a6e1627786874d8df9df99b5f5e4bc.zip | |
fix sql
| -rw-r--r-- | src/backenddb/drop0001.sql | 2 | ||||
| -rw-r--r-- | src/testing/Makefile.am | 2 | ||||
| -rw-r--r-- | src/testing/testing_api_helpers.c | 21 |
3 files changed, 12 insertions, 13 deletions
diff --git a/src/backenddb/drop0001.sql b/src/backenddb/drop0001.sql index 81b76918..f0bfeb74 100644 --- a/src/backenddb/drop0001.sql +++ b/src/backenddb/drop0001.sql @@ -48,7 +48,7 @@ DROP TABLE IF EXISTS merchant_tip_pickups CASCADE; DROP TABLE IF EXISTS merchant_tip_pickup_signatures CASCADE; -- Unregister patch (0001.sql) -_v.unregister_patch('merchant-0001', NULL, NULL); +SELECT _v.unregister_patch('merchant-0001'); -- And we're out of here... COMMIT; diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index c0165e9c..03c1008d 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -99,11 +99,11 @@ test_merchant_api_twisted_LDADD = \ test_merchant_api_SOURCES = \ test_merchant_api.c test_merchant_api_LDADD = \ + libtalermerchanttesting.la \ $(top_srcdir)/src/backenddb/libtalermerchantdb.la \ $(top_srcdir)/src/lib/libtalermerchant.la \ $(LIBGCRYPT_LIBS) \ -ltalertesting \ - -ltalermerchanttesting \ -ltalerfakebank \ -ltalerbank \ -ltalerexchange \ diff --git a/src/testing/testing_api_helpers.c b/src/testing/testing_api_helpers.c index 326bfcb8..59ca0bd8 100644 --- a/src/testing/testing_api_helpers.c +++ b/src/testing/testing_api_helpers.c @@ -146,19 +146,18 @@ TALER_TESTING_prepare_merchant (const char *config_filename) } /* DB preparation */ - if (NULL == (dbinit_proc = GNUNET_OS_start_process - (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-merchant-dbinit", - "taler-merchant-dbinit", - "-c", config_filename, - "-r", - NULL))) + if (NULL == (dbinit_proc = GNUNET_OS_start_process ( + GNUNET_NO, + GNUNET_OS_INHERIT_STD_ALL, + NULL, NULL, NULL, + "taler-merchant-dbinit", + "taler-merchant-dbinit", + "-c", config_filename, + "-r", + NULL))) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to run taler-merchant-dbinit." - " Check your PATH.\n"); + "Failed to run taler-merchant-dbinit. Check your PATH.\n"); MERCHANT_FAIL (); } |