more work on SQL refactoring

1 files changed, 113 insertions, 19 deletions

diff --git a/src/exchangedb/0002-wad_in_entries.sql b/src/exchangedb/0002-wad_in_entries.sql
index cc8b0a6fb..b8099f8dd 100644
--- a/src/exchangedb/0002-wad_in_entries.sql
+++ b/src/exchangedb/0002-wad_in_entries.sql
@@ -14,8 +14,8 @@
 -- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 --
 
-CREATE OR REPLACE FUNCTION create_table_wad_in_entries(
-  IN shard_suffix VARCHAR DEFAULT NULL
+CREATE FUNCTION create_table_wad_in_entries(
+  IN partition_suffix VARCHAR DEFAULT NULL
 )
 RETURNS VOID
 LANGUAGE plpgsql
@@ -23,11 +23,10 @@ AS $$
 DECLARE
   table_name VARCHAR DEFAULT 'wad_in_entries';
 BEGIN
-
   PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_in_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_in_serial_id INT8' -- REFERENCES wads_in (wad_in_serial_id) ON DELETE CASCADE
+    'CREATE TABLE %I '
+      '(wad_in_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',wad_in_serial_id INT8'
       ',reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)'
       ',purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
       ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
@@ -44,14 +43,96 @@ BEGIN
     ') %s ;'
     ,table_name
     ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'list of purses aggregated in a wad according to the sending exchange'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'wad for which the given purse was included in the aggregation'
+    ,'wad_in_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'target account of the purse (must be at the local exchange)'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'public key of the purse that was merged'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'hash of the contract terms of the purse'
+    ,'h_contract'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Time when the purse was set to expire'
+    ,'purse_expiration'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Time when the merge was approved'
+    ,'merge_timestamp'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total amount in the purse'
+    ,'amount_with_fee_val'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total wad fees paid by the purse'
+    ,'wad_fee_val'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total deposit fees paid when depositing coins into the purse'
+    ,'deposit_fees_val'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature by the receiving reserve, of purpose TALER_SIGNATURE_ACCOUNT_MERGE'
+    ,'reserve_sig'
+    ,table_name
+    ,partition_suffix
   );
+  PERFORM comment_partitioned_column(
+     'Signature by the purse of purpose TALER_SIGNATURE_PURSE_MERGE'
+    ,'purse_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
 
-  table_name = concat_ws('_', table_name, shard_suffix);
+CREATE FUNCTION constrain_table_wad_in_entries(
+  IN partition_suffix VARCHAR
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name VARCHAR DEFAULT 'wad_in_entries';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
 
   -- FIXME: change to materialized index by reserve_pub!
   EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_reserve_pub '
+    'CREATE INDEX ' || table_name || '_reserve_pub '
     'ON ' || table_name || ' '
     '(reserve_pub);'
   );
@@ -59,24 +140,27 @@ BEGIN
     'COMMENT ON INDEX ' || table_name || '_reserve_pub '
     'IS ' || quote_literal('needed in reserve history computation') || ';'
   );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_wad_in_entry_serial_id_key'
+    ' UNIQUE (wad_in_entry_serial_id) '
+  );
+END $$;
 
-END
-$$;
 
-CREATE OR REPLACE FUNCTION add_constraints_to_wad_in_entries_partition(
-  IN partition_suffix VARCHAR
-)
+CREATE FUNCTION foreign_table_wad_in_entries()
 RETURNS VOID
 LANGUAGE plpgsql
 AS $$
+DECLARE
+  table_name VARCHAR DEFAULT 'wad_in_entries';
 BEGIN
   EXECUTE FORMAT (
-    'ALTER TABLE wad_in_entries_' || partition_suffix || ' '
-      'ADD CONSTRAINT wad_in_entries_' || partition_suffix || '_wad_in_entry_serial_id_key '
-        'UNIQUE (wad_in_entry_serial_id) '
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_wad_in'
+    ' REFERENCES wads_in (wad_in_serial_id) ON DELETE CASCADE'
   );
-END
-$$;
+END $$;
 
 
 INSERT INTO exchange_tables
@@ -90,4 +174,14 @@ INSERT INTO exchange_tables
     ,'exchange-0002'
     ,'create'
     ,TRUE
+    ,FALSE),
+    ('wad_in_entries'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('wad_in_entries'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
     ,FALSE);