[GNUnet-SVN] [taler-merchant] branch master updated (4073fec -> 8a5af34)

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a change to branch master
in repository merchant.

    from 4073fec  Fix #4968.
     new 62a1f25  Fix signature of db callback.
     new 8a5af34  Fix #4970.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/backend/taler-merchant-httpd_history.c | 13 ++++++-------
 src/backenddb/plugin_merchantdb_postgres.c |  8 ++++----
 src/backenddb/test_merchantdb.c            |  2 +-
 src/include/taler_merchantdb_plugin.h      |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_history.c 
b/src/backend/taler-merchant-httpd_history.c
index eecb156..967aa04 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -46,7 +46,7 @@ static unsigned int delta;
 static void
 pd_cb (void *cls,
        const char *order_id,
-       unsigned int row_id,
+       uint64_t row_id,
        const json_t *proposal_data)
 {
   json_t *response = cls;
@@ -54,7 +54,10 @@ pd_cb (void *cls,
   json_t *amount;
   json_t *timestamp;
   json_t *instance;
-  uint64_t r64 = (uint64_t) row_id;
+
+  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}}",
@@ -63,7 +66,7 @@ pd_cb (void *cls,
                                     "merchant", "instance", &instance));
 
   GNUNET_break (NULL != (entry = json_pack ("{s:I, s:s, s:O, s:O, s:O}",
-                                            "row_id", r64,
+                                            "row_id", row_id,
                                             "order_id", order_id,
                                             "amount", amount,
                                             "timestamp", timestamp,
@@ -200,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 ff1aafc..75e9f3c 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -880,14 +880,14 @@ postgres_find_proposal_data_by_date_and_range (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
     };
@@ -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
     };
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index f4300b2..cb606c0 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -199,7 +199,7 @@ transaction_cb (void *cls,
 static void
 pd_cb (void *cls,
        const char *order_id,
-       unsigned int row_id,
+       uint64_t row_id,
        const json_t *proposal_data)
 {
   return;
diff --git a/src/include/taler_merchantdb_plugin.h 
b/src/include/taler_merchantdb_plugin.h
index f6cbcd3..610acb7 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -42,7 +42,7 @@ struct TALER_MERCHANTDB_Plugin;
  typedef void
  (*TALER_MERCHANTDB_ProposalDataCallback)(void *cls,
                                           const char *order_id,
-                                          unsigned int row_id,
+                                          uint64_t row_id,
                                           const json_t *proposal_data);
 
 /**

-- 
To stop receiving notification emails like this one, please contact
address@hidden