commit fdf7051569ecc0cf0d60d5cc75c10e760d7a61b5 parent a5588bc383115bce1aeadf5ecb6eb3387b05a027 Author: Christian Grothoff <christian@grothoff.org> Date: Wed, 22 Jul 2026 03:20:42 +0200 merchantdb: make prepared statement names mirror function names Diffstat:
26 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/src/backenddb/delete_instance.c b/src/backenddb/delete_instance.c @@ -43,10 +43,10 @@ TALER_MERCHANTDB_delete_instance ( }; PREPARE (pg, - "purge_instance", + "delete_instance", "DELETE FROM merchant.merchant_instances" " WHERE merchant_id = $1"); return GNUNET_PQ_eval_prepared_non_select (pg->conn, - "purge_instance", + "delete_instance", params); } diff --git a/src/backenddb/do_expire_locks.c b/src/backenddb/do_expire_locks.c @@ -34,18 +34,18 @@ TALER_MERCHANTDB_do_expire_locks (struct TALER_MERCHANTDB_PostgresContext *pg) }; uint64_t total; struct GNUNET_PQ_ResultSpec rs[] = { - GNUNET_PQ_result_spec_uint64 ("expire_locks", + GNUNET_PQ_result_spec_uint64 ("do_expire_locks", &total), GNUNET_PQ_result_spec_end }; enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "expire_locks", + "do_expire_locks", "SELECT expire_locks($1) " " AS expire_locks"); qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn, - "expire_locks", + "do_expire_locks", params, rs); if (qs < 0) diff --git a/src/backenddb/get_donau_keys.c b/src/backenddb/get_donau_keys.c @@ -48,14 +48,14 @@ TALER_MERCHANTDB_get_donau_keys ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "lookup_donau_keys", + "get_donau_keys", "SELECT" " first_retry" ",keys_json::TEXT" " FROM merchant_donau_keys" " WHERE donau_url=$1;"); qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn, - "lookup_donau_keys", + "get_donau_keys", params, rs); if (qs <= 0) diff --git a/src/backenddb/get_exchange_keys.c b/src/backenddb/get_exchange_keys.c @@ -50,14 +50,14 @@ TALER_MERCHANTDB_get_exchange_keys ( *keys = NULL; PREPARE (pg, - "select_exchange_keys", + "get_exchange_keys", "SELECT" " first_retry" ",keys_json::TEXT" " FROM merchant.merchant_exchange_keys" " WHERE exchange_url=$1;"); qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn, - "select_exchange_keys", + "get_exchange_keys", params, rs); if (qs <= 0) diff --git a/src/backenddb/get_exchange_wire_fee.c b/src/backenddb/get_exchange_wire_fee.c @@ -60,7 +60,7 @@ TALER_MERCHANTDB_get_exchange_wire_fee ( strlen (wire_method) + 1, &h_wire_method); PREPARE (pg, - "lookup_wire_fee", + "get_exchange_wire_fee", "SELECT" " wire_fee" ",closing_fee" @@ -73,7 +73,7 @@ TALER_MERCHANTDB_get_exchange_wire_fee ( " AND start_date <= $3" " AND end_date > $3"); return GNUNET_PQ_eval_prepared_singleton_select (pg->conn, - "lookup_wire_fee", + "get_exchange_wire_fee", params, rs); } diff --git a/src/backenddb/get_instance_auth.c b/src/backenddb/get_instance_auth.c @@ -43,14 +43,14 @@ TALER_MERCHANTDB_get_instance_auth ( }; PREPARE (pg, - "lookup_instance_auth", + "get_instance_auth", "SELECT" " auth_hash" ",auth_salt" " FROM merchant.merchant_instances" " WHERE merchant_id=$1"); return GNUNET_PQ_eval_prepared_singleton_select (pg->conn, - "lookup_instance_auth", + "get_instance_auth", params, rs); } diff --git a/src/backenddb/get_mfa_challenge.c b/src/backenddb/get_mfa_challenge.c @@ -74,7 +74,7 @@ TALER_MERCHANTDB_get_mfa_challenge ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "lookup_mfa_challenge", + "get_mfa_challenge", "SELECT " " op::TEXT" " ,salt" @@ -95,7 +95,7 @@ TALER_MERCHANTDB_get_mfa_challenge ( *required_address = NULL; *retry_counter = 0; qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn, - "lookup_mfa_challenge", + "get_mfa_challenge", params, rs); if (qs <= 0) diff --git a/src/backenddb/get_report_by_token.c b/src/backenddb/get_report_by_token.c @@ -48,14 +48,14 @@ TALER_MERCHANTDB_get_report_by_token ( }; PREPARE (pg, - "check_report", + "get_report_by_token", "SELECT" " out_merchant_id" " ,out_data_source" " FROM merchant.check_report($1, $2, $3)"); return GNUNET_PQ_eval_prepared_singleton_select ( pg->conn, - "check_report", + "get_report_by_token", params, rs); } diff --git a/src/backenddb/insert_exchange_keys.c b/src/backenddb/insert_exchange_keys.c @@ -67,7 +67,7 @@ TALER_MERCHANTDB_insert_exchange_keys ( " $1::TEXT::JSONB, $2, $3, $4, $5, $6" ");"); PREPARE (pg, - "update_exchange_keys", + "insert_exchange_keys_update", "UPDATE merchant.merchant_exchange_keys SET" /* preserve old keys if new ones failed to download */ " keys_json=COALESCE($1::TEXT::JSONB,keys_json)" @@ -78,7 +78,7 @@ TALER_MERCHANTDB_insert_exchange_keys ( " WHERE" " exchange_url=$4;"); qs = GNUNET_PQ_eval_prepared_non_select (pg->conn, - "update_exchange_keys", + "insert_exchange_keys_update", params); if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) qs = GNUNET_PQ_eval_prepared_non_select (pg->conn, diff --git a/src/backenddb/insert_exchange_signing_key.c b/src/backenddb/insert_exchange_signing_key.c @@ -45,7 +45,7 @@ TALER_MERCHANTDB_insert_exchange_signing_key ( }; PREPARE (pg, - "insert_exchange_signkey", + "insert_exchange_signing_key", "INSERT INTO merchant.merchant_exchange_signing_keys" "(master_pub" ",exchange_pub" @@ -57,7 +57,7 @@ TALER_MERCHANTDB_insert_exchange_signing_key ( "($1, $2, $3, $4, $5, $6)" " ON CONFLICT DO NOTHING;"); return GNUNET_PQ_eval_prepared_non_select (pg->conn, - "insert_exchange_signkey", + "insert_exchange_signing_key", params); } diff --git a/src/backenddb/insert_exchange_wire_fee.c b/src/backenddb/insert_exchange_wire_fee.c @@ -49,7 +49,7 @@ TALER_MERCHANTDB_insert_exchange_wire_fee ( /* no preflight check here, run in its own transaction by the caller */ PREPARE (pg, - "insert_wire_fee", + "insert_exchange_wire_fee", "INSERT INTO merchant.merchant_exchange_wire_fees" "(master_pub" ",h_wire_method" @@ -67,6 +67,6 @@ TALER_MERCHANTDB_insert_exchange_wire_fee ( GNUNET_TIME_timestamp2s (start_date), TALER_amount2s (&fees->wire)); return GNUNET_PQ_eval_prepared_non_select (pg->conn, - "insert_wire_fee", + "insert_exchange_wire_fee", params); } diff --git a/src/backenddb/insert_mfa_challenge.c b/src/backenddb/insert_mfa_challenge.c @@ -63,7 +63,7 @@ TALER_MERCHANTDB_insert_mfa_challenge ( }; PREPARE (pg, - "create_mfa_challenge", + "insert_mfa_challenge", "INSERT INTO merchant.tan_challenges" " (h_body" " ,salt" @@ -80,7 +80,7 @@ TALER_MERCHANTDB_insert_mfa_challenge ( " ($1, $2, $3, $4, $5, $6, $7, 3, $8, $9, $10)" " RETURNING challenge_id;"); return GNUNET_PQ_eval_prepared_singleton_select (pg->conn, - "create_mfa_challenge", + "insert_mfa_challenge", params, rs); } diff --git a/src/backenddb/iterate_accounts.c b/src/backenddb/iterate_accounts.c @@ -147,7 +147,7 @@ TALER_MERCHANTDB_iterate_accounts ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "select_accounts", + "iterate_accounts", "SELECT" " out_merchant_id" " ,out_merchant_priv" @@ -160,7 +160,7 @@ TALER_MERCHANTDB_iterate_accounts ( " ,out_active" " FROM merchant.select_accounts()"); qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, - "select_accounts", + "iterate_accounts", params, &select_account_cb, &lic); diff --git a/src/backenddb/iterate_all_donau_instances.c b/src/backenddb/iterate_all_donau_instances.c @@ -139,7 +139,7 @@ TALER_MERCHANTDB_iterate_all_donau_instances ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "select_all_donau_instances", + "iterate_all_donau_instances", "SELECT" " out_donau_instances_serial" " ,out_donau_url" @@ -152,7 +152,7 @@ TALER_MERCHANTDB_iterate_all_donau_instances ( " ,out_keys_json::TEXT" " FROM merchant.select_all_donau_instances()"); qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, - "select_all_donau_instances", + "iterate_all_donau_instances", params, &select_donau_instance_cb, &sdc); diff --git a/src/backenddb/iterate_exchange_accounts.c b/src/backenddb/iterate_exchange_accounts.c @@ -121,7 +121,7 @@ TALER_MERCHANTDB_iterate_exchange_accounts ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "select_exchange_accounts", + "iterate_exchange_accounts", "SELECT" " payto_uri" ",conversion_url" @@ -132,7 +132,7 @@ TALER_MERCHANTDB_iterate_exchange_accounts ( " WHERE master_pub=$1;"); qs = GNUNET_PQ_eval_prepared_multi_select ( pg->conn, - "select_exchange_accounts", + "iterate_exchange_accounts", params, &parse_accounts, &ctx); diff --git a/src/backenddb/iterate_exchanges.c b/src/backenddb/iterate_exchanges.c @@ -125,7 +125,7 @@ TALER_MERCHANTDB_iterate_exchanges ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "select_exchanges", + "iterate_exchanges", "SELECT" " exchange_url" " ,first_retry" @@ -136,7 +136,7 @@ TALER_MERCHANTDB_iterate_exchanges ( " FROM merchant.merchant_exchange_keys"); qs = GNUNET_PQ_eval_prepared_multi_select ( pg->conn, - "select_exchanges", + "iterate_exchanges", params, &lookup_exchanges_cb, &plc); diff --git a/src/backenddb/iterate_instances.c b/src/backenddb/iterate_instances.c @@ -191,7 +191,7 @@ TALER_MERCHANTDB_iterate_instances ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "lookup_instances", + "iterate_instances", "SELECT" " merchant_serial" " ,merchant_pub" @@ -216,7 +216,7 @@ TALER_MERCHANTDB_iterate_instances ( " FROM merchant.merchant_instances" " WHERE (NOT $1 OR merchant_priv IS NOT NULL)"); qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, - "lookup_instances", + "iterate_instances", params, &lookup_instances_cb, &lic); diff --git a/src/backenddb/iterate_open_expected_transfers.c b/src/backenddb/iterate_open_expected_transfers.c @@ -130,7 +130,7 @@ TALER_MERCHANTDB_iterate_open_expected_transfers ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "select_open_transfers", + "iterate_open_expected_transfers", "SELECT" " out_expected_credit_serial" " ,out_instance_id" @@ -141,7 +141,7 @@ TALER_MERCHANTDB_iterate_open_expected_transfers ( " FROM merchant.select_open_transfers($1)"); qs = GNUNET_PQ_eval_prepared_multi_select ( pg->conn, - "select_open_transfers", + "iterate_open_expected_transfers", params, &open_transfers_cb, &plc); diff --git a/src/backenddb/iterate_outdated_kyc_statuses.c b/src/backenddb/iterate_outdated_kyc_statuses.c @@ -123,7 +123,7 @@ TALER_MERCHANTDB_iterate_outdated_kyc_statuses ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "account_kyc_get_outdated", + "iterate_outdated_kyc_statuses", "SELECT" " out_merchant_id" " ,out_h_wire" @@ -131,7 +131,7 @@ TALER_MERCHANTDB_iterate_outdated_kyc_statuses ( " FROM merchant.account_kyc_get_outdated($1)"); qs = GNUNET_PQ_eval_prepared_multi_select ( pg->conn, - "account_kyc_get_outdated", + "iterate_outdated_kyc_statuses", params, &kyc_status_cb, &ksc); diff --git a/src/backenddb/iterate_pending_deposits.c b/src/backenddb/iterate_pending_deposits.c @@ -154,7 +154,7 @@ TALER_MERCHANTDB_iterate_pending_deposits ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "lookup_pending_deposits", + "iterate_pending_deposits", "SELECT" " out_deposit_serial" " ,out_h_contract_terms" @@ -168,7 +168,7 @@ TALER_MERCHANTDB_iterate_pending_deposits ( " ,out_coin_pub" " FROM merchant.lookup_pending_deposits($1, $2, $3, $4)"); qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, - "lookup_pending_deposits", + "iterate_pending_deposits", params, &lookup_deposits_cb, &ldc); diff --git a/src/backenddb/iterate_pending_reports.c b/src/backenddb/iterate_pending_reports.c @@ -144,7 +144,7 @@ TALER_MERCHANTDB_iterate_pending_reports ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "lookup_reports_pending", + "iterate_pending_reports", "SELECT" " out_merchant_id" " ,out_report_serial" @@ -160,7 +160,7 @@ TALER_MERCHANTDB_iterate_pending_reports ( " FROM merchant.lookup_reports_pending()"); qs = GNUNET_PQ_eval_prepared_multi_select ( pg->conn, - "lookup_reports_pending", + "iterate_pending_reports", params, &select_pending_reports_cb, &plc); diff --git a/src/backenddb/iterate_pending_webhooks.c b/src/backenddb/iterate_pending_webhooks.c @@ -134,7 +134,7 @@ TALER_MERCHANTDB_iterate_pending_webhooks ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "lookup_pending_webhooks", + "iterate_pending_webhooks", "SELECT" " webhook_pending_serial" " ,next_attempt" @@ -148,7 +148,7 @@ TALER_MERCHANTDB_iterate_pending_webhooks ( " ORDER BY next_attempt ASC" " LIMIT $2"); qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, - "lookup_pending_webhooks", + "iterate_pending_webhooks", params, &lookup_pending_webhooks_cb, &pwlc); diff --git a/src/backenddb/iterate_pending_webhooks_above_serial_id.c b/src/backenddb/iterate_pending_webhooks_above_serial_id.c @@ -140,7 +140,7 @@ TALER_MERCHANTDB_iterate_pending_webhooks_above_serial_id ( GNUNET_assert (0 == strcmp (instance_id, pg->current_merchant_id)); PREPARE (pg, - "lookup_all_webhooks", + "iterate_pending_webhooks_above_serial_id", " SELECT" " webhook_pending_serial AS out_webhook_pending_serial" " ,next_attempt AS out_next_attempt" @@ -155,7 +155,7 @@ TALER_MERCHANTDB_iterate_pending_webhooks_above_serial_id ( " ORDER BY webhook_pending_serial ASC" " LIMIT $3"); qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, - "lookup_all_webhooks", + "iterate_pending_webhooks_above_serial_id", params, &lookup_all_webhooks_cb, &pwlc); diff --git a/src/backenddb/iterate_wirewatch_accounts.c b/src/backenddb/iterate_wirewatch_accounts.c @@ -120,7 +120,7 @@ TALER_MERCHANTDB_iterate_wirewatch_accounts ( enum GNUNET_DB_QueryStatus qs; PREPARE (pg, - "select_wirewatch_accounts", + "iterate_wirewatch_accounts", "SELECT" " out_last_bank_serial" " ,out_merchant_id" @@ -129,7 +129,7 @@ TALER_MERCHANTDB_iterate_wirewatch_accounts ( " ,out_credit_facade_credentials::TEXT" " FROM merchant.select_wirewatch_accounts()"); qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn, - "select_wirewatch_accounts", + "iterate_wirewatch_accounts", params, &handle_results, &ctx); diff --git a/src/backenddb/start.c b/src/backenddb/start.c @@ -116,10 +116,10 @@ TALER_MERCHANTDB_commit ( "Committing transaction `%s'\n", pg->transaction_name); PREPARE (pg, - "do_commit", + "commit", "COMMIT"); qs = GNUNET_PQ_eval_prepared_non_select (pg->conn, - "do_commit", + "commit", params); pg->transaction_name = NULL; return qs; diff --git a/src/backenddb/update_to_instance_private_key_deleted.c b/src/backenddb/update_to_instance_private_key_deleted.c @@ -35,11 +35,11 @@ TALER_MERCHANTDB_update_to_instance_private_key_deleted ( }; PREPARE (pg, - "delete_instance_private_key", + "update_to_instance_private_key_deleted", "UPDATE merchant.merchant_instances" " SET merchant_priv = NULL" " WHERE merchant_id = $1"); return GNUNET_PQ_eval_prepared_non_select (pg->conn, - "delete_instance_private_key", + "update_to_instance_private_key_deleted", params); }