[taler-merchant] 03/03: last changes for the implementation of pos_key and pos_algo in the templates table and function

[gnunet]

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

priscilla-huang pushed a commit to branch master
in repository merchant.

commit 80b826aca4431570da885debd78cb75de81512db
Author: priscilla <priscilla.huang@efrei.net>
AuthorDate: Tue Feb 21 12:53:52 2023 -0500

    last changes for the implementation of pos_key and pos_algo in the 
templates table and function
---
 src/backenddb/plugin_merchantdb_postgres.c | 2 +-
 src/backenddb/test_merchantdb.c            | 1 -
 2 files changed, 1 insertion(+), 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;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.