exchange

commit 3fd04d6aef941151819f87a2a7aeeb560938f230
parent e25837126597f1a95c5c38294546ebc282167857
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Wed,  7 May 2025 17:12:18 +0200

merge 3-wire-accounts

Diffstat:
M
src/exchangedb/0002-wire_accounts.sql
 | 
6
++++++
D
src/exchangedb/0003-wire_accounts.sql
 | 
25
-------------------------
M
src/exchangedb/exchange-0003.sql.in
 | 
1
-

3 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/src/exchangedb/0002-wire_accounts.sql b/src/exchangedb/0002-wire_accounts.sql
@@ -22,6 +22,8 @@ CREATE TABLE wire_accounts
   ,conversion_url TEXT DEFAULT (NULL)
   ,debit_restrictions TEXT DEFAULT (NULL)
   ,credit_restrictions TEXT DEFAULT (NULL)
+  ,priority INT8 NOT NULL DEFAULT (0)
+  ,bank_label TEXT DEFAULT (NULL)
   );
 COMMENT ON TABLE wire_accounts
   IS 'Table with current and historic bank accounts of the exchange. Entries never expire as we need to remember the last_change column indefinitely.';
@@ -39,6 +41,10 @@ COMMENT ON COLUMN wire_accounts.debit_restrictions
   IS 'JSON array describing restrictions imposed when debiting this account. Empty for no restrictions, NULL if account was migrated from previous database revision or account is disabled.';
 COMMENT ON COLUMN wire_accounts.credit_restrictions
   IS 'JSON array describing restrictions imposed when crediting this account. Empty for no restrictions, NULL if account was migrated from previous database revision or account is disabled.';
+COMMENT ON COLUMN wire_accounts.priority
+  IS 'priority determines the order in which wallets should display wire accounts';
+COMMENT ON COLUMN wire_accounts.bank_label
+  IS 'label to show in the selector for this bank account in the wallet UI';
 
 
 -- "wire_accounts" has no sequence because it is a 'mutable' table
diff --git a/src/exchangedb/0003-wire_accounts.sql b/src/exchangedb/0003-wire_accounts.sql
@@ -1,25 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2024 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- Foundation; either version 3, or (at your option) any later version.
---
--- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
--- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
--- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License along with
--- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
---
-
--- new columns for #8000
-ALTER TABLE wire_accounts
-  ADD COLUMN priority INT8 NOT NULL DEFAULT (0),
-  ADD COLUMN bank_label TEXT DEFAULT (NULL);
-
-COMMENT ON COLUMN wire_accounts.priority
-  IS 'priority determines the order in which wallets should display wire accounts';
-COMMENT ON COLUMN wire_accounts.bank_label
-  IS 'label to show in the selector for this bank account in the wallet UI';
diff --git a/src/exchangedb/exchange-0003.sql.in b/src/exchangedb/exchange-0003.sql.in
@@ -19,7 +19,6 @@ BEGIN;
 SELECT _v.register_patch('exchange-0003', NULL, NULL);
 SET search_path TO exchange;
 
-#include "0003-wire_accounts.sql"
 #include "0003-purse_deletion.sql"
 
 COMMIT;