diff options
| author | priscilla <priscilla.huang@efrei.net> | 2023-02-20 04:40:12 -0500 |
|---|---|---|
| committer | priscilla <priscilla.huang@efrei.net> | 2023-02-20 12:19:40 -0500 |
| commit | 83c11d7428c6d4ba2e1749630724c39811a24241 (patch) | |
| tree | f9b51c1c2b718166185a8d5338d21271996c2358 /src/backenddb/plugin_merchantdb_postgres.c | |
| parent | 69341625aad4b0a1b3642103226f11c2ec4d943c (diff) | |
| download | merchant-83c11d7428c6d4ba2e1749630724c39811a24241.tar.gz merchant-83c11d7428c6d4ba2e1749630724c39811a24241.tar.bz2 merchant-83c11d7428c6d4ba2e1749630724c39811a24241.zip | |
pull changes
Diffstat (limited to 'src/backenddb/plugin_merchantdb_postgres.c')
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 9f07d3aa..836eb07a 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -6875,9 +6875,9 @@ postgres_insert_template (void *cls, GNUNET_PQ_query_param_string (instance_id), GNUNET_PQ_query_param_string (template_id), GNUNET_PQ_query_param_string (td->template_description), - (NULL == td->image) + (NULL == td->pos_key) ? GNUNET_PQ_query_param_null () - : GNUNET_PQ_query_param_string (td->image), + : GNUNET_PQ_query_param_string (td->pos_key), TALER_PQ_query_param_json (td->template_contract), GNUNET_PQ_query_param_end }; @@ -6911,9 +6911,9 @@ postgres_update_template (void *cls, GNUNET_PQ_query_param_string (instance_id), GNUNET_PQ_query_param_string (template_id), GNUNET_PQ_query_param_string (td->template_description), - (NULL == td->image) + (NULL == td->pos_key) ? GNUNET_PQ_query_param_null () - : GNUNET_PQ_query_param_string (td->image), + : GNUNET_PQ_query_param_string (td->pos_key), TALER_PQ_query_param_json (td->template_contract), GNUNET_PQ_query_param_end }; @@ -7074,8 +7074,8 @@ postgres_lookup_template (void *cls, GNUNET_PQ_result_spec_string ("template_description", &td->template_description), GNUNET_PQ_result_spec_allow_null ( - GNUNET_PQ_result_spec_string ("image", - &td->image), + GNUNET_PQ_result_spec_string ("pos_key", + &td->pos_key), NULL), TALER_PQ_result_spec_json ("template_contract", &td->template_contract), @@ -7083,7 +7083,7 @@ postgres_lookup_template (void *cls, }; check_connection (pg); - td->image = NULL; + td->pos_key = NULL; return GNUNET_PQ_eval_prepared_singleton_select (pg->conn, "lookup_template", params, @@ -10274,7 +10274,7 @@ postgres_connect (void *cls) GNUNET_PQ_make_prepare ("lookup_template", "SELECT" " template_description" - ",image" + ",pos_key" ",template_contract" " FROM merchant_template" " JOIN merchant_instances" @@ -10296,7 +10296,7 @@ postgres_connect (void *cls) "(merchant_serial" ",template_id" ",template_description" - ",image" + ",pos_key" ",template_contract" ")" " SELECT merchant_serial," @@ -10307,7 +10307,7 @@ postgres_connect (void *cls) GNUNET_PQ_make_prepare ("update_template", "UPDATE merchant_template SET" " template_description=$3" - ",image=$4" + ",pos_key=$4" ",template_contract=$5" " WHERE merchant_serial=" " (SELECT merchant_serial" |