summaryrefslogtreecommitdiff
path: root/src/exchangedb
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-04-26 17:46:36 +0200
committerChristian Grothoff <christian@grothoff.org>2022-04-26 17:46:36 +0200
commit336f2d8991fe4b77b625415c179f68b387a2719b (patch)
treefe89fc465d87535339bf627c159ded1eff371599 /src/exchangedb
parent25aa208d122f8967d7821222a7809acfaf57abd3 (diff)
downloadexchange-336f2d8991fe4b77b625415c179f68b387a2719b.tar.gz
exchange-336f2d8991fe4b77b625415c179f68b387a2719b.tar.bz2
exchange-336f2d8991fe4b77b625415c179f68b387a2719b.zip
-misc. minor fixes
Diffstat (limited to 'src/exchangedb')
-rw-r--r--src/exchangedb/exchange-0001-part.sql8
-rw-r--r--src/exchangedb/plugin_exchangedb_postgres.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/src/exchangedb/exchange-0001-part.sql b/src/exchangedb/exchange-0001-part.sql
index d17e5a837..9053e4884 100644
--- a/src/exchangedb/exchange-0001-part.sql
+++ b/src/exchangedb/exchange-0001-part.sql
@@ -2734,6 +2734,14 @@ DECLARE
my_kyc_passed BOOLEAN;
BEGIN
+-- comment out for now
+IF TRUE
+THEN
+ out_no_funds=FALSE;
+ out_conflict=FALSE;
+ RETURN;
+END IF;
+
-- Store purse merge signature, checks for purse_pub uniqueness
INSERT INTO purse_merges
(partner_serial_id
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 8091cba41..238322c93 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -3483,8 +3483,8 @@ prepare_statements (struct PostgresClosure *pg)
",balance_frac"
",merge_timestamp"
" FROM purse_requests"
- " WHERE purse_pub=$1"
- " LEFT JOIN purse_merges ON (purse_pub);",
+ " LEFT JOIN purse_merges USING (purse_pub)"
+ " WHERE purse_pub=$1;",
1),
/* Used in #postgres_select_purse_request */
GNUNET_PQ_make_prepare (