[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 114/277: fix sql
From: |
gnunet |
Subject: |
[taler-merchant] 114/277: fix sql |
Date: |
Sun, 05 Jul 2020 20:50:27 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit de6225f820a6e1627786874d8df9df99b5f5e4bc
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat May 16 11:27:04 2020 +0200
fix sql
---
src/backenddb/drop0001.sql | 2 +-
src/testing/Makefile.am | 2 +-
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 81b7691..f0bfeb7 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 c0165e9..03c1008 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 326bfcb..59ca0bd 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 ();
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] 96/277: fix FTBFS, (continued)
- [taler-merchant] 96/277: fix FTBFS, gnunet, 2020/07/05
- [taler-merchant] 109/277: commentfix, gnunet, 2020/07/05
- [taler-merchant] 110/277: fix benchmark FTBFS, gnunet, 2020/07/05
- [taler-merchant] 116/277: fix test, gnunet, 2020/07/05
- [taler-merchant] 115/277: misc. fixes, gnunet, 2020/07/05
- [taler-merchant] 91/277: implement GET /orders/ID, gnunet, 2020/07/05
- [taler-merchant] 101/277: more SQL, gnunet, 2020/07/05
- [taler-merchant] 104/277: GET /transfers implementation, gnunet, 2020/07/05
- [taler-merchant] 102/277: towards idempotency in POST /private/transfers, gnunet, 2020/07/05
- [taler-merchant] 103/277: towards GET /transfers, gnunet, 2020/07/05
- [taler-merchant] 114/277: fix sql,
gnunet <=
- [taler-merchant] 119/277: better error handling, gnunet, 2020/07/05
- [taler-merchant] 117/277: get simple pay test to pass, gnunet, 2020/07/05
- [taler-merchant] 94/277: fix ftbfs, gnunet, 2020/07/05
- [taler-merchant] 98/277: implement POST /transfers, gnunet, 2020/07/05
- [taler-merchant] 107/277: implement GET /transfers, gnunet, 2020/07/05
- [taler-merchant] 106/277: implement merchant_api_post_transfers.c, gnunet, 2020/07/05
- [taler-merchant] 111/277: fix link errors in test, gnunet, 2020/07/05
- [taler-merchant] 90/277: starting with get-orders-ID logic, gnunet, 2020/07/05
- [taler-merchant] 92/277: fix backenddb, gnunet, 2020/07/05
- [taler-merchant] 97/277: integrate POST /tranfers handler, gnunet, 2020/07/05