summaryrefslogtreecommitdiff
path: root/src/backenddb/plugin_merchantdb_postgres.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2023-04-23 17:45:53 +0200
committerChristian Grothoff <christian@grothoff.org>2023-04-23 17:45:53 +0200
commit889595f986d922ffbcdcd746fdfad7f1a0e53595 (patch)
tree41571e0f04caa95c06610440d2b8c9c3698b08ed /src/backenddb/plugin_merchantdb_postgres.c
parent4b7d9f5e19e9f28ec1163f3b6e5c00f0805e6221 (diff)
downloadmerchant-889595f986d922ffbcdcd746fdfad7f1a0e53595.tar.gz
merchant-889595f986d922ffbcdcd746fdfad7f1a0e53595.tar.bz2
merchant-889595f986d922ffbcdcd746fdfad7f1a0e53595.zip
make taler-merchant-wirewatch multi-instance capable
Diffstat (limited to 'src/backenddb/plugin_merchantdb_postgres.c')
-rw-r--r--src/backenddb/plugin_merchantdb_postgres.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 4728801f..19bd022a 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -32,9 +32,8 @@
#include "pg_helper.h"
#include "pg_lookup_instances.h"
#include "pg_lookup_transfers.h"
-#include "pg_insert_wirewatch_progress.h"
#include "pg_update_wirewatch_progress.h"
-#include "pg_select_wirewatch_progress.h"
+#include "pg_select_wirewatch_accounts.h"
/**
@@ -7395,8 +7394,8 @@ postgres_connect (void *cls)
GNUNET_PQ_make_prepare ("inactivate_account",
"UPDATE merchant_accounts SET"
" active=FALSE"
- " WHERE h_wire=$2 AND"
- " merchant_serial="
+ " WHERE h_wire=$2"
+ " AND merchant_serial="
" (SELECT merchant_serial"
" FROM merchant_instances"
" WHERE merchant_id=$1)"),
@@ -9802,12 +9801,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
= &TMH_PG_lookup_instance;
plugin->lookup_transfers
= &TMH_PG_lookup_transfers;
- plugin->insert_wirewatch_progress
- = &TMH_PG_insert_wirewatch_progress;
plugin->update_wirewatch_progress
= &TMH_PG_update_wirewatch_progress;
- plugin->select_wirewatch_progress
- = &TMH_PG_select_wirewatch_progress;
+ plugin->select_wirewatch_accounts
+ = &TMH_PG_select_wirewatch_accounts;
plugin->store_wire_fee_by_exchange = &postgres_store_wire_fee_by_exchange;
plugin->insert_reserve = &postgres_insert_reserve;
plugin->activate_reserve = &postgres_activate_reserve;