diff options
Diffstat (limited to 'src/exchangedb')
| -rw-r--r-- | src/exchangedb/exchange-0001-part.sql | 8 | ||||
| -rw-r--r-- | src/exchangedb/plugin_exchangedb_postgres.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/exchangedb/exchange-0001-part.sql b/src/exchangedb/exchange-0001-part.sql index d17e5a83..9053e488 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 8091cba4..238322c9 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 ( |