merchant

commit 4ea89c32b30dac40b82ac7934285b2504ab55f45
parent 13b98385093074de4554f8de1df70a548de172ab
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed,  3 Jun 2026 22:49:16 +0200

fix again (third time is a charm)

Diffstat:
M
src/backend/taler-merchant-httpd_post-private-orders.c
 | 
5
+++--
M
src/backenddb/lookup_token_family_key.c
 | 
8
++++----

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_post-private-orders.c b/src/backend/taler-merchant-httpd_post-private-orders.c
@@ -1795,10 +1795,11 @@ add_output_token_family (struct OrderContext *oc,
     return GNUNET_SYSERR;
   case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Output token family slug %s unknown at %llu for %llu\n",
+                "Output token family slug %s unknown at %llu for %llu for instance %s\n",
                 slug,
                 (unsigned long long) valid_at.abs_time.abs_value_us,
-                (unsigned long long) oc->parse_order.order->pay_deadline.abs_time.abs_value_us);
+                (unsigned long long) oc->parse_order.order->pay_deadline.abs_time.abs_value_us,
+                oc->hc->instance->settings.id);
     reply_with_error (oc,
                       MHD_HTTP_NOT_FOUND,
                       TALER_EC_MERCHANT_PRIVATE_POST_ORDERS_TOKEN_FAMILY_SLUG_UNKNOWN,
diff --git a/src/backenddb/lookup_token_family_key.c b/src/backenddb/lookup_token_family_key.c
@@ -124,11 +124,11 @@ TALER_MERCHANTDB_lookup_token_family_key (
                        ",used"
                        " FROM merchant_token_families mtf"
                        " LEFT JOIN merchant_token_family_keys mtfk"
-                       "  USING (token_family_serial)"
+                       "  ON ( (mtf.token_family_serial = mtfk.token_family_serial)"
+                       "   AND ($2 >= mtfk.signature_validity_start)"
+                       "   AND ($2 <= mtfk.signature_validity_end)"
+                       "   AND ($3 <= mtfk.private_key_deleted_at) )"
                        " WHERE slug=$1"
-                       "   AND COALESCE ($2 >= mtfk.signature_validity_start, TRUE)"
-                       "   AND COALESCE ($2 <= mtfk.signature_validity_end, TRUE)"
-                       "   AND COALESCE ($3 <= mtfk.private_key_deleted_at, TRUE)"
                        " ORDER BY mtfk.signature_validity_start ASC"
                        " LIMIT 1");
   memset (details,