aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpriscilla <priscilla.huang@efrei.net>2023-02-21 12:53:52 -0500
committerpriscilla <priscilla.huang@efrei.net>2023-02-21 12:53:52 -0500
commit80b826aca4431570da885debd78cb75de81512db (patch)
tree342be69c7ae6040e28662c40e937a2ea759cde72
parent052e3b55b3af20ac744251b9e945af4611422e9f (diff)
last changes for the implementation of pos_key and pos_algo in the templates table and function
-rw-r--r--src/backenddb/plugin_merchantdb_postgres.c2
-rw-r--r--src/backenddb/test_merchantdb.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index af028c72..a5501e1d 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -10414,7 +10414,7 @@ postgres_connect (void *cls)
",template_contract"
")"
" SELECT merchant_serial,"
- " $2, $3, $4, $5"
+ " $2, $3, $4, $5, $6"
" FROM merchant_instances"
" WHERE merchant_id=$1"),
/* for postgres_update_template() */
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index 7b51138f..3d7d6b8c 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -6913,7 +6913,6 @@ check_templates_equal (const struct TALER_MERCHANTDB_TemplateDetails *a,
( (NULL == a->pos_key) && (NULL != b->pos_key)) ||
( (NULL != a->pos_key) && (NULL == b->pos_key)) ||
( (NULL != a->pos_key) && (0 != strcmp (a->pos_key, b->pos_key))) ||
- ( a->pos_algorithm != b->pos_algorithm ) ||
(1 != json_equal (a->template_contract,
b->template_contract)))
return 1;