complete taler-merchant-depositcheck, 1st iteration, without testing

1 files changed, 19 insertions, 16 deletions

diff --git a/src/backenddb/pg_insert_deposit_to_transfer.c b/src/backenddb/pg_insert_deposit_to_transfer.c
index ddd9d254..1baf8963 100644
--- a/src/backenddb/pg_insert_deposit_to_transfer.c
+++ b/src/backenddb/pg_insert_deposit_to_transfer.c
@@ -36,29 +36,32 @@ TMH_PG_insert_deposit_to_transfer (
   struct GNUNET_PQ_QueryParam params[] = {
     GNUNET_PQ_query_param_uint64 (&deposit_serial),
     TALER_PQ_query_param_amount_with_currency (pg->conn,
-                                 &dd->coin_contribution),
+                                               &dd->coin_contribution),
     GNUNET_PQ_query_param_timestamp (&dd->execution_time),
     GNUNET_PQ_query_param_auto_from_type (&dd->exchange_sig),
     GNUNET_PQ_query_param_auto_from_type (&dd->exchange_pub),
     GNUNET_PQ_query_param_auto_from_type (&dd->wtid),
     GNUNET_PQ_query_param_end
   };
+  bool wpc;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("out_wire_pending_cleared",
+                                &wpc),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
 
   PREPARE (pg,
            "insert_deposit_to_transfer",
-           "INSERT INTO merchant_deposit_to_transfer"
-           "(deposit_serial"
-           ",coin_contribution_value"
-           ",credit_serial"
-           ",execution_time"
-           ",signkey_serial"
-           ",exchange_sig"
-           ") SELECT $1, $2, credit_serial, $3, signkey_serial, $4"
-           " FROM merchant_transfers"
-           " CROSS JOIN merchant_exchange_signing_keys"
-           " WHERE exchange_pub=$5"
-           "   AND wtid=$6");
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_deposit_to_transfer",
-                                             params);
+           "SELECT out_wire_cleared"
+           " FROM merchant_insert_deposit_to_transfer"
+           " ($1,$2,$3,$4,$5,$6);");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "insert_deposit_to_transfer",
+                                                 params,
+                                                 rs);
+  if (wpc)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Wire pending flag cleared (good!)\n");
+  return qs;
 }