diff options
| author | Christian Grothoff <christian@grothoff.org> | 2023-07-30 14:02:40 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2023-07-30 14:02:40 +0200 |
| commit | a29f04189c8b7457ede0b3ac01222b88853325a8 (patch) | |
| tree | c00400029ee53863481c2e30ffea5c275685733c /src | |
| parent | afa706914fefc90812c0bda01341e1dcfca06840 (diff) | |
| download | exchange-a29f04189c8b7457ede0b3ac01222b88853325a8.tar.gz exchange-a29f04189c8b7457ede0b3ac01222b88853325a8.tar.bz2 exchange-a29f04189c8b7457ede0b3ac01222b88853325a8.zip | |
unify to TEXT instead of mixing TEXT and VARCHAR
Diffstat (limited to 'src')
67 files changed, 348 insertions, 352 deletions
diff --git a/src/auditordb/auditor-0001.sql b/src/auditordb/auditor-0001.sql index f397f0569..c5c037c31 100644 --- a/src/auditordb/auditor-0001.sql +++ b/src/auditordb/auditor-0001.sql @@ -36,7 +36,7 @@ COMMENT ON TYPE taler_amount CREATE TABLE IF NOT EXISTS auditor_exchanges (master_pub BYTEA PRIMARY KEY CHECK (LENGTH(master_pub)=32) - ,exchange_url VARCHAR NOT NULL + ,exchange_url TEXT NOT NULL ); COMMENT ON TABLE auditor_exchanges IS 'list of the exchanges we are auditing'; diff --git a/src/benchmark/benchmark-common.conf b/src/benchmark/benchmark-common.conf index 5d9405fe5..11e106d2f 100644 --- a/src/benchmark/benchmark-common.conf +++ b/src/benchmark/benchmark-common.conf @@ -78,6 +78,7 @@ CONFIG="postgres:///talercheck" [bank] HTTP_PORT=8082 SERVE=http +RAM_LIMIT=10000000 [libeufin-nexus] DB_CONNECTION="postgresql:///talercheck" diff --git a/src/benchmark/taler-bank-benchmark.c b/src/benchmark/taler-bank-benchmark.c index 80636a60e..224b6d5d1 100644 --- a/src/benchmark/taler-bank-benchmark.c +++ b/src/benchmark/taler-bank-benchmark.c @@ -338,6 +338,7 @@ parallel_benchmark (void) "taler-exchange-wirewatch", "taler-exchange-wirewatch", "-c", cfg_filename, + "-a", exchange_bank_section, (NULL != loglev) ? "-L" : NULL, loglev, NULL); @@ -374,6 +375,7 @@ parallel_benchmark (void) "taler-exchange-wirewatch", "taler-exchange-wirewatch", "-c", cfg_filename, + "-a", exchange_bank_section, "-t", (NULL != loglev) ? "-L" : NULL, loglev, @@ -402,6 +404,7 @@ parallel_benchmark (void) "taler-exchange-wirewatch", "taler-exchange-wirewatch", "-c", cfg_filename, + "-a", exchange_bank_section, "-t", (NULL != loglev) ? "-L" : NULL, loglev, @@ -458,12 +461,13 @@ main (int argc, "NRESERVES", "How many reserves per client we should create", &howmany_reserves), - GNUNET_GETOPT_option_string ( - 'u', - "exchange-account-section", - "SECTION", - "use exchange bank account configuration from the given SECTION", - &exchange_bank_section), + GNUNET_GETOPT_option_mandatory ( + GNUNET_GETOPT_option_string ( + 'u', + "exchange-account-section", + "SECTION", + "use exchange bank account configuration from the given SECTION", + &exchange_bank_section)), GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION), GNUNET_GETOPT_option_verbose (&verbose), GNUNET_GETOPT_option_uint ('w', diff --git a/src/exchangedb/0002-account_merges.sql b/src/exchangedb/0002-account_merges.sql index b1995f204..1ea9e9298 100644 --- a/src/exchangedb/0002-account_merges.sql +++ b/src/exchangedb/0002-account_merges.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_account_merges( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'account_merges'; + table_name TEXT DEFAULT 'account_merges'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE IF NOT EXISTS %I ' @@ -64,13 +64,13 @@ $$; CREATE FUNCTION constrain_table_account_merges( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'account_merges'; + table_name TEXT DEFAULT 'account_merges'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); @@ -94,7 +94,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'account_merges'; + table_name TEXT DEFAULT 'account_merges'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-age_withdraw.sql b/src/exchangedb/0002-age_withdraw.sql index e3bd71a63..87cac7816 100644 --- a/src/exchangedb/0002-age_withdraw.sql +++ b/src/exchangedb/0002-age_withdraw.sql @@ -16,13 +16,13 @@ -- @author Özgür Kesim CREATE FUNCTION create_table_age_withdraw( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'age_withdraw'; + table_name TEXT DEFAULT 'age_withdraw'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -100,13 +100,13 @@ $$; CREATE FUNCTION constrain_table_age_withdraw( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'age_withdraw'; + table_name TEXT DEFAULT 'age_withdraw'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -132,7 +132,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'age_withdraw'; + table_name TEXT DEFAULT 'age_withdraw'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-aggregation_tracking.sql b/src/exchangedb/0002-aggregation_tracking.sql index f6135c5ac..7df495a41 100644 --- a/src/exchangedb/0002-aggregation_tracking.sql +++ b/src/exchangedb/0002-aggregation_tracking.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_aggregation_tracking( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'aggregation_tracking'; + table_name TEXT DEFAULT 'aggregation_tracking'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -49,13 +49,13 @@ $$; CREATE FUNCTION constrain_table_aggregation_tracking( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'aggregation_tracking'; + table_name TEXT DEFAULT 'aggregation_tracking'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -81,7 +81,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'aggregation_tracking'; + table_name TEXT DEFAULT 'aggregation_tracking'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-aggregation_transient.sql b/src/exchangedb/0002-aggregation_transient.sql index 851342d81..8e46450f0 100644 --- a/src/exchangedb/0002-aggregation_transient.sql +++ b/src/exchangedb/0002-aggregation_transient.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_aggregation_transient( - IN shard_suffix VARCHAR DEFAULT NULL + IN shard_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'aggregation_transient'; + table_name TEXT DEFAULT 'aggregation_transient'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' diff --git a/src/exchangedb/0002-aml_history.sql b/src/exchangedb/0002-aml_history.sql index 18b79bae5..af81be9d8 100644 --- a/src/exchangedb/0002-aml_history.sql +++ b/src/exchangedb/0002-aml_history.sql @@ -15,13 +15,13 @@ -- CREATE OR REPLACE FUNCTION create_table_aml_history( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'aml_history'; + table_name TEXT DEFAULT 'aml_history'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE IF NOT EXISTS %I' @@ -30,8 +30,8 @@ BEGIN ',new_threshold taler_amount NOT NULL DEFAULT(0,0)' ',new_status INT4 NOT NULL DEFAULT(0)' ',decision_time INT8 NOT NULL DEFAULT(0)' - ',justification VARCHAR NOT NULL' - ',kyc_requirements VARCHAR' + ',justification TEXT NOT NULL' + ',kyc_requirements TEXT' ',kyc_req_row INT8 NOT NULL DEFAULT(0)' ',decider_pub BYTEA CHECK (LENGTH(decider_pub)=32)' ',decider_sig BYTEA CHECK (LENGTH(decider_sig)=64)' @@ -106,13 +106,13 @@ COMMENT ON FUNCTION create_table_aml_history CREATE OR REPLACE FUNCTION constrain_table_aml_history( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'aml_history'; + table_name TEXT DEFAULT 'aml_history'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-aml_staff.sql b/src/exchangedb/0002-aml_staff.sql index 00f60985a..cec18c62b 100644 --- a/src/exchangedb/0002-aml_staff.sql +++ b/src/exchangedb/0002-aml_staff.sql @@ -19,7 +19,7 @@ CREATE TABLE aml_staff (aml_staff_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE ,decider_pub BYTEA PRIMARY KEY CHECK (LENGTH(decider_pub)=32) ,master_sig BYTEA CHECK (LENGTH(master_sig)=64) - ,decider_name VARCHAR NOT NULL + ,decider_name TEXT NOT NULL ,is_active BOOLEAN NOT NULL ,read_only BOOLEAN NOT NULL ,last_change INT8 NOT NULL diff --git a/src/exchangedb/0002-aml_status.sql b/src/exchangedb/0002-aml_status.sql index 47e8d90c3..a8b567a82 100644 --- a/src/exchangedb/0002-aml_status.sql +++ b/src/exchangedb/0002-aml_status.sql @@ -15,13 +15,13 @@ -- CREATE OR REPLACE FUNCTION create_table_aml_status( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'aml_status'; + table_name TEXT DEFAULT 'aml_status'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE IF NOT EXISTS %I' @@ -65,13 +65,13 @@ COMMENT ON FUNCTION create_table_aml_status CREATE OR REPLACE FUNCTION constrain_table_aml_status( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'aml_status'; + table_name TEXT DEFAULT 'aml_status'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-auditors.sql b/src/exchangedb/0002-auditors.sql index 32ec8446a..76e43b183 100644 --- a/src/exchangedb/0002-auditors.sql +++ b/src/exchangedb/0002-auditors.sql @@ -18,8 +18,8 @@ CREATE TABLE auditors (auditor_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE ,auditor_pub BYTEA PRIMARY KEY CHECK (LENGTH(auditor_pub)=32) - ,auditor_name VARCHAR NOT NULL - ,auditor_url VARCHAR NOT NULL + ,auditor_name TEXT NOT NULL + ,auditor_url TEXT NOT NULL ,is_active BOOLEAN NOT NULL ,last_change INT8 NOT NULL ); diff --git a/src/exchangedb/0002-close_requests.sql b/src/exchangedb/0002-close_requests.sql index a1e7fe388..d13822ef9 100644 --- a/src/exchangedb/0002-close_requests.sql +++ b/src/exchangedb/0002-close_requests.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_close_requests( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'close_requests'; + table_name TEXT DEFAULT 'close_requests'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -31,7 +31,7 @@ BEGIN ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)' ',close taler_amount NOT NULL' ',close_fee taler_amount NOT NULL' - ',payto_uri VARCHAR NOT NULL' + ',payto_uri TEXT NOT NULL' ',done BOOL NOT NULL DEFAULT(FALSE)' ',PRIMARY KEY (reserve_pub,close_timestamp)' ') %s ;' @@ -72,13 +72,13 @@ END $$; CREATE FUNCTION constrain_table_close_requests( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'close_requests'; + table_name TEXT DEFAULT 'close_requests'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -105,7 +105,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'close_requests'; + table_name TEXT DEFAULT 'close_requests'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-contracts.sql b/src/exchangedb/0002-contracts.sql index 409653060..c1f92c9aa 100644 --- a/src/exchangedb/0002-contracts.sql +++ b/src/exchangedb/0002-contracts.sql @@ -16,13 +16,13 @@ CREATE FUNCTION create_table_contracts( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'contracts'; + table_name TEXT DEFAULT 'contracts'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -72,13 +72,13 @@ $$; CREATE FUNCTION constrain_table_contracts( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'contracts'; + table_name TEXT DEFAULT 'contracts'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-cs_nonce_locks.sql b/src/exchangedb/0002-cs_nonce_locks.sql index 0cb88b3f8..36c0c7a5f 100644 --- a/src/exchangedb/0002-cs_nonce_locks.sql +++ b/src/exchangedb/0002-cs_nonce_locks.sql @@ -15,7 +15,7 @@ -- CREATE FUNCTION create_table_cs_nonce_locks( - partition_suffix VARCHAR DEFAULT NULL + partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql @@ -60,13 +60,13 @@ $$; CREATE FUNCTION constrain_table_cs_nonce_locks( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'cs_nonce_locks'; + table_name TEXT DEFAULT 'cs_nonce_locks'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-deposits.sql b/src/exchangedb/0002-deposits.sql index 43c8d9ea7..e33bfcf99 100644 --- a/src/exchangedb/0002-deposits.sql +++ b/src/exchangedb/0002-deposits.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_deposits( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'deposits'; + table_name TEXT DEFAULT 'deposits'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -99,13 +99,13 @@ $$; CREATE FUNCTION constrain_table_deposits( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'deposits'; + table_name TEXT DEFAULT 'deposits'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -140,7 +140,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'deposits'; + table_name TEXT DEFAULT 'deposits'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || @@ -159,13 +159,13 @@ $$; CREATE FUNCTION create_table_deposits_by_ready( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'deposits_by_ready'; + table_name TEXT DEFAULT 'deposits_by_ready'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -188,13 +188,13 @@ $$; CREATE FUNCTION constrain_table_deposits_by_ready( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'deposits_by_ready'; + table_name TEXT DEFAULT 'deposits_by_ready'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -207,13 +207,13 @@ $$; CREATE FUNCTION create_table_deposits_for_matching( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'deposits_for_matching'; + table_name TEXT DEFAULT 'deposits_for_matching'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -236,13 +236,13 @@ $$; CREATE FUNCTION constrain_table_deposits_for_matching( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'deposits_for_matching'; + table_name TEXT DEFAULT 'deposits_for_matching'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-extensions.sql b/src/exchangedb/0002-extensions.sql index 5642ea13a..df9e50090 100644 --- a/src/exchangedb/0002-extensions.sql +++ b/src/exchangedb/0002-extensions.sql @@ -16,7 +16,7 @@ CREATE TABLE extensions (extension_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE - ,name VARCHAR NOT NULL UNIQUE + ,name TEXT NOT NULL UNIQUE ,manifest BYTEA ); COMMENT ON TABLE extensions diff --git a/src/exchangedb/0002-history_requests.sql b/src/exchangedb/0002-history_requests.sql index 2694a7cea..d6a81c458 100644 --- a/src/exchangedb/0002-history_requests.sql +++ b/src/exchangedb/0002-history_requests.sql @@ -16,13 +16,13 @@ CREATE FUNCTION create_table_history_requests( - IN shard_suffix VARCHAR DEFAULT NULL + IN shard_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'history_requests'; + table_name TEXT DEFAULT 'history_requests'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -64,13 +64,13 @@ END $$; CREATE FUNCTION constrain_table_history_requests( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - partition_name VARCHAR; + partition_name TEXT; BEGIN partition_name = concat_ws('_', 'history_requests', partition_suffix); @@ -88,7 +88,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'history_requests'; + table_name TEXT DEFAULT 'history_requests'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-known_coins.sql b/src/exchangedb/0002-known_coins.sql index c8cc888fe..a13beff6f 100644 --- a/src/exchangedb/0002-known_coins.sql +++ b/src/exchangedb/0002-known_coins.sql @@ -16,13 +16,13 @@ CREATE FUNCTION create_table_known_coins( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'known_coins'; + table_name TEXT default 'known_coins'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -77,13 +77,13 @@ $$; CREATE FUNCTION constrain_table_known_coins( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'known_coins'; + table_name TEXT default 'known_coins'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -100,7 +100,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'known_coins'; + table_name TEXT default 'known_coins'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-kyc_attributes.sql b/src/exchangedb/0002-kyc_attributes.sql index d02e2568f..fd36684de 100644 --- a/src/exchangedb/0002-kyc_attributes.sql +++ b/src/exchangedb/0002-kyc_attributes.sql @@ -15,20 +15,20 @@ -- CREATE OR REPLACE FUNCTION create_table_kyc_attributes( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'kyc_attributes'; + table_name TEXT DEFAULT 'kyc_attributes'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE IF NOT EXISTS %I' '(kyc_attributes_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' ',h_payto BYTEA PRIMARY KEY CHECK (LENGTH(h_payto)=32)' ',kyc_prox BYTEA NOT NULL CHECK (LENGTH(kyc_prox)=32)' - ',provider VARCHAR NOT NULL' + ',provider TEXT NOT NULL' ',collection_time INT8 NOT NULL' ',expiration_time INT8 NOT NULL' ',encrypted_attributes BYTEA NOT NULL' @@ -92,13 +92,13 @@ COMMENT ON FUNCTION create_table_kyc_attributes CREATE OR REPLACE FUNCTION constrain_table_kyc_attributes( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'kyc_attributes'; + table_name TEXT DEFAULT 'kyc_attributes'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-legitimization_processes.sql b/src/exchangedb/0002-legitimization_processes.sql index 544d58cd2..5b70108ea 100644 --- a/src/exchangedb/0002-legitimization_processes.sql +++ b/src/exchangedb/0002-legitimization_processes.sql @@ -15,7 +15,7 @@ -- CREATE FUNCTION create_table_legitimization_processes( - IN shard_suffix VARCHAR DEFAULT NULL + IN shard_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql @@ -26,9 +26,9 @@ BEGIN '(legitimization_process_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' ',h_payto BYTEA NOT NULL CHECK (LENGTH(h_payto)=32)' ',expiration_time INT8 NOT NULL DEFAULT (0)' - ',provider_section VARCHAR NOT NULL' - ',provider_user_id VARCHAR DEFAULT NULL' - ',provider_legitimization_id VARCHAR DEFAULT NULL' + ',provider_section TEXT NOT NULL' + ',provider_user_id TEXT DEFAULT NULL' + ',provider_legitimization_id TEXT DEFAULT NULL' ',finished BOOLEAN DEFAULT (FALSE)' ',UNIQUE (h_payto, provider_section)' ') %s ;' @@ -89,13 +89,13 @@ $$; -- We need a separate function for this, as we call create_table only once but need to add -- those constraints to each partition which gets created CREATE FUNCTION constrain_table_legitimization_processes( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - partition_name VARCHAR; + partition_name TEXT; BEGIN partition_name = concat_ws('_', 'legitimization_processes', partition_suffix); diff --git a/src/exchangedb/0002-legitimization_requirements.sql b/src/exchangedb/0002-legitimization_requirements.sql index 892556aab..d806eb424 100644 --- a/src/exchangedb/0002-legitimization_requirements.sql +++ b/src/exchangedb/0002-legitimization_requirements.sql @@ -15,7 +15,7 @@ -- CREATE FUNCTION create_table_legitimization_requirements( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql @@ -26,7 +26,7 @@ BEGIN '(legitimization_requirement_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' ',h_payto BYTEA NOT NULL CHECK (LENGTH(h_payto)=32)' ',reserve_pub BYTEA' - ',required_checks VARCHAR NOT NULL' + ',required_checks TEXT NOT NULL' ',UNIQUE (h_payto, required_checks)' ') %s ;' ,'legitimization_requirements' @@ -68,13 +68,13 @@ $$; -- We need a separate function for this, as we call create_table only once but need to add -- those constraints to each partition which gets created CREATE FUNCTION constrain_table_legitimization_requirements( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - partition_name VARCHAR; + partition_name TEXT; BEGIN partition_name = concat_ws('_', 'legitimization_requirements', partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-partner_accounts.sql b/src/exchangedb/0002-partner_accounts.sql index 0f4af92c8..b12dc06e6 100644 --- a/src/exchangedb/0002-partner_accounts.sql +++ b/src/exchangedb/0002-partner_accounts.sql @@ -16,7 +16,7 @@ CREATE TABLE partner_accounts - (payto_uri VARCHAR PRIMARY KEY + (payto_uri TEXT PRIMARY KEY ,partner_serial_id INT8 REFERENCES partners(partner_serial_id) ON DELETE CASCADE ,partner_master_sig BYTEA CHECK (LENGTH(partner_master_sig)=64) ,last_seen INT8 NOT NULL diff --git a/src/exchangedb/0002-policy_details.sql b/src/exchangedb/0002-policy_details.sql index 8c53b0dc9..bc2fced2c 100644 --- a/src/exchangedb/0002-policy_details.sql +++ b/src/exchangedb/0002-policy_details.sql @@ -19,7 +19,7 @@ CREATE TABLE policy_details (policy_details_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE ,policy_hash_code BYTEA PRIMARY KEY CHECK(LENGTH(policy_hash_code)=16) - ,policy_json VARCHAR + ,policy_json TEXT ,deadline INT8 NOT NULL ,commitment taler_amount NOT NULL ,accumulated_total taler_amount NOT NULL diff --git a/src/exchangedb/0002-policy_fulfillments.sql b/src/exchangedb/0002-policy_fulfillments.sql index 54f44df52..c3e48f6db 100644 --- a/src/exchangedb/0002-policy_fulfillments.sql +++ b/src/exchangedb/0002-policy_fulfillments.sql @@ -19,7 +19,7 @@ CREATE TABLE policy_fulfillments (fulfillment_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY ,fulfillment_timestamp INT8 NOT NULL - ,fulfillment_proof VARCHAR + ,fulfillment_proof TEXT ,h_fulfillment_proof BYTEA NOT NULL CHECK(LENGTH(h_fulfillment_proof) = 64) UNIQUE ,policy_hash_codes BYTEA NOT NULL CHECK(0 = MOD(LENGTH(policy_hash_codes), 16)) ); diff --git a/src/exchangedb/0002-prewire.sql b/src/exchangedb/0002-prewire.sql index fb8dc2212..8dc8cd5d6 100644 --- a/src/exchangedb/0002-prewire.sql +++ b/src/exchangedb/0002-prewire.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_prewire( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'prewire'; + table_name TEXT DEFAULT 'prewire'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -63,13 +63,13 @@ $$; CREATE FUNCTION constrain_table_prewire( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'prewire'; + table_name TEXT DEFAULT 'prewire'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-profit_drains.sql b/src/exchangedb/0002-profit_drains.sql index e4a9bcb1e..c4f3a7bd0 100644 --- a/src/exchangedb/0002-profit_drains.sql +++ b/src/exchangedb/0002-profit_drains.sql @@ -17,8 +17,8 @@ CREATE TABLE profit_drains (profit_drain_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE ,wtid BYTEA PRIMARY KEY CHECK (LENGTH(wtid)=32) - ,account_section VARCHAR NOT NULL - ,payto_uri VARCHAR NOT NULL + ,account_section TEXT NOT NULL + ,payto_uri TEXT NOT NULL ,trigger_date INT8 NOT NULL ,amount taler_amount NOT NULL ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64) diff --git a/src/exchangedb/0002-purse_actions.sql b/src/exchangedb/0002-purse_actions.sql index fc09e7fa3..0dd6cfc4d 100644 --- a/src/exchangedb/0002-purse_actions.sql +++ b/src/exchangedb/0002-purse_actions.sql @@ -16,13 +16,13 @@ CREATE OR REPLACE FUNCTION create_table_purse_actions( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_actions'; + table_name TEXT DEFAULT 'purse_actions'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE IF NOT EXISTS %I' @@ -84,7 +84,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_actions'; + table_name TEXT DEFAULT 'purse_actions'; BEGIN -- Create global index CREATE INDEX IF NOT EXISTS purse_action_by_target diff --git a/src/exchangedb/0002-purse_decision.sql b/src/exchangedb/0002-purse_decision.sql index e738292cd..8ebd80dac 100644 --- a/src/exchangedb/0002-purse_decision.sql +++ b/src/exchangedb/0002-purse_decision.sql @@ -16,13 +16,13 @@ CREATE FUNCTION create_table_purse_decision( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_decision'; + table_name TEXT DEFAULT 'purse_decision'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -51,13 +51,13 @@ END $$; CREATE FUNCTION constrain_table_purse_decision( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_decision'; + table_name TEXT DEFAULT 'purse_decision'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-purse_deletion.sql b/src/exchangedb/0002-purse_deletion.sql index 6bbc24c87..45b2e85a9 100644 --- a/src/exchangedb/0002-purse_deletion.sql +++ b/src/exchangedb/0002-purse_deletion.sql @@ -15,13 +15,13 @@ -- CREATE OR REPLACE FUNCTION create_table_purse_deletion( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_deletion'; + table_name TEXT DEFAULT 'purse_deletion'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE IF NOT EXISTS %I' @@ -51,13 +51,13 @@ COMMENT ON FUNCTION create_table_purse_deletion CREATE OR REPLACE FUNCTION constrain_table_purse_deletion( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_deletion'; + table_name TEXT DEFAULT 'purse_deletion'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -74,7 +74,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_requests'; + table_name TEXT DEFAULT 'purse_requests'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE exchange.' || table_name || diff --git a/src/exchangedb/0002-purse_deposits.sql b/src/exchangedb/0002-purse_deposits.sql index 17de48ee5..e83e07382 100644 --- a/src/exchangedb/0002-purse_deposits.sql +++ b/src/exchangedb/0002-purse_deposits.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_purse_deposits( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_deposits'; + table_name TEXT DEFAULT 'purse_deposits'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -77,13 +77,13 @@ $$; CREATE FUNCTION constrain_table_purse_deposits( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_deposits'; + table_name TEXT DEFAULT 'purse_deposits'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); @@ -106,7 +106,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_deposits'; + table_name TEXT DEFAULT 'purse_deposits'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-purse_merges.sql b/src/exchangedb/0002-purse_merges.sql index e1df57e0f..4f1717736 100644 --- a/src/exchangedb/0002-purse_merges.sql +++ b/src/exchangedb/0002-purse_merges.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_purse_merges( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_merges'; + table_name TEXT DEFAULT 'purse_merges'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -77,13 +77,13 @@ $$; CREATE FUNCTION constrain_table_purse_merges( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_merges'; + table_name TEXT DEFAULT 'purse_merges'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); -- FIXME: change to materialized index by reserve_pub! @@ -110,7 +110,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_merges'; + table_name TEXT DEFAULT 'purse_merges'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-purse_requests.sql b/src/exchangedb/0002-purse_requests.sql index 1d47c28f8..3cc7eac93 100644 --- a/src/exchangedb/0002-purse_requests.sql +++ b/src/exchangedb/0002-purse_requests.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_purse_requests( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_requests'; + table_name TEXT DEFAULT 'purse_requests'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -113,13 +113,13 @@ END $$; CREATE FUNCTION constrain_table_purse_requests( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'purse_requests'; + table_name TEXT DEFAULT 'purse_requests'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); diff --git a/src/exchangedb/0002-recoup.sql b/src/exchangedb/0002-recoup.sql index 7e7be78d5..c3f96f498 100644 --- a/src/exchangedb/0002-recoup.sql +++ b/src/exchangedb/0002-recoup.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_recoup( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'recoup'; + table_name TEXT DEFAULT 'recoup'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -71,13 +71,13 @@ $$; CREATE FUNCTION constrain_table_recoup( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'recoup'; + table_name TEXT DEFAULT 'recoup'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -99,7 +99,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'recoup'; + table_name TEXT DEFAULT 'recoup'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || @@ -115,13 +115,13 @@ $$; CREATE FUNCTION create_table_recoup_by_reserve( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'recoup_by_reserve'; + table_name TEXT DEFAULT 'recoup_by_reserve'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -142,13 +142,13 @@ $$; CREATE FUNCTION constrain_table_recoup_by_reserve( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'recoup_by_reserve'; + table_name TEXT DEFAULT 'recoup_by_reserve'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-recoup_refresh.sql b/src/exchangedb/0002-recoup_refresh.sql index fde8e00e3..5234078a6 100644 --- a/src/exchangedb/0002-recoup_refresh.sql +++ b/src/exchangedb/0002-recoup_refresh.sql @@ -16,13 +16,13 @@ CREATE FUNCTION create_table_recoup_refresh( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'recoup_refresh'; + table_name TEXT DEFAULT 'recoup_refresh'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -73,13 +73,13 @@ $$; CREATE FUNCTION constrain_table_recoup_refresh( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'recoup_refresh'; + table_name TEXT DEFAULT 'recoup_refresh'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); -- FIXME: any query using this index will be slow. Materialize index or change query? @@ -108,7 +108,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'recoup_refresh'; + table_name TEXT DEFAULT 'recoup_refresh'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-refresh_commitments.sql b/src/exchangedb/0002-refresh_commitments.sql index 21ab073c5..614fc6373 100644 --- a/src/exchangedb/0002-refresh_commitments.sql +++ b/src/exchangedb/0002-refresh_commitments.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_refresh_commitments( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refresh_commitments'; + table_name TEXT DEFAULT 'refresh_commitments'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -64,13 +64,13 @@ $$; CREATE FUNCTION constrain_table_refresh_commitments( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refresh_commitments'; + table_name TEXT DEFAULT 'refresh_commitments'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); @@ -94,7 +94,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refresh_commitments'; + table_name TEXT DEFAULT 'refresh_commitments'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-refresh_revealed_coins.sql b/src/exchangedb/0002-refresh_revealed_coins.sql index 5fd315ba3..9bf846e57 100644 --- a/src/exchangedb/0002-refresh_revealed_coins.sql +++ b/src/exchangedb/0002-refresh_revealed_coins.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_refresh_revealed_coins( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refresh_revealed_coins'; + table_name TEXT DEFAULT 'refresh_revealed_coins'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -94,13 +94,13 @@ $$; CREATE FUNCTION constrain_table_refresh_revealed_coins( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refresh_revealed_coins'; + table_name TEXT DEFAULT 'refresh_revealed_coins'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -127,7 +127,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refresh_revealed_coins'; + table_name TEXT DEFAULT 'refresh_revealed_coins'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-refresh_transfer_keys.sql b/src/exchangedb/0002-refresh_transfer_keys.sql index 4d10dda1b..9bcb912da 100644 --- a/src/exchangedb/0002-refresh_transfer_keys.sql +++ b/src/exchangedb/0002-refresh_transfer_keys.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_refresh_transfer_keys( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refresh_transfer_keys'; + table_name TEXT DEFAULT 'refresh_transfer_keys'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -68,13 +68,13 @@ $$; CREATE FUNCTION constrain_table_refresh_transfer_keys( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refresh_transfer_keys'; + table_name TEXT DEFAULT 'refresh_transfer_keys'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -91,7 +91,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refresh_transfer_keys'; + table_name TEXT DEFAULT 'refresh_transfer_keys'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-refunds.sql b/src/exchangedb/0002-refunds.sql index caf695061..e82dad937 100644 --- a/src/exchangedb/0002-refunds.sql +++ b/src/exchangedb/0002-refunds.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_refunds( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refunds'; + table_name TEXT DEFAULT 'refunds'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -58,13 +58,13 @@ $$; CREATE FUNCTION constrain_table_refunds ( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refunds'; + table_name TEXT DEFAULT 'refunds'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -87,7 +87,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'refunds'; + table_name TEXT DEFAULT 'refunds'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-reserves.sql b/src/exchangedb/0002-reserves.sql index 3e836133b..d710dd01b 100644 --- a/src/exchangedb/0002-reserves.sql +++ b/src/exchangedb/0002-reserves.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_reserves( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'reserves'; + table_name TEXT DEFAULT 'reserves'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -90,13 +90,13 @@ $$; CREATE FUNCTION constrain_table_reserves( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'reserves'; + table_name TEXT DEFAULT 'reserves'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-reserves_close.sql b/src/exchangedb/0002-reserves_close.sql index 52a8d0a56..2db4e5ccd 100644 --- a/src/exchangedb/0002-reserves_close.sql +++ b/src/exchangedb/0002-reserves_close.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_reserves_close( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_close'; + table_name TEXT default 'reserves_close'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -54,13 +54,13 @@ $$; CREATE FUNCTION constrain_table_reserves_close( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_close'; + table_name TEXT default 'reserves_close'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -80,7 +80,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_close'; + table_name TEXT default 'reserves_close'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-reserves_in.sql b/src/exchangedb/0002-reserves_in.sql index c9c76f281..7fc2811dc 100644 --- a/src/exchangedb/0002-reserves_in.sql +++ b/src/exchangedb/0002-reserves_in.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_reserves_in( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_in'; + table_name TEXT default 'reserves_in'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -64,13 +64,13 @@ END $$; CREATE FUNCTION constrain_table_reserves_in( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_in'; + table_name TEXT default 'reserves_in'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -107,7 +107,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'reserves_in'; + table_name TEXT DEFAULT 'reserves_in'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-reserves_open_deposits.sql b/src/exchangedb/0002-reserves_open_deposits.sql index c4cb4c300..b1a292dd4 100644 --- a/src/exchangedb/0002-reserves_open_deposits.sql +++ b/src/exchangedb/0002-reserves_open_deposits.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_reserves_open_deposits( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_open_deposits'; + table_name TEXT default 'reserves_open_deposits'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -52,13 +52,13 @@ $$; CREATE FUNCTION constrain_table_reserves_open_deposits( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_open_deposits'; + table_name TEXT default 'reserves_open_deposits'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-reserves_open_requests.sql b/src/exchangedb/0002-reserves_open_requests.sql index d913461c0..c8f9c22e2 100644 --- a/src/exchangedb/0002-reserves_open_requests.sql +++ b/src/exchangedb/0002-reserves_open_requests.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_reserves_open_requests( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_open_requests'; + table_name TEXT default 'reserves_open_requests'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -53,13 +53,13 @@ $$; CREATE FUNCTION constrain_table_reserves_open_requests( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_open_requests'; + table_name TEXT default 'reserves_open_requests'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -78,7 +78,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_open_requests'; + table_name TEXT default 'reserves_open_requests'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-reserves_out.sql b/src/exchangedb/0002-reserves_out.sql index 3b28c22bf..7c5cf554c 100644 --- a/src/exchangedb/0002-reserves_out.sql +++ b/src/exchangedb/0002-reserves_out.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_reserves_out( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_out'; + table_name TEXT default 'reserves_out'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -60,13 +60,13 @@ $$; CREATE FUNCTION constrain_table_reserves_out( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_out'; + table_name TEXT default 'reserves_out'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -93,7 +93,7 @@ RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR default 'reserves_out'; + table_name TEXT default 'reserves_out'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || @@ -109,13 +109,13 @@ $$; CREATE FUNCTION create_table_reserves_out_by_reserve( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'reserves_out_by_reserve'; + table_name TEXT DEFAULT 'reserves_out_by_reserve'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I' @@ -135,13 +135,13 @@ END $$; CREATE FUNCTION constrain_table_reserves_out_by_reserve( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'reserves_out_by_reserve'; + table_name TEXT DEFAULT 'reserves_out_by_reserve'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-revolving_work_shards.sql b/src/exchangedb/0002-revolving_work_shards.sql index 83094297e..8cfff09b4 100644 --- a/src/exchangedb/0002-revolving_work_shards.sql +++ b/src/exchangedb/0002-revolving_work_shards.sql @@ -20,7 +20,7 @@ CREATE UNLOGGED TABLE revolving_work_shards ,start_row INT4 NOT NULL ,end_row INT4 NOT NULL ,active BOOLEAN NOT NULL DEFAULT FALSE - ,job_name VARCHAR NOT NULL + ,job_name TEXT NOT NULL ,PRIMARY KEY (job_name, start_row) ); COMMENT ON TABLE revolving_work_shards diff --git a/src/exchangedb/0002-wad_in_entries.sql b/src/exchangedb/0002-wad_in_entries.sql index 99e07be20..000f5c6c2 100644 --- a/src/exchangedb/0002-wad_in_entries.sql +++ b/src/exchangedb/0002-wad_in_entries.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_wad_in_entries( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wad_in_entries'; + table_name TEXT DEFAULT 'wad_in_entries'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -117,13 +117,13 @@ END $$; CREATE FUNCTION constrain_table_wad_in_entries( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wad_in_entries'; + table_name TEXT DEFAULT 'wad_in_entries'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); @@ -150,7 +150,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wad_in_entries'; + table_name TEXT DEFAULT 'wad_in_entries'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-wad_out_entries.sql b/src/exchangedb/0002-wad_out_entries.sql index 80c0f9c79..8da0f04f7 100644 --- a/src/exchangedb/0002-wad_out_entries.sql +++ b/src/exchangedb/0002-wad_out_entries.sql @@ -16,13 +16,13 @@ CREATE FUNCTION create_table_wad_out_entries( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wad_out_entries'; + table_name TEXT DEFAULT 'wad_out_entries'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -119,13 +119,13 @@ $$; CREATE FUNCTION constrain_table_wad_out_entries( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wad_out_entries'; + table_name TEXT DEFAULT 'wad_out_entries'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); @@ -149,7 +149,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wad_out_entries'; + table_name TEXT DEFAULT 'wad_out_entries'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-wads_in.sql b/src/exchangedb/0002-wads_in.sql index e45f3da2f..479589ba4 100644 --- a/src/exchangedb/0002-wads_in.sql +++ b/src/exchangedb/0002-wads_in.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_wads_in( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wads_in'; + table_name TEXT DEFAULT 'wads_in'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -69,13 +69,13 @@ END $$; CREATE FUNCTION constrain_table_wads_in( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wads_in'; + table_name TEXT DEFAULT 'wads_in'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-wads_out.sql b/src/exchangedb/0002-wads_out.sql index a419bc869..e52010e96 100644 --- a/src/exchangedb/0002-wads_out.sql +++ b/src/exchangedb/0002-wads_out.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_wads_out( - IN shard_suffix VARCHAR DEFAULT NULL + IN shard_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wads_out'; + table_name TEXT DEFAULT 'wads_out'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE %I ' @@ -69,13 +69,13 @@ $$; CREATE FUNCTION constrain_table_wads_out( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wads_out'; + table_name TEXT DEFAULT 'wads_out'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( @@ -92,7 +92,7 @@ RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wads_out'; + table_name TEXT DEFAULT 'wads_out'; BEGIN EXECUTE FORMAT ( 'ALTER TABLE ' || table_name || diff --git a/src/exchangedb/0002-wire_accounts.sql b/src/exchangedb/0002-wire_accounts.sql index 0c167dba0..dba522d7b 100644 --- a/src/exchangedb/0002-wire_accounts.sql +++ b/src/exchangedb/0002-wire_accounts.sql @@ -15,13 +15,13 @@ -- CREATE TABLE wire_accounts - (payto_uri VARCHAR PRIMARY KEY + (payto_uri TEXT PRIMARY KEY ,master_sig BYTEA CHECK (LENGTH(master_sig)=64) ,is_active BOOLEAN NOT NULL ,last_change INT8 NOT NULL - ,conversion_url VARCHAR DEFAULT (NULL) - ,debit_restrictions VARCHAR DEFAULT (NULL) - ,credit_restrictions VARCHAR DEFAULT (NULL) + ,conversion_url TEXT DEFAULT (NULL) + ,debit_restrictions TEXT DEFAULT (NULL) + ,credit_restrictions 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.'; diff --git a/src/exchangedb/0002-wire_fee.sql b/src/exchangedb/0002-wire_fee.sql index 4909992ad..12cb91b98 100644 --- a/src/exchangedb/0002-wire_fee.sql +++ b/src/exchangedb/0002-wire_fee.sql @@ -16,7 +16,7 @@ CREATE TABLE wire_fee (wire_fee_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE - ,wire_method VARCHAR NOT NULL + ,wire_method TEXT NOT NULL ,start_date INT8 NOT NULL ,end_date INT8 NOT NULL ,wire_fee taler_amount NOT NULL diff --git a/src/exchangedb/0002-wire_out.sql b/src/exchangedb/0002-wire_out.sql index 2d7e9595f..c0f471b56 100644 --- a/src/exchangedb/0002-wire_out.sql +++ b/src/exchangedb/0002-wire_out.sql @@ -15,13 +15,13 @@ -- CREATE FUNCTION create_table_wire_out( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wire_out'; + table_name TEXT DEFAULT 'wire_out'; BEGIN PERFORM create_partitioned_table( 'CREATE TABLE IF NOT EXISTS %I' @@ -58,13 +58,13 @@ $$; CREATE FUNCTION constrain_table_wire_out( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wire_out'; + table_name TEXT DEFAULT 'wire_out'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-wire_targets.sql b/src/exchangedb/0002-wire_targets.sql index 5e5421085..88d67d9a5 100644 --- a/src/exchangedb/0002-wire_targets.sql +++ b/src/exchangedb/0002-wire_targets.sql @@ -15,7 +15,7 @@ -- CREATE FUNCTION create_table_wire_targets( - IN partition_suffix VARCHAR DEFAULT NULL + IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql @@ -25,7 +25,7 @@ BEGIN 'CREATE TABLE %I' '(wire_target_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' ',wire_target_h_payto BYTEA PRIMARY KEY CHECK (LENGTH(wire_target_h_payto)=32)' - ',payto_uri VARCHAR NOT NULL' + ',payto_uri TEXT NOT NULL' ') %s ;' ,'wire_targets' ,'PARTITION BY HASH (wire_target_h_payto)' @@ -52,13 +52,13 @@ END $$; CREATE FUNCTION constrain_table_wire_targets( - IN partition_suffix VARCHAR + IN partition_suffix TEXT ) RETURNS void LANGUAGE plpgsql AS $$ DECLARE - table_name VARCHAR DEFAULT 'wire_targets'; + table_name TEXT DEFAULT 'wire_targets'; BEGIN table_name = concat_ws('_', table_name, partition_suffix); EXECUTE FORMAT ( diff --git a/src/exchangedb/0002-work_shards.sql b/src/exchangedb/0002-work_shards.sql index 220745d43..6347d42c5 100644 --- a/src/exchangedb/0002-work_shards.sql +++ b/src/exchangedb/0002-work_shards.sql @@ -20,7 +20,7 @@ CREATE TABLE work_shards ,start_row INT8 NOT NULL ,end_row INT8 NOT NULL ,completed BOOLEAN NOT NULL DEFAULT FALSE - ,job_name VARCHAR NOT NULL + ,job_name TEXT NOT NULL ,PRIMARY KEY (job_name, start_row) ); COMMENT ON TABLE work_shards diff --git a/src/exchangedb/exchange-0001.sql b/src/exchangedb/exchange-0001.sql index 8f44c5664..a4b1c8b9f 100644 --- a/src/exchangedb/exchange-0001.sql +++ b/src/exchangedb/exchange-0001.sql @@ -29,9 +29,9 @@ SET search_path TO exchange; CREATE TABLE exchange_tables (table_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY - ,name VARCHAR NOT NULL - ,version VARCHAR NOT NULL - ,action VARCHAR NOT NULL + ,name TEXT NOT NULL + ,version TEXT NOT NULL + ,action TEXT NOT NULL ,partitioned BOOL NOT NULL ,by_range BOOL NOT NULL ,finished BOOL NOT NULL DEFAULT(FALSE)); @@ -52,10 +52,10 @@ COMMENT ON COLUMN exchange_tables.finished CREATE FUNCTION create_partitioned_table( - IN table_definition VARCHAR -- SQL template for table creation - ,IN table_name VARCHAR -- base name of the table - ,IN main_table_partition_str VARCHAR -- declaration for how to partition the table - ,IN partition_suffix VARCHAR DEFAULT NULL -- NULL: no partitioning, 0: yes partitioning, no sharding, >0: sharding + IN table_definition TEXT -- SQL template for table creation + ,IN table_name TEXT -- base name of the table + ,IN main_table_partition_str TEXT -- declaration for how to partition the table + ,IN partition_suffix TEXT DEFAULT NULL -- NULL: no partitioning, 0: yes partitioning, no sharding, >0: sharding ) RETURNS VOID LANGUAGE plpgsql @@ -84,9 +84,9 @@ COMMENT ON FUNCTION create_partitioned_table CREATE FUNCTION comment_partitioned_table( - IN table_comment VARCHAR - ,IN table_name VARCHAR - ,IN partition_suffix VARCHAR DEFAULT NULL + IN table_comment TEXT + ,IN table_name TEXT + ,IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql @@ -110,10 +110,10 @@ COMMENT ON FUNCTION comment_partitioned_table CREATE FUNCTION comment_partitioned_column( - IN table_comment VARCHAR - ,IN column_name VARCHAR - ,IN table_name VARCHAR - ,IN partition_suffix VARCHAR DEFAULT NULL + IN table_comment TEXT + ,IN column_name TEXT + ,IN table_name TEXT + ,IN partition_suffix TEXT DEFAULT NULL ) RETURNS VOID LANGUAGE plpgsql diff --git a/src/exchangedb/exchange_do_batch_reserves_update.sql b/src/exchangedb/exchange_do_batch_reserves_update.sql index 8dda84afc..ebb58a149 100644 --- a/src/exchangedb/exchange_do_batch_reserves_update.sql +++ b/src/exchangedb/exchange_do_batch_reserves_update.sql @@ -19,7 +19,7 @@ CREATE OR REPLACE FUNCTION exchange_do_batch_reserves_update( IN in_expiration_date INT8, IN in_wire_ref INT8, IN in_credit taler_amount, - IN in_exchange_account_name VARCHAR, + IN in_exchange_account_name TEXT, IN in_wire_source_h_payto BYTEA, IN in_notify text, OUT out_duplicate BOOLEAN) diff --git a/src/exchangedb/exchange_do_deposit.sql b/src/exchangedb/exchange_do_deposit.sql index 4e8374b89..5a5e2c6f6 100644 --- a/src/exchangedb/exchange_do_deposit.sql +++ b/src/exchangedb/exchange_do_deposit.sql @@ -22,7 +22,7 @@ CREATE OR REPLACE FUNCTION exchange_do_deposit( IN in_refund_deadline INT8, IN in_wire_deadline INT8, IN in_merchant_pub BYTEA, - IN in_receiver_wire_account VARCHAR, + IN in_receiver_wire_account TEXT, IN in_h_payto BYTEA, IN in_known_coin_id INT8, IN in_coin_pub BYTEA, diff --git a/src/exchangedb/exchange_do_get_ready_deposit.sql b/src/exchangedb/exchange_do_get_ready_deposit.sql index 001b69cb8..7b10c2055 100644 --- a/src/exchangedb/exchange_do_get_ready_deposit.sql +++ b/src/exchangedb/exchange_do_get_ready_deposit.sql @@ -17,7 +17,7 @@ CREATE OR REPLACE FUNCTION exchange_do_get_ready_deposit( IN in_now INT8, IN in_start_shard_now INT8, IN in_end_shard_now INT8, - OUT out_payto_uri VARCHAR, + OUT out_payto_uri TEXT, OUT out_merchant_pub BYTEA ) LANGUAGE plpgsql diff --git a/src/exchangedb/exchange_do_insert_aml_decision.sql b/src/exchangedb/exchange_do_insert_aml_decision.sql index d4f752d19..1598a4073 100644 --- a/src/exchangedb/exchange_do_insert_aml_decision.sql +++ b/src/exchangedb/exchange_do_insert_aml_decision.sql @@ -19,11 +19,11 @@ CREATE OR REPLACE FUNCTION exchange_do_insert_aml_decision( IN in_new_threshold taler_amount, IN in_new_status INT4, IN in_decision_time INT8, - IN in_justification VARCHAR, + IN in_justification TEXT, IN in_decider_pub BYTEA, IN in_decider_sig BYTEA, - IN in_notify_s VARCHAR, - IN in_kyc_requirements VARCHAR, + IN in_notify_s TEXT, + IN in_kyc_requirements TEXT, IN in_requirement_row INT8, OUT out_invalid_officer BOOLEAN, OUT out_last_date INT8) @@ -119,5 +119,5 @@ END IF; END $$; -COMMENT ON FUNCTION exchange_do_insert_aml_decision(BYTEA, taler_amount, INT4, INT8, VARCHAR, BYTEA, BYTEA, VARCHAR, VARCHAR, INT8) +COMMENT ON FUNCTION exchange_do_insert_aml_decision(BYTEA, taler_amount, INT4, INT8, TEXT, BYTEA, BYTEA, TEXT, TEXT, INT8) IS 'Checks whether the AML officer is eligible to make AML decisions and if so inserts the decision into the table'; diff --git a/src/exchangedb/exchange_do_insert_aml_officer.sql b/src/exchangedb/exchange_do_insert_aml_officer.sql index 5cb926c07..429ba11c7 100644 --- a/src/exchangedb/exchange_do_insert_aml_officer.sql +++ b/src/exchangedb/exchange_do_insert_aml_officer.sql @@ -17,7 +17,7 @@ CREATE OR REPLACE FUNCTION exchange_do_insert_aml_officer( IN in_decider_pub BYTEA, IN in_master_sig BYTEA, - IN in_decider_name VARCHAR, + IN in_decider_name TEXT, IN in_is_active BOOLEAN, IN in_read_only BOOLEAN, IN in_last_change INT8, @@ -70,5 +70,5 @@ UPDATE exchange.aml_staff END $$; -COMMENT ON FUNCTION exchange_do_insert_aml_officer(BYTEA, BYTEA, VARCHAR, BOOL, BOOL, INT8) +COMMENT ON FUNCTION exchange_do_insert_aml_officer(BYTEA, BYTEA, TEXT, BOOL, BOOL, INT8) IS 'Inserts or updates AML staff record, making sure the update is more recent than the previous change'; diff --git a/src/exchangedb/exchange_do_insert_kyc_attributes.sql b/src/exchangedb/exchange_do_insert_kyc_attributes.sql index 29efde11f..d9818c882 100644 --- a/src/exchangedb/exchange_do_insert_kyc_attributes.sql +++ b/src/exchangedb/exchange_do_insert_kyc_attributes.sql @@ -18,16 +18,16 @@ CREATE OR REPLACE FUNCTION exchange_do_insert_kyc_attributes( IN in_process_row INT8, IN in_h_payto BYTEA, IN in_kyc_prox BYTEA, - IN in_provider_section VARCHAR, + IN in_provider_section TEXT, IN in_birthday INT4, - IN in_provider_account_id VARCHAR, - IN in_provider_legitimization_id VARCHAR, + IN in_provider_account_id TEXT, + IN in_provider_legitimization_id TEXT, IN in_collection_time_ts INT8, IN in_expiration_time INT8, IN in_expiration_time_ts INT8, IN in_enc_attributes BYTEA, IN in_require_aml BOOLEAN, - IN in_kyc_completed_notify_s VARCHAR, + IN in_kyc_completed_notify_s TEXT, OUT out_ok BOOLEAN) LANGUAGE plpgsql AS $$ @@ -105,5 +105,5 @@ INSERT INTO kyc_alerts END $$; -COMMENT ON FUNCTION exchange_do_insert_kyc_attributes(INT8, BYTEA, BYTEA, VARCHAR, INT4, VARCHAR, VARCHAR, INT8, INT8, INT8, BYTEA, BOOL, VARCHAR) +COMMENT ON FUNCTION exchange_do_insert_kyc_attributes(INT8, BYTEA, BYTEA, TEXT, INT4, TEXT, TEXT, INT8, INT8, INT8, BYTEA, BOOL, TEXT) IS 'Inserts new KYC attributes and updates the status of the legitimization process and the AML status for the account'; diff --git a/src/exchangedb/exchange_do_insert_or_update_policy_details.sql b/src/exchangedb/exchange_do_insert_or_update_policy_details.sql index 1075195a6..53cd2989e 100644 --- a/src/exchangedb/exchange_do_insert_or_update_policy_details.sql +++ b/src/exchangedb/exchange_do_insert_or_update_policy_details.sql @@ -16,7 +16,7 @@ CREATE OR REPLACE FUNCTION exchange_do_insert_or_update_policy_details( IN in_policy_hash_code BYTEA, - IN in_policy_json VARCHAR, + IN in_policy_json TEXT, IN in_deadline INT8, IN in_commitment taler_amount, IN in_accumulated_total taler_amount, diff --git a/src/exchangedb/exchange_do_purse_merge.sql b/src/exchangedb/exchange_do_purse_merge.sql index b911a5a2d..308e4f49a 100644 --- a/src/exchangedb/exchange_do_purse_merge.sql +++ b/src/exchangedb/exchange_do_purse_merge.sql @@ -19,7 +19,7 @@ CREATE OR REPLACE FUNCTION exchange_do_purse_merge( IN in_merge_sig BYTEA, IN in_merge_timestamp INT8, IN in_reserve_sig BYTEA, - IN in_partner_url VARCHAR, + IN in_partner_url TEXT, IN in_reserve_pub BYTEA, IN in_wallet_h_payto BYTEA, IN in_expiration_date INT8, @@ -233,5 +233,5 @@ RETURN; END $$; -COMMENT ON FUNCTION exchange_do_purse_merge(BYTEA, BYTEA, INT8, BYTEA, VARCHAR, BYTEA, BYTEA, INT8) +COMMENT ON FUNCTION exchange_do_purse_merge(BYTEA, BYTEA, INT8, BYTEA, TEXT, BYTEA, BYTEA, INT8) IS 'Checks that the partner exists, the purse has not been merged with a different reserve and that the purse is full. If so, persists the merge data and either merges the purse with the reserve or marks it as ready for the taler-exchange-router. Caller MUST abort the transaction on failures so as to not persist data by accident.'; diff --git a/src/exchangedb/exchange_do_reserves_in_insert.sql b/src/exchangedb/exchange_do_reserves_in_insert.sql index b5876ba32..b88aaa44d 100644 --- a/src/exchangedb/exchange_do_reserves_in_insert.sql +++ b/src/exchangedb/exchange_do_reserves_in_insert.sql @@ -20,10 +20,10 @@ CREATE OR REPLACE FUNCTION exchange_do_batch_reserves_in_insert( IN in_reserve_pub BYTEA, IN in_wire_ref INT8, IN in_credit taler_amount, - IN in_exchange_account_name VARCHAR, + IN in_exchange_account_name TEXT, IN in_execution_date INT8, IN in_wire_source_h_payto BYTEA, - IN in_payto_uri VARCHAR, + IN in_payto_uri TEXT, IN in_notify TEXT, OUT transaction_duplicate0 BOOLEAN, OUT ruuid0 INT8) @@ -86,18 +86,18 @@ CREATE OR REPLACE FUNCTION exchange_do_batch2_reserves_insert( IN in0_reserve_pub BYTEA, IN in0_wire_ref INT8, IN in0_credit taler_amount, - IN in0_exchange_account_name VARCHAR, + IN in0_exchange_account_name TEXT, IN in0_execution_date INT8, IN in0_wire_source_h_payto BYTEA, - IN in0_payto_uri VARCHAR, + IN in0_payto_uri TEXT, IN in0_notify TEXT, IN in1_reserve_pub BYTEA, IN in1_wire_ref INT8, IN in1_credit taler_amount, - IN in1_exchange_account_name VARCHAR, + IN in1_exchange_account_name TEXT, IN in1_execution_date INT8, IN in1_wire_source_h_payto BYTEA, - IN in1_payto_uri VARCHAR, + IN in1_payto_uri TEXT, IN in1_notify TEXT, OUT transaction_duplicate0 BOOLEAN, OUT transaction_duplicate1 BOOLEAN, @@ -192,8 +192,7 @@ BEGIN ,in0_execution_date), (in1_reserve_pub ,in1_wire_ref - ,in1_credit.val - ,in1_credit.frac + ,in1_credit ,in1_exchange_account_name ,in1_wire_source_h_payto ,in1_execution_date) @@ -247,34 +246,34 @@ CREATE OR REPLACE FUNCTION exchange_do_batch4_reserves_insert( IN in0_reserve_pub BYTEA, IN in0_wire_ref INT8, IN in0_credit taler_amount, - IN in0_exchange_account_name VARCHAR, + IN in0_exchange_account_name TEXT, IN in0_execution_date INT8, IN in0_wire_source_h_payto BYTEA, - IN in0_payto_uri VARCHAR, + IN in0_payto_uri TEXT, IN in0_notify TEXT, IN in1_reserve_pub BYTEA, IN in1_wire_ref INT8, IN in1_credit taler_amount, - IN in1_exchange_account_name VARCHAR, + IN in1_exchange_account_name TEXT, IN in1_execution_date INT8, IN in1_wire_source_h_payto BYTEA, - IN in1_payto_uri VARCHAR, + IN in1_payto_uri TEXT, IN in1_notify TEXT, IN in2_reserve_pub BYTEA, IN in2_wire_ref INT8, IN in2_credit taler_amount, - IN in2_exchange_account_name VARCHAR, + IN in2_exchange_account_name TEXT, IN in2_execution_date INT8, IN in2_wire_source_h_payto BYTEA, - IN in2_payto_uri VARCHAR, + IN in2_payto_uri TEXT, IN in2_notify TEXT, IN in3_reserve_pub BYTEA, IN in3_wire_ref INT8, IN in3_credit taler_amount, - IN in3_exchange_account_name VARCHAR, + IN in3_exchange_account_name TEXT, IN in3_execution_date INT8, IN in3_wire_source_h_payto BYTEA, - IN in3_payto_uri VARCHAR, + IN in3_payto_uri TEXT, IN in3_notify TEXT, OUT transaction_duplicate0 BOOLEAN, OUT transaction_duplicate1 BOOLEAN, @@ -403,22 +402,19 @@ BEGIN ,in0_execution_date), (in1_reserve_pub ,in1_wire_ref - ,in1_credit.val - ,in1_credit.frac + ,in1_credit ,in1_exchange_account_name ,in1_wire_source_h_payto ,in1_execution_date), (in2_reserve_pub ,in2_wire_ref - ,in2_credit.val - ,in2_credit.frac + ,in2_credit ,in2_exchange_account_name ,in2_wire_source_h_payto ,in2_execution_date), (in3_reserve_pub ,in3_wire_ref - ,in3_credit.val - ,in3_credit.frac + ,in3_credit ,in3_exchange_account_name ,in3_wire_source_h_payto ,in3_execution_date) @@ -494,66 +490,66 @@ CREATE OR REPLACE FUNCTION exchange_do_batch8_reserves_insert( IN in0_reserve_pub BYTEA, IN in0_wire_ref INT8, IN in0_credit taler_amount, - IN in0_exchange_account_name VARCHAR, + IN in0_exchange_account_name TEXT, IN in0_execution_date INT8, IN in0_wire_source_h_payto BYTEA, - IN in0_payto_uri VARCHAR, + IN in0_payto_uri TEXT, IN in0_notify TEXT, IN in1_reserve_pub BYTEA, IN in1_wire_ref INT8, IN in1_credit taler_amount, - IN in1_exchange_account_name VARCHAR, + IN in1_exchange_account_name TEXT, IN in1_execution_date INT8, IN in1_wire_source_h_payto BYTEA, - IN in1_payto_uri VARCHAR, + IN in1_payto_uri TEXT, IN in1_notify TEXT, IN in2_reserve_pub BYTEA, IN in2_wire_ref INT8, IN in2_credit taler_amount, - IN in2_exchange_account_name VARCHAR, + IN in2_exchange_account_name TEXT, IN in2_execution_date INT8, IN in2_wire_source_h_payto BYTEA, - IN in2_payto_uri VARCHAR, + IN in2_payto_uri TEXT, IN in2_notify TEXT, IN in3_reserve_pub BYTEA, IN in3_wire_ref INT8, IN in3_credit taler_amount, - IN in3_exchange_account_name VARCHAR, + IN in3_exchange_account_name TEXT, IN in3_execution_date INT8, IN in3_wire_source_h_payto BYTEA, - IN in3_payto_uri VARCHAR, + IN in3_payto_uri TEXT, IN in3_notify TEXT, IN in4_reserve_pub BYTEA, IN in4_wire_ref INT8, IN in4_credit taler_amount, - IN in4_exchange_account_name VARCHAR, + IN in4_exchange_account_name TEXT, IN in4_execution_date INT8, IN in4_wire_source_h_payto BYTEA, - IN in4_payto_uri VARCHAR, + IN in4_payto_uri TEXT, IN in4_notify TEXT, IN in5_reserve_pub BYTEA, IN in5_wire_ref INT8, IN in5_credit taler_amount, - IN in5_exchange_account_name VARCHAR, + IN in5_exchange_account_name TEXT, IN in5_execution_date INT8, IN in5_wire_source_h_payto BYTEA, - IN in5_payto_uri VARCHAR, + IN in5_payto_uri TEXT, IN in5_notify TEXT, IN in6_reserve_pub BYTEA, IN in6_wire_ref INT8, IN in6_credit taler_amount, - IN in6_exchange_account_name VARCHAR, + IN in6_exchange_account_name TEXT, IN in6_execution_date INT8, IN in6_wire_source_h_payto BYTEA, - IN in6_payto_uri VARCHAR, + IN in6_payto_uri TEXT, IN in6_notify TEXT, IN in7_reserve_pub BYTEA, IN in7_wire_ref INT8, IN in7_credit taler_amount, - IN in7_exchange_account_name VARCHAR, + IN in7_exchange_account_name TEXT, IN in7_execution_date INT8, IN in7_wire_source_h_payto BYTEA, - IN in7_payto_uri VARCHAR, + IN in7_payto_uri TEXT, IN in7_notify TEXT, OUT transaction_duplicate0 BOOLEAN, OUT transaction_duplicate1 BOOLEAN, @@ -757,50 +753,43 @@ BEGIN ,in0_execution_date), (in1_reserve_pub ,in1_wire_ref - ,in1_credit.val - ,in1_credit.frac + ,in1_credit ,in1_exchange_account_name ,in1_wire_source_h_payto ,in1_execution_date), (in2_reserve_pub ,in2_wire_ref - ,in2_credit.val - ,in2_credit.frac + ,in2_credit ,in2_exchange_account_name ,in2_wire_source_h_payto ,in2_execution_date), (in3_reserve_pub ,in3_wire_ref - ,in3_credit.val - ,in3_credit.frac + ,in3_credit ,in3_exchange_account_name ,in3_wire_source_h_payto ,in3_execution_date), (in4_reserve_pub ,in4_wire_ref - ,in4_credit.val - ,in4_credit.frac + ,in4_credit ,in4_exchange_account_name ,in4_wire_source_h_payto ,in4_execution_date), (in5_reserve_pub ,in5_wire_ref - ,in5_credit.val - ,in5_credit.frac + ,in5_credit ,in5_exchange_account_name ,in5_wire_source_h_payto ,in5_execution_date), (in6_reserve_pub ,in6_wire_ref - ,in6_credit.val - ,in6_credit.frac + ,in6_credit ,in6_exchange_account_name ,in6_wire_source_h_payto ,in6_execution_date), (in7_reserve_pub ,in7_wire_ref - ,in7_credit.val - ,in7_credit.frac + ,in7_credit ,in7_exchange_account_name ,in7_wire_source_h_payto ,in7_execution_date) @@ -920,10 +909,10 @@ CREATE OR REPLACE FUNCTION exchange_do_array_reserves_insert( IN ina_reserve_pub BYTEA[], IN ina_wire_ref INT8[], IN ina_credit taler_amount[], - IN ina_exchange_account_name VARCHAR[], + IN ina_exchange_account_name TEXT[], IN ina_execution_date INT8[], IN ina_wire_source_h_payto BYTEA[], - IN ina_payto_uri VARCHAR[], + IN ina_payto_uri TEXT[], IN ina_notify TEXT[]) RETURNS SETOF exchange_do_array_reserve_insert_return_type LANGUAGE plpgsql diff --git a/src/exchangedb/exchange_get_ready_deposit.sql b/src/exchangedb/exchange_get_ready_deposit.sql index 4f76463fc..2186f561a 100644 --- a/src/exchangedb/exchange_get_ready_deposit.sql +++ b/src/exchangedb/exchange_get_ready_deposit.sql @@ -17,7 +17,7 @@ CREATE OR REPLACE FUNCTION exchange_do_get_ready_deposit( IN in_now INT8, IN in_start_shard_now INT8, IN in_end_shard_now INT8, - OUT out_payto_uri VARCHAR, + OUT out_payto_uri TEXT, OUT out_merchant_pub BYTEA ) LANGUAGE plpgsql diff --git a/src/exchangedb/pg_reserves_in_insert.c b/src/exchangedb/pg_reserves_in_insert.c index b2d547812..f4fe655ec 100644 --- a/src/exchangedb/pg_reserves_in_insert.c +++ b/src/exchangedb/pg_reserves_in_insert.c @@ -526,7 +526,7 @@ transact ( "SELECT" " out_duplicate AS duplicate " "FROM exchange_do_batch_reserves_update" - " ($1,$2,$3,$4,$5,$6,$7,$8);"); + " ($1,$2,$3,$4,$5,$6,$7);"); for (unsigned int i = 0; i<reserves_length; i++) { if (! rr[i].conflicts) @@ -580,7 +580,7 @@ transact ( enum GNUNET_DB_QueryStatus -TEH_PG_reserves_in_insert ( +TEH_PG_reserves_in_insertL ( void *cls, const struct TALER_EXCHANGEDB_ReserveInInfo *reserves, unsigned int reserves_length, @@ -619,8 +619,6 @@ TEH_PG_reserves_in_insert ( } -#if 0 - /** * Closure for our helper_cb() */ @@ -644,13 +642,13 @@ struct Context /** * Set to #GNUNET_SYSERR on failures. */ - struct GNUNET_GenericReturnValue status; + enum GNUNET_GenericReturnValue status; /** * Single value (no array) set to true if we need * to follow-up with an update. */ - bool *needs_update; + bool needs_update; }; @@ -691,23 +689,25 @@ helper_cb (void *cls, ctx->status = GNUNET_SYSERR; return; } - *ctx->need_update |= ctx->conflicts[i]; + ctx->needs_update |= ctx->conflicts[i]; } } enum GNUNET_DB_QueryStatus -TEH_PG_reserves_in_insertN ( +TEH_PG_reserves_in_insert ( void *cls, const struct TALER_EXCHANGEDB_ReserveInInfo *reserves, unsigned int reserves_length, + unsigned int batch_size, enum GNUNET_DB_QueryStatus *results) { + (void) batch_size; struct PostgresClosure *pg = cls; struct TALER_PaytoHashP h_paytos[GNUNET_NZL (reserves_length)]; char *notify_s[GNUNET_NZL (reserves_length)]; - struct TALER_ReservePublicKeyP *reserve_pubs[GNUNET_NZL (reserves_length)]; - struct TALER_Amount *balances[GNUNET_NZL (reserves_length)]; + struct TALER_ReservePublicKeyP reserve_pubs[GNUNET_NZL (reserves_length)]; + struct TALER_Amount balances[GNUNET_NZL (reserves_length)]; struct GNUNET_TIME_Timestamp execution_times[GNUNET_NZL (reserves_length)]; const char *sender_account_details[GNUNET_NZL (reserves_length)]; const char *exchange_account_names[GNUNET_NZL (reserves_length)]; @@ -719,8 +719,8 @@ TEH_PG_reserves_in_insertN ( = GNUNET_TIME_relative_to_timestamp (pg->idle_reserve_expiration_time); struct GNUNET_TIME_Timestamp gc = GNUNET_TIME_relative_to_timestamp (pg->legal_reserve_expiration_time); - bool needs_update = false; enum GNUNET_DB_QueryStatus qs; + bool need_update; for (unsigned int i = 0; i<reserves_length; i++) { @@ -729,8 +729,8 @@ TEH_PG_reserves_in_insertN ( TALER_payto_hash (reserve->sender_account_details, &h_paytos[i]); notify_s[i] = compute_notify_on_reserve (reserve->reserve_pub); - reserve_pubs[i] = &reserve->reserve_pub; - balances[i] = &reserve->balance; + reserve_pubs[i] = *reserve->reserve_pub; + balances[i] = *reserve->balance; execution_times[i] = reserve->execution_time; sender_account_details[i] = reserve->sender_account_details; exchange_account_names[i] = reserve->exchange_account_name; @@ -760,7 +760,7 @@ TEH_PG_reserves_in_insertN ( "SELECT" " transaction_duplicate" ",ruuid" - "FROM exchange_do_array_reserves_insert" + " FROM exchange_do_array_reserves_insert" " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10);"); { struct GNUNET_PQ_QueryParam params[] = { @@ -772,40 +772,44 @@ TEH_PG_reserves_in_insertN ( GNUNET_PQ_query_param_array_uint64 (reserves_length, wire_references, pg->conn), - TALER_PQ_query_param_array_amount (reserves_length, - balances, - pg->conn), - GNUNET_PQ_query_param_array_string (reserves_length, - exchange_account_names, - pg->conn), - GNUNET_PQ_query_param_array_timestamp (reserves_length, - execution_times, - pg->conn), - GNUNET_PQ_query_param_array_bytes_same_size_cont_auto ( + TALER_PQ_query_param_array_amount ( + reserves_length, + balances, + pg->conn), + GNUNET_PQ_query_param_array_ptrs_string ( + reserves_length, + (const char **) exchange_account_names, + pg->conn), + GNUNET_PQ_query_param_array_timestamp ( + reserves_length, + execution_times, + pg->conn), + GNUNET_PQ_query_param_array_auto_from_type ( reserves_length, h_paytos, - sizeof (struct GNUNET_PaytoHashP), pg->conn), - GNUNET_PQ_query_param_array_string (reserves_length, - sender_account_details, - pg->conn), - GNUNET_PQ_query_param_array_string (reserves_length, - notify_s, - pg->conn), + GNUNET_PQ_query_param_array_ptrs_string ( + reserves_length, + (const char **) sender_account_details, + pg->conn), + GNUNET_PQ_query_param_array_ptrs_string ( + reserves_length, + (const char **) notify_s, + pg->conn), GNUNET_PQ_query_param_end }; struct Context ctx = { .reserve_uuids = reserve_uuids, .transaction_duplicates = transaction_duplicates, .conflicts = conflicts, - .needs_update = &needs_update, + .needs_update = false, .status = GNUNET_OK }; qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, "reserves_insert_with_array", params, - &multi_res, + &helper_cb, &ctx); if ( (qs < 0) || (GNUNET_OK != ctx.status) ) @@ -815,6 +819,7 @@ TEH_PG_reserves_in_insertN ( qs); goto finished; } + need_update = ctx.needs_update; } { @@ -857,13 +862,13 @@ TEH_PG_reserves_in_insertN ( { bool duplicate; struct GNUNET_PQ_QueryParam params[] = { - GNUNET_PQ_query_param_auto_from_type (reserve_pubs[i]), + GNUNET_PQ_query_param_auto_from_type (&reserve_pubs[i]), GNUNET_PQ_query_param_timestamp (&reserve_expiration), - GNUNET_PQ_query_param_uint64 (&wire_reference[i]), + GNUNET_PQ_query_param_uint64 (&wire_references[i]), TALER_PQ_query_param_amount (pg->conn, - balances[i]), + &balances[i]), GNUNET_PQ_query_param_string (exchange_account_names[i]), - GNUNET_PQ_query_param_auto_from_type (h_paytos[i]), + GNUNET_PQ_query_param_auto_from_type (&h_paytos[i]), GNUNET_PQ_query_param_string (notify_s[i]), GNUNET_PQ_query_param_end }; @@ -894,9 +899,6 @@ TEH_PG_reserves_in_insertN ( finished: GNUNET_PQ_event_do_poll (pg->conn); for (unsigned int i = 0; i<reserves_length; i++) - GNUNET_free (rrs[i].notify_s); + GNUNET_free (notify_s[i]); return qs; } - - -#endif diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh index c7bad8f6b..3c1d7e262 100755 --- a/src/testing/taler-unified-setup.sh +++ b/src/testing/taler-unified-setup.sh @@ -442,7 +442,7 @@ fi if [ "1" = "$START_FAKEBANK" ] then echo "Setting up fakebank ..." - $USE_VALGRIND taler-fakebank-run -c "$CONF" -L "$LOGLEVEL" 2> taler-fakebank-run.log & + $USE_VALGRIND taler-fakebank-run -c "$CONF" -L "$LOGLEVEL" -n 4 2> taler-fakebank-run.log & fi |