From a4c5cda0a40ef1987d93b7aacaa7caa993f8b838 Mon Sep 17 00:00:00 2001 From: Christian Blättler Date: Wed, 20 Mar 2024 07:53:49 +0100 Subject: first smoke tests --- src/backenddb/pg_lookup_token_family_key.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/backenddb') diff --git a/src/backenddb/pg_lookup_token_family_key.c b/src/backenddb/pg_lookup_token_family_key.c index 0ee7f428..e35a0a58 100644 --- a/src/backenddb/pg_lookup_token_family_key.c +++ b/src/backenddb/pg_lookup_token_family_key.c @@ -58,9 +58,9 @@ TMH_PG_lookup_token_family_key (void *cls, char *cipher; struct GNUNET_PQ_ResultSpec rs[] = { - GNUNET_PQ_result_spec_auto_from_type ("h_pub", - &details->pub_h), // TODO: Figure out how to parse keys + // GNUNET_PQ_result_spec_auto_from_type ("h_pub", + // &details->pub_h), // GNUNET_PQ_result_spec_auto_from_type ("pub", // &details->pub), // GNUNET_PQ_result_spec_auto_from_type ("priv", @@ -71,6 +71,10 @@ TMH_PG_lookup_token_family_key (void *cls, &details->token_family.slug), GNUNET_PQ_result_spec_string ("name", &details->token_family.name), + GNUNET_PQ_result_spec_timestamp ("merchant_token_family_keys.valid_after", + &details->valid_after), + GNUNET_PQ_result_spec_timestamp ("merchant_token_family_keys.valid_before", + &details->valid_before), GNUNET_PQ_result_spec_string ("description", &details->token_family.description), TALER_PQ_result_spec_json ("description_i18n", @@ -98,8 +102,8 @@ TMH_PG_lookup_token_family_key (void *cls, ",pub" ",priv" ",cipher" - ",valid_after" - ",valid_before" + ",merchant_token_family_keys.valid_after" + ",merchant_token_family_keys.valid_before" ",slug" ",name" ",description" @@ -116,7 +120,7 @@ TMH_PG_lookup_token_family_key (void *cls, " JOIN merchant_instances" " USING (merchant_serial)" " WHERE merchant_instances.merchant_id=$1" - " AND merchant_token_families.slug=$2"); + " AND h_pub=$2"); enum GNUNET_DB_QueryStatus qs; qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn, "lookup_token_family_key", -- cgit v1.2.3