summaryrefslogtreecommitdiff
path: root/src/backenddb
diff options
context:
space:
mode:
authorChristian Blättler <blatc2@bfh.ch>2024-03-20 07:53:49 +0100
committerChristian Blättler <blatc2@bfh.ch>2024-03-20 07:53:49 +0100
commita4c5cda0a40ef1987d93b7aacaa7caa993f8b838 (patch)
treeb58e42d775d9d8cbd83b5d6cb2db00391fc6a8c8 /src/backenddb
parent4ebac01e89badb29d361b49310cdd1cc6397b563 (diff)
downloadmerchant-a4c5cda0a40ef1987d93b7aacaa7caa993f8b838.tar.gz
merchant-a4c5cda0a40ef1987d93b7aacaa7caa993f8b838.tar.bz2
merchant-a4c5cda0a40ef1987d93b7aacaa7caa993f8b838.zip
first smoke tests
Diffstat (limited to 'src/backenddb')
-rw-r--r--src/backenddb/pg_lookup_token_family_key.c14
1 files changed, 9 insertions, 5 deletions
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",