diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-03-23 21:02:17 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-03-23 21:02:17 +0100 |
| commit | 8a5af3478c7b347c6e75d881fb8050518f8006ad (patch) | |
| tree | 97755a00f3d466bd7af9436b75318859a60d6009 | |
| parent | 62a1f25394868a1a4f3f8132fc7fa68f2f64be64 (diff) | |
| download | merchant-8a5af3478c7b347c6e75d881fb8050518f8006ad.tar.gz merchant-8a5af3478c7b347c6e75d881fb8050518f8006ad.tar.bz2 merchant-8a5af3478c7b347c6e75d881fb8050518f8006ad.zip | |
Fix #4970.
| -rw-r--r-- | src/backend/taler-merchant-httpd_history.c | 8 | ||||
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/taler-merchant-httpd_history.c b/src/backend/taler-merchant-httpd_history.c index a1f3f119..967aa04b 100644 --- a/src/backend/taler-merchant-httpd_history.c +++ b/src/backend/taler-merchant-httpd_history.c @@ -55,6 +55,10 @@ pd_cb (void *cls, json_t *timestamp; json_t *instance; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "/history's row_id: %llu\n", + row_id); + GNUNET_assert (-1 != json_unpack ((json_t *) proposal_data, "{s:o, s:o, s:{s:o}}", "amount", &amount, @@ -199,10 +203,6 @@ MH_handler_history (struct TMH_RequestHandler *rh, TALER_EC_HISTORY_DB_FETCH_ERROR, "db error to get history"); } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "history data: %s\n", - json_dumps (response, JSON_INDENT (1))); - ret = TMH_RESPONSE_reply_json (connection, response, MHD_HTTP_OK); diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 719bb645..75e9f3cf 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -965,14 +965,14 @@ postgres_find_proposal_data_by_date (void *cls, { char *order_id; json_t *proposal_data; - unsigned int row_id; + uint64_t row_id; struct GNUNET_PQ_ResultSpec rs[] = { GNUNET_PQ_result_spec_string ("order_id", &order_id), TALER_PQ_result_spec_json ("proposal_data", &proposal_data), - GNUNET_PQ_result_spec_uint32 ("row_id", + GNUNET_PQ_result_spec_uint64 ("row_id", &row_id), GNUNET_PQ_result_spec_end }; |