1 files changed, 11 insertions, 20 deletions
diff --git a/src/exchangedb/0002-wad_out_entries.sql b/src/exchangedb/0002-wad_out_entries.sql
index 45a4813cb..de921637b 100644
--- a/src/exchangedb/0002-wad_out_entries.sql
+++ b/src/exchangedb/0002-wad_out_entries.sql
@@ -16,13 +16,13 @@
 
 
 CREATE FUNCTION create_table_wad_out_entries(
-  IN partition_suffix VARCHAR DEFAULT NULL
+  IN partition_suffix TEXT DEFAULT NULL
 )
 RETURNS VOID
 LANGUAGE plpgsql
 AS $$
 DECLARE
-  table_name VARCHAR DEFAULT 'wad_out_entries';
+  table_name TEXT DEFAULT 'wad_out_entries';
 BEGIN
   PERFORM create_partitioned_table(
      'CREATE TABLE %I '
@@ -33,12 +33,9 @@ BEGIN
      ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
      ',purse_expiration INT8 NOT NULL'
      ',merge_timestamp INT8 NOT NULL'
-     ',amount_with_fee_val INT8 NOT NULL'
-     ',amount_with_fee_frac INT4 NOT NULL'
-     ',wad_fee_val INT8 NOT NULL'
-     ',wad_fee_frac INT4 NOT NULL'
-     ',deposit_fees_val INT8 NOT NULL'
-     ',deposit_fees_frac INT4 NOT NULL'
+     ',amount_with_fee taler_amount NOT NULL'
+     ',wad_fee taler_amount NOT NULL'
+     ',deposit_fees taler_amount NOT NULL'
      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
      ',purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)'
      ') %s ;'
@@ -89,19 +86,19 @@ BEGIN
   );
   PERFORM comment_partitioned_column(
      'Total amount in the purse'
-    ,'amount_with_fee_val'
+    ,'amount_with_fee'
     ,table_name
     ,partition_suffix
   );
   PERFORM comment_partitioned_column(
     'Wad fee charged to the purse'
-    ,'wad_fee_val'
+    ,'wad_fee'
     ,table_name
     ,partition_suffix
   );
   PERFORM comment_partitioned_column(
      'Total deposit fees charged to the purse'
-    ,'deposit_fees_val'
+    ,'deposit_fees'
     ,table_name
     ,partition_suffix
   );
@@ -122,22 +119,16 @@ $$;
 
 
 CREATE FUNCTION constrain_table_wad_out_entries(
-  IN partition_suffix VARCHAR
+  IN partition_suffix TEXT
 )
 RETURNS VOID
 LANGUAGE plpgsql
 AS $$
 DECLARE
-  table_name VARCHAR DEFAULT 'wad_out_entries';
+  table_name TEXT DEFAULT 'wad_out_entries';
 BEGIN
   table_name = concat_ws('_', table_name, partition_suffix);
 
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX ' || table_name || '_by_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
   EXECUTE FORMAT (
     'ALTER TABLE ' || table_name ||
     ' ADD CONSTRAINT ' || table_name || '_wad_out_entry_serial_id_key'
@@ -152,7 +143,7 @@ RETURNS VOID
 LANGUAGE plpgsql
 AS $$
 DECLARE
-  table_name VARCHAR DEFAULT 'wad_out_entries';
+  table_name TEXT DEFAULT 'wad_out_entries';
 BEGIN
   EXECUTE FORMAT (
     'ALTER TABLE ' || table_name ||