[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: working on Issue #6912: instance
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: working on Issue #6912: instance confusion should be fixed, shell script test still fails |
Date: |
Thu, 02 Sep 2021 20:36:53 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new d1a2ee8d working on Issue #6912: instance confusion should be fixed,
shell script test still fails
d1a2ee8d is described below
commit d1a2ee8dcf991e02f1d89496fe1f84240907cc53
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Sep 2 20:36:51 2021 +0200
working on Issue #6912: instance confusion should be fixed, shell script
test still fails
---
src/backenddb/plugin_merchantdb_postgres.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index 0252f418..45f02757 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -3902,6 +3902,7 @@ RETRY:
TALER_PQ_query_param_amount (&d->coin_fee), /* deposit fee */
GNUNET_PQ_query_param_auto_from_type (&d->coin_pub),
GNUNET_PQ_query_param_auto_from_type (&d->h_contract_terms),
+ GNUNET_PQ_query_param_string (instance_id),
GNUNET_PQ_query_param_end
};
@@ -3920,6 +3921,12 @@ RETRY:
qs);
return qs;
}
+ if (0 == qs)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "'insert_transfer_to_coin_mapping' failed at %u: deposit
unknown\n",
+ i);
+ }
}
/* Update merchant_contract_terms 'wired' status: for all coins
that were wired, set the respective order's "wired" status to
@@ -8248,8 +8255,12 @@ postgres_connect (void *cls)
" FROM merchant_deposits"
" JOIN merchant_contract_terms USING
(order_serial)"
" WHERE coin_pub=$7"
- " AND h_contract_terms=$8",
- 8),
+ " AND h_contract_terms=$8"
+ " AND merchant_serial="
+ " (SELECT merchant_serial"
+ " FROM merchant_instances"
+ " WHERE merchant_id=$9)",
+ 9),
/* for postgres_insert_transfer_details() */
GNUNET_PQ_make_prepare ("update_wired_by_coin_pub",
"WITH os AS" /* select orders affected by the coin
*/
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: working on Issue #6912: instance confusion should be fixed, shell script test still fails,
gnunet <=