aboutsummaryrefslogtreecommitdiff
path: root/src/backenddb
diff options
context:
space:
mode:
Diffstat (limited to 'src/backenddb')
-rw-r--r--src/backenddb/merchant-0008.sql2
-rw-r--r--src/backenddb/pg_lookup_token_family.c6
-rw-r--r--src/backenddb/pg_lookup_token_family_key.c6
3 files changed, 8 insertions, 6 deletions
diff --git a/src/backenddb/merchant-0008.sql b/src/backenddb/merchant-0008.sql
index bb8beb73..4dec99d5 100644
--- a/src/backenddb/merchant-0008.sql
+++ b/src/backenddb/merchant-0008.sql
@@ -48,5 +48,7 @@ ALTER TABLE merchant_token_families ADD COLUMN rounding BIGINT NOT NULL;
COMMENT ON COLUMN merchant_token_families.rounding
IS 'Token start date rounding granularity.';
+ALTER TABLE merchant_token_families RENAME COLUMN redeemed TO used;
+
-- Complete transaction
COMMIT;
diff --git a/src/backenddb/pg_lookup_token_family.c b/src/backenddb/pg_lookup_token_family.c
index d2c651c9..e5c9d518 100644
--- a/src/backenddb/pg_lookup_token_family.c
+++ b/src/backenddb/pg_lookup_token_family.c
@@ -73,8 +73,8 @@ TMH_PG_lookup_token_family (void *cls,
&kind),
GNUNET_PQ_result_spec_uint64 ("issued",
&details->issued),
- GNUNET_PQ_result_spec_uint64 ("redeemed",
- &details->redeemed),
+ GNUNET_PQ_result_spec_uint64 ("used",
+ &details->used),
GNUNET_PQ_result_spec_end
};
@@ -91,7 +91,7 @@ TMH_PG_lookup_token_family (void *cls,
",duration"
",kind"
",issued"
- ",redeemed"
+ ",used"
" FROM merchant_token_families"
" JOIN merchant_instances"
" USING (merchant_serial)"
diff --git a/src/backenddb/pg_lookup_token_family_key.c b/src/backenddb/pg_lookup_token_family_key.c
index a0a5fab1..7883339b 100644
--- a/src/backenddb/pg_lookup_token_family_key.c
+++ b/src/backenddb/pg_lookup_token_family_key.c
@@ -98,8 +98,8 @@ TMH_PG_lookup_token_family_key (void *cls,
&kind),
GNUNET_PQ_result_spec_uint64 ("issued",
&details->token_family.issued),
- GNUNET_PQ_result_spec_uint64 ("redeemed",
- &details->token_family.redeemed),
+ GNUNET_PQ_result_spec_uint64 ("used",
+ &details->token_family.used),
GNUNET_PQ_result_spec_end
};
@@ -126,7 +126,7 @@ TMH_PG_lookup_token_family_key (void *cls,
",duration"
",kind"
",issued"
- ",redeemed"
+ ",used"
" FROM merchant_token_families"
" LEFT JOIN merchant_token_family_keys"
" ON merchant_token_families.token_family_serial = merchant_token_family_keys.token_family_serial"