commit 9ddfb38ea4cc9ad846d6fc835c24b7f0feabecbd
parent 47e6bb4c5f59e53616e6ce4668e0707c5d9ed5e5
Author: bohdan-potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date: Mon, 14 Jul 2025 11:09:11 +0200
prep to merge
Diffstat:
3 files changed, 91 insertions(+), 89 deletions(-)
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
@@ -36,6 +36,8 @@ sql_DATA = \
merchant-0017.sql \
merchant-0018.sql \
merchant-0019.sql \
+ merchant-0020.sql \
+ merchant-0021.sql \
drop.sql
BUILT_SOURCES = \
diff --git a/src/backenddb/merchant-0019.sql b/src/backenddb/merchant-0019.sql
@@ -1,88 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2025 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/>
---
-
--- @file merchant-0019.sql
--- @brief Create table to store donau related information
--- @author Bohdan Potuzhnyi
--- @author Vlada Svirsh
-
-BEGIN;
-
--- Check patch versioning is in place.
-SELECT _v.register_patch('merchant-0019', NULL, NULL);
-
-SET search_path TO merchant;
-
-CREATE TABLE IF NOT EXISTS merchant_donau_keys
-(donau_keys_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
- ,donau_url TEXT PRIMARY KEY
- ,keys_json TEXT NOT NULL
-);
-
-COMMENT ON TABLE merchant_donau_keys
- IS 'Here we store the cached /keys response from Donau in JSON format';
-COMMENT ON COLUMN merchant_donau_keys.donau_keys_serial
- IS 'Unique serial identifier for each cached key entry';
-COMMENT ON COLUMN merchant_donau_keys.donau_url
- IS 'Base URL of Donau associated with these keys';
-COMMENT ON COLUMN merchant_donau_keys.keys_json
- IS 'JSON string of the /keys as generated by Donau';
-
-CREATE TABLE IF NOT EXISTS merchant_donau_instances
-(donau_instances_serial BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY
- ,donau_url TEXT NOT NULL
- ,charity_name TEXT NOT NULL
- ,charity_pub_key BYTEA CHECK (LENGTH(charity_pub_key)=32)
- ,charity_id BIGINT NOT NULL
- ,charity_max_per_year taler_amount_currency NOT NULL
- ,charity_receipts_to_date taler_amount_currency NOT NULL
- ,current_year INT8 NOT NULL
-);
-
-COMMENT ON TABLE merchant_donau_instances
- IS 'Here we store information about individual Donau instances, including details about associated charities and donation limits';
-COMMENT ON COLUMN merchant_donau_instances.donau_instances_serial
- IS 'Unique serial identifier for each Donau instance';
-COMMENT ON COLUMN merchant_donau_instances.donau_url
- IS 'The URL associated with the Donau system for this instance';
-COMMENT ON COLUMN merchant_donau_instances.charity_pub_key
- IS 'The public key of the charity organization linked to this instance, with a 32-byte length constraint';
-COMMENT ON COLUMN merchant_donau_instances.charity_id
- IS 'The unique identifier for the charity organization linked to this Donau instance';
-COMMENT ON COLUMN merchant_donau_instances.charity_max_per_year
- IS 'Maximum allowable donation amount per year for the charity associated with this instance, stored in taler_amount_currency';
-COMMENT ON COLUMN merchant_donau_instances.charity_receipts_to_date
- IS 'The total amount of donations received to date for this instance, stored in taler_amount_currency';
-COMMENT ON COLUMN merchant_donau_instances.current_year
- IS 'The current year for tracking donations for this instance, stored as an 8-byte integer';
-
-CREATE TABLE IF NOT EXISTS merchant_order_donau
-(order_donau_serial BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY
- ,order_serial BIGINT NOT NULL
- REFERENCES merchant_orders (order_serial) ON DELETE CASCADE
- ,donau_budis TEXT NOT NULL
-);
-
-COMMENT ON TABLE merchant_order_donau
- IS 'Table linking merchant orders with Donau BUDIS information';
-COMMENT ON COLUMN merchant_order_donau.order_donau_serial
- IS 'Unique serial identifier for Donau order linkage';
-COMMENT ON COLUMN merchant_order_donau.order_serial
- IS 'Foreign key linking to the corresponding merchant order';
-COMMENT ON COLUMN merchant_order_donau.donau_budis
- IS 'Donau BUDIs json associated with the order';
-
-COMMIT;
-\ No newline at end of file
diff --git a/src/backenddb/merchant-0022.sql b/src/backenddb/merchant-0022.sql
@@ -0,0 +1,88 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2025 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/>
+--
+
+-- @file merchant-0022.sql
+-- @brief Create table to store donau related information
+-- @author Bohdan Potuzhnyi
+-- @author Vlada Svirsh
+
+BEGIN;
+
+-- Check patch versioning is in place.
+SELECT _v.register_patch('merchant-0022', NULL, NULL);
+
+SET search_path TO merchant;
+
+CREATE TABLE IF NOT EXISTS merchant_donau_keys
+(donau_keys_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+ ,donau_url TEXT PRIMARY KEY
+ ,keys_json TEXT NOT NULL
+);
+
+COMMENT ON TABLE merchant_donau_keys
+ IS 'Here we store the cached /keys response from Donau in JSON format';
+COMMENT ON COLUMN merchant_donau_keys.donau_keys_serial
+ IS 'Unique serial identifier for each cached key entry';
+COMMENT ON COLUMN merchant_donau_keys.donau_url
+ IS 'Base URL of Donau associated with these keys';
+COMMENT ON COLUMN merchant_donau_keys.keys_json
+ IS 'JSON string of the /keys as generated by Donau';
+
+CREATE TABLE IF NOT EXISTS merchant_donau_instances
+(donau_instances_serial BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY
+ ,donau_url TEXT NOT NULL
+ ,charity_name TEXT NOT NULL
+ ,charity_pub_key BYTEA CHECK (LENGTH(charity_pub_key)=32)
+ ,charity_id BIGINT NOT NULL
+ ,charity_max_per_year taler_amount_currency NOT NULL
+ ,charity_receipts_to_date taler_amount_currency NOT NULL
+ ,current_year INT8 NOT NULL
+);
+
+COMMENT ON TABLE merchant_donau_instances
+ IS 'Here we store information about individual Donau instances, including details about associated charities and donation limits';
+COMMENT ON COLUMN merchant_donau_instances.donau_instances_serial
+ IS 'Unique serial identifier for each Donau instance';
+COMMENT ON COLUMN merchant_donau_instances.donau_url
+ IS 'The URL associated with the Donau system for this instance';
+COMMENT ON COLUMN merchant_donau_instances.charity_pub_key
+ IS 'The public key of the charity organization linked to this instance, with a 32-byte length constraint';
+COMMENT ON COLUMN merchant_donau_instances.charity_id
+ IS 'The unique identifier for the charity organization linked to this Donau instance';
+COMMENT ON COLUMN merchant_donau_instances.charity_max_per_year
+ IS 'Maximum allowable donation amount per year for the charity associated with this instance, stored in taler_amount_currency';
+COMMENT ON COLUMN merchant_donau_instances.charity_receipts_to_date
+ IS 'The total amount of donations received to date for this instance, stored in taler_amount_currency';
+COMMENT ON COLUMN merchant_donau_instances.current_year
+ IS 'The current year for tracking donations for this instance, stored as an 8-byte integer';
+
+CREATE TABLE IF NOT EXISTS merchant_order_donau
+(order_donau_serial BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY
+ ,order_serial BIGINT NOT NULL
+ REFERENCES merchant_orders (order_serial) ON DELETE CASCADE
+ ,donau_budis TEXT NOT NULL
+);
+
+COMMENT ON TABLE merchant_order_donau
+ IS 'Table linking merchant orders with Donau BUDIS information';
+COMMENT ON COLUMN merchant_order_donau.order_donau_serial
+ IS 'Unique serial identifier for Donau order linkage';
+COMMENT ON COLUMN merchant_order_donau.order_serial
+ IS 'Foreign key linking to the corresponding merchant order';
+COMMENT ON COLUMN merchant_order_donau.donau_budis
+ IS 'Donau BUDIs json associated with the order';
+
+COMMIT;
+\ No newline at end of file
