[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 175/277: avoid amount_zero, use DEFAULT instead
From: |
gnunet |
Subject: |
[taler-merchant] 175/277: avoid amount_zero, use DEFAULT instead |
Date: |
Sun, 05 Jul 2020 20:51:28 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit 59413577cf283700e603192d35f6b060e0135495
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Jun 3 20:43:01 2020 +0200
avoid amount_zero, use DEFAULT instead
---
src/backenddb/plugin_merchantdb_postgres.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index 66d85b5..81b4432 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -4612,9 +4612,6 @@ RETRY:
tip_id,
sizeof (*tip_id));
{
- struct TALER_Amount amount_zero;
- TALER_amount_get_zero (pg->currency,
- &amount_zero);
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_string (instance_id),
GNUNET_PQ_query_param_auto_from_type (reserve_pubp),
@@ -4623,7 +4620,6 @@ RETRY:
GNUNET_PQ_query_param_string (next_url),
GNUNET_PQ_query_param_absolute_time (expiration),
TALER_PQ_query_param_amount (amount),
- TALER_PQ_query_param_amount (&amount_zero),
GNUNET_PQ_query_param_end
};
@@ -7132,18 +7128,16 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
",expiration"
",amount_val"
",amount_frac"
- ",picked_up_val"
- ",picked_up_frac"
") "
"SELECT"
- " reserve_serial, $3, $4, $5, $6, $7, $8, $9, $10"
+ " reserve_serial, $3, $4, $5, $6, $7, $8"
" FROM merchant_tip_reserves"
" WHERE reserve_pub=$2"
" AND merchant_serial = "
" (SELECT merchant_serial"
" FROM merchant_instances"
" WHERE merchant_id=$1)",
- 7),
+ 8),
/* For postgres_lookup_pickup() */
GNUNET_PQ_make_prepare ("lookup_pickup",
"SELECT"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] 160/277: address DB fixes for missing EC values, (continued)
- [taler-merchant] 160/277: address DB fixes for missing EC values, gnunet, 2020/07/05
- [taler-merchant] 157/277: fix DB use, gnunet, 2020/07/05
- [taler-merchant] 166/277: SQL fixing, gnunet, 2020/07/05
- [taler-merchant] 152/277: wrote db tests for tips/lookups, gnunet, 2020/07/05
- [taler-merchant] 145/277: refactored the existing product and order tests, gnunet, 2020/07/05
- [taler-merchant] 171/277: tests/fixes for tips and pickups in backenddb, gnunet, 2020/07/05
- [taler-merchant] 169/277: implement POST /private/reserves, gnunet, 2020/07/05
- [taler-merchant] 161/277: fix misc issues in client APIs, gnunet, 2020/07/05
- [taler-merchant] 162/277: implement GET /reserves/RPUB, gnunet, 2020/07/05
- [taler-merchant] 170/277: implement POST /private/reserves, gnunet, 2020/07/05
- [taler-merchant] 175/277: avoid amount_zero, use DEFAULT instead,
gnunet <=
- [taler-merchant] 174/277: new backenddb APIs for GET /private/orders/ID, gnunet, 2020/07/05
- [taler-merchant] 168/277: implement GET /reserves/RESERVE_ID, gnunet, 2020/07/05
- [taler-merchant] 167/277: implement TALER_MERCHANT_reserves_get(), gnunet, 2020/07/05
- [taler-merchant] 173/277: Merge branch 'protocolV1' of git+ssh://git.taler.net/merchant into protocolV1, gnunet, 2020/07/05
- [taler-merchant] 172/277: first high-level hack job at GET /orders/ID -- certainly FTBFS still, gnunet, 2020/07/05
- [taler-merchant] 176/277: cleaned backenddb test code, completed tests for instances & products, gnunet, 2020/07/05
- [taler-merchant] 179/277: Merge branch 'protocolV1' of git+ssh://git.taler.net/merchant into protocolV1, gnunet, 2020/07/05
- [taler-merchant] 185/277: headers and empty source files for GET /private/tips, gnunet, 2020/07/05
- [taler-merchant] 178/277: work on GET /private/orders/ID", gnunet, 2020/07/05
- [taler-merchant] 177/277: wrote method for delete reserve, gnunet, 2020/07/05