summaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-10-13 01:37:32 +0200
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-10-13 01:37:32 +0200
commit500b6456966cdcce2ed10a92870f5a1c82e34168 (patch)
treec107f5a8ae02f492f104c71c7cf334d0c9882873 /src/backend
parent9e2795084737fa588a0b0552ca04cbd165aba10b (diff)
downloadmerchant-500b6456966cdcce2ed10a92870f5a1c82e34168.tar.gz
merchant-500b6456966cdcce2ed10a92870f5a1c82e34168.tar.bz2
merchant-500b6456966cdcce2ed10a92870f5a1c82e34168.zip
making (transaction_id, merchant_pub) the primary key
for table merchant_transactions, and making merchant_deposit reference (transaction_id, merchant_pub) in merchant_transactions. Adjusting testcase accordingly, as we now can have clashes on transaction_id. Test NOT passed.
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/taler-merchant-httpd_pay.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
index 87495580..405c7cbf 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -389,6 +389,7 @@ deposit_cb (void *cls,
if (GNUNET_OK !=
db->store_deposit (db->cls,
pc->transaction_id,
+ &pc->mi->pubkey,
&dc->coin_pub,
&dc->amount_with_fee,
&dc->deposit_fee,