-fix drop SQL issue: drop functions properly

2 files changed, 11 insertions, 8 deletions

diff --git a/src/exchangedb/drop0001.sql b/src/exchangedb/drop0001.sql
index 27595b819..fa453fd69 100644
--- a/src/exchangedb/drop0001.sql
+++ b/src/exchangedb/drop0001.sql
@@ -79,12 +79,15 @@ DROP TABLE IF EXISTS denominations CASCADE;
 DROP TABLE IF EXISTS cs_nonce_locks CASCADE;
 DROP FUNCTION IF EXISTS add_constraints_to_cs_nonce_locks_partition;
 
-DROP FUNCTION IF EXISTS exchange_do_withdraw(bigint,int,bytea,bytea,bytea,bytea,bytea,bigint,bigint) ;
-
-DROP FUNCTION IF EXISTS exchange_do_withdraw_limit_check(bytea,bigint,bigint,int) ;
-
-DROP FUNCTION IF EXISTS reserves_out_by_reserve_insert_trigger();
-DROP FUNCTION IF EXISTS reserves_out_by_reserve_delete_trigger();
+DROP FUNCTION IF EXISTS exchange_do_withdraw;
+DROP FUNCTION IF EXISTS exchange_do_withdraw_limit_check;
+
+DROP FUNCTION IF EXISTS recoup_insert_trigger;
+DROP FUNCTION IF EXISTS recoup_delete_trigger;
+DROP FUNCTION IF EXISTS deposits_by_coin_insert_trigger;
+DROP FUNCTION IF EXISTS deposits_by_coin_delete_trigger;
+DROP FUNCTION IF EXISTS reserves_out_by_reserve_insert_trigger;
+DROP FUNCTION IF EXISTS reserves_out_by_reserve_delete_trigger;
 
 DROP FUNCTION IF EXISTS exchange_do_deposit;
 
diff --git a/src/exchangedb/exchange-0001.sql b/src/exchangedb/exchange-0001.sql
index 0e49a9fc4..a12789c5e 100644
--- a/src/exchangedb/exchange-0001.sql
+++ b/src/exchangedb/exchange-0001.sql
@@ -1405,10 +1405,10 @@ COMMENT ON COLUMN partners.master_sig
 
 CREATE TABLE IF NOT EXISTS mergers
   (merge_request_serial_id BIGSERIAL UNIQUE
-  ,reserve_pub BYTEA NOT NULL REFERENCES reserves (reserve_pub) ON DELETE CASCADE
   ,partner_serial_id INT8 REFERENCES partners(partner_serial_id) ON DELETE CASCADE
-  ,purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)
+  ,reserve_pub BYTEA NOT NULL REFERENCES reserves (reserve_pub) ON DELETE CASCADE
   ,reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)
+  ,purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)
   ,purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)
   ,merge_timestamp INT8 NOT NULL
   ,purse_expiration INT8 NOT NULL