diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2021-11-02 23:47:39 +0100 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2021-11-02 23:47:39 +0100 |
| commit | e5096a1efbe27caa3802372046f06175cae24f69 (patch) | |
| tree | 1077115d471314c9123b7f0a56d58151cc1ffe43 | |
| parent | 2a8855b5000b8247c927cb33fcc7c53229fffa44 (diff) | |
| download | merchant-e5096a1efbe27caa3802372046f06175cae24f69.tar.gz merchant-e5096a1efbe27caa3802372046f06175cae24f69.tar.bz2 merchant-e5096a1efbe27caa3802372046f06175cae24f69.zip | |
get backenddb test to pass
| m--------- | contrib/merchant-backoffice | 0 | ||||
| -rw-r--r-- | src/backenddb/drop0001.sql | 24 | ||||
| -rw-r--r-- | src/backenddb/merchant-0001.sql | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice -Subproject 824aa7a80b4c2e63d23985751f34c9492d396a3 +Subproject 182cdfffa1d4b6f2bb3543d30cfa7509e73bda0 diff --git a/src/backenddb/drop0001.sql b/src/backenddb/drop0001.sql index 4a028bab..d7171e9d 100644 --- a/src/backenddb/drop0001.sql +++ b/src/backenddb/drop0001.sql @@ -23,6 +23,18 @@ BEGIN; -- Unlike the other SQL files, it SHOULD be updated to reflect the -- latest requirements for dropping tables. +-- Unregister patch (0003.sql) +SELECT _v.unregister_patch('merchant-0003'); + +-- Unregister patch (0002.sql) +SELECT _v.unregister_patch('merchant-0002'); + +-- Unregister patch (0001.sql) +SELECT _v.unregister_patch('merchant-0001'); + + +DROP TABLE IF EXISTS merchant_kyc CASCADE; + -- Drops for 0001.sql DROP TABLE IF EXISTS merchant_exchange_wire_fees CASCADE; @@ -51,18 +63,6 @@ DROP TABLE IF EXISTS merchant_tips CASCADE; DROP TABLE IF EXISTS merchant_tip_pickups CASCADE; DROP TABLE IF EXISTS merchant_tip_pickup_signatures CASCADE; --- Unregister patch (0001.sql) -SELECT _v.unregister_patch('merchant-0001'); - --- Unregister patch (0002.sql) -SELECT _v.unregister_patch('merchant-0002'); - -DROP TABLE IF EXISTS merchant_kyc CASCADE; - --- Unregister patch (0003.sql) -SELECT _v.unregister_patch('merchant-0003'); - - -- And we're out of here... COMMIT; diff --git a/src/backenddb/merchant-0001.sql b/src/backenddb/merchant-0001.sql index 9e769067..a4058a8a 100644 --- a/src/backenddb/merchant-0001.sql +++ b/src/backenddb/merchant-0001.sql @@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS merchant_accounts ,merchant_serial BIGINT NOT NULL REFERENCES merchant_instances (merchant_serial) ON DELETE CASCADE ,h_wire BYTEA NOT NULL CHECK (LENGTH(h_wire)=64) - ,salt BYTEA NOT NULL CHECK (LENGTH(salt)=64) -- FIXME: eventually migrate to 16-bit salt value here! #7032 + ,salt BYTEA NOT NULL CHECK (LENGTH(salt)=16) ,payto_uri VARCHAR NOT NULL ,active BOOLEAN NOT NULL ,UNIQUE (merchant_serial,payto_uri) |