1 files changed, 31 insertions, 11 deletions
diff --git a/src/exchangedb/pg_do_reserve_open.c b/src/exchangedb/pg_do_reserve_open.c
index 542d1f468..b15c96dd1 100644
--- a/src/exchangedb/pg_do_reserve_open.c
+++ b/src/exchangedb/pg_do_reserve_open.c
@@ -38,44 +38,64 @@ TEH_PG_do_reserve_open (
   struct GNUNET_TIME_Timestamp now,
   const struct TALER_Amount *open_fee,
   bool *no_funds,
+  struct TALER_Amount *reserve_balance,
   struct TALER_Amount *open_cost,
   struct GNUNET_TIME_Timestamp *final_expiration)
 {
   struct PostgresClosure *pg = cls;
   struct GNUNET_PQ_QueryParam params[] = {
     GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    TALER_PQ_query_param_amount (total_paid),
-    TALER_PQ_query_param_amount (reserve_payment),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      total_paid),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      reserve_payment),
     GNUNET_PQ_query_param_uint32 (&min_purse_limit),
     GNUNET_PQ_query_param_uint32 (&pg->def_purse_limit),
     GNUNET_PQ_query_param_auto_from_type (reserve_sig),
     GNUNET_PQ_query_param_timestamp (&desired_expiration),
     GNUNET_PQ_query_param_relative_time (&pg->legal_reserve_expiration_time),
     GNUNET_PQ_query_param_timestamp (&now),
-    TALER_PQ_query_param_amount (open_fee),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 open_fee),
     GNUNET_PQ_query_param_end
   };
+  bool no_reserve = true;
   struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("out_open_cost",
+    TALER_PQ_result_spec_amount ("out_open_cost",
+                                 pg->currency,
                                  open_cost),
+    TALER_PQ_result_spec_amount ("out_reserve_balance",
+                                 pg->currency,
+                                 reserve_balance),
     GNUNET_PQ_result_spec_timestamp ("out_final_expiration",
                                      final_expiration),
+    GNUNET_PQ_result_spec_bool ("out_no_reserve",
+                                &no_reserve),
     GNUNET_PQ_result_spec_bool ("out_no_funds",
                                 no_funds),
     GNUNET_PQ_result_spec_end
   };
+  enum GNUNET_DB_QueryStatus qs;
 
   PREPARE (pg,
            "do_reserve_open",
            "SELECT "
-           " out_open_cost_val"
-           ",out_open_cost_frac"
+           " out_open_cost"
            ",out_final_expiration"
            ",out_no_funds"
+           ",out_no_reserve"
+           ",out_reserve_balance"
            " FROM exchange_do_reserve_open"
-           " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13);");
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "do_reserve_open",
-                                                   params,
-                                                   rs);
+           " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10);");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "do_reserve_open",
+                                                 params,
+                                                 rs);
+  if (qs <= 0)
+    return qs;
+  if (no_reserve)
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  return qs;
 }