[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: fix lib testcase
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: fix lib testcase |
Date: |
Thu, 08 Jun 2017 15:16:51 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 37d74d4 fix lib testcase
37d74d4 is described below
commit 37d74d45ba34d290226446210044607c22242ad8
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jun 8 15:17:00 2017 +0200
fix lib testcase
---
src/backenddb/plugin_merchantdb_postgres.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index 6d41bd1..f7aaf00 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -188,12 +188,16 @@ postgres_initialize (void *cls)
GNUNET_PQ_make_prepare ("get_refund_information",
"SELECT"
" merchant_deposits.coin_pub"
- ",merchant_deposits.amount_with_fee"
- ",merchant_refunds.refund_amount"
+ ",merchant_deposits.amount_with_fee_val"
+ ",merchant_deposits.amount_with_fee_frac"
+ ",merchant_deposits.amount_with_fee_curr"
+ ",merchant_refunds.refund_amount_val"
+ ",merchant_refunds.refund_amount_frac"
+ ",merchant_refunds.refund_amount_curr"
" FROM merchant_deposits"
- " LEFT OUTER JOIN merchant_refunds USING
coin_pub"
- " WHERE merchant_deposits.coin_pub=$1"
- " GROUP BY merchant_deposits.coin_pub",
+ " LEFT OUTER JOIN merchant_refunds USING
(coin_pub)"
+ " WHERE merchant_deposits.coin_pub=$1",
+ /*FIXME, need a GROUP BY coin_pub here*/
1),
GNUNET_PQ_make_prepare ("insert_transaction",
"INSERT INTO merchant_transactions"
@@ -349,6 +353,9 @@ postgres_initialize (void *cls)
",deposit_fee_val"
",deposit_fee_frac"
",deposit_fee_curr"
+ ",refund_fee_val"
+ ",refund_fee_frac"
+ ",refund_fee_curr"
",exchange_proof"
" FROM merchant_deposits"
" WHERE h_contract_terms=$1"
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: fix lib testcase,
gnunet <=