diff options
Diffstat (limited to 'src/backenddb/plugin_merchantdb_postgres.c')
-rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 60 |
1 files changed, 58 insertions, 2 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index e1b14792..8e466b70 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -4511,10 +4511,10 @@ lookup_pending_reserves_cb (void *cls, struct GNUNET_PQ_ResultSpec rs[] = { GNUNET_PQ_result_spec_auto_from_type ("reserve_pub", &reserve_pub), + GNUNET_PQ_result_spec_string ("merchant_id", + &instance_id), GNUNET_PQ_result_spec_string ("exchange_url", &exchange_url), - GNUNET_PQ_result_spec_string ("instance_id", - &instance_id), TALER_PQ_RESULT_SPEC_AMOUNT ("merchant_initial_balance", &merchant_initial_balance), GNUNET_PQ_result_spec_end @@ -6163,6 +6163,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " creation_time > $4" " AND" " NOT CAST($5 as BOOL)" /* unclaimed orders are never paid */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial ASC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6206,6 +6210,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " creation_time > $4" " AND" " NOT CAST($6 as BOOL)"/* unclaimed orders are never refunded */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial ASC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6251,6 +6259,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " creation_time > $4" " AND" " NOT CAST($7 as BOOL)" /* unclaimed orders are never wired */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial ASC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6295,6 +6307,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " NOT CAST($5 as BOOL)" /* unclaimed orders are never paid */ " AND" " NOT CAST($6 as BOOL)"/* unclaimed orders are never refunded */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial ASC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6342,6 +6358,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " NOT CAST($5 as BOOL)" /* unclaimed orders are never paid */ " AND" " NOT CAST($7 as BOOL)" /* unclaimed orders are never wired */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial ASC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6387,6 +6407,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " NOT CAST($6 as BOOL)"/* unclaimed orders are never refunded */ " AND" " NOT CAST($7 as BOOL)" /* unclaimed orders are never wired */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial ASC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6435,6 +6459,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " NOT CAST($6 as BOOL)"/* unclaimed orders are never refunded */ " AND" " NOT CAST($7 as BOOL)" /* unclaimed orders are never wired */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial ASC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6523,6 +6551,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " creation_time < $4" " AND" " NOT CAST($5 as BOOL)" /* unclaimed orders are never paid */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial DESC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6566,6 +6598,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " creation_time < $4" " AND" " NOT CAST($6 as BOOL)"/* unclaimed orders are never refunded */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial DESC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6611,6 +6647,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " creation_time < $4" " AND" " NOT CAST($7 as BOOL)" /* unclaimed orders are never wired */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial DESC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6655,6 +6695,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " NOT CAST($5 as BOOL)" /* unclaimed orders are never paid */ " AND" " NOT CAST($6 as BOOL)"/* unclaimed orders are never refunded */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial DESC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6702,6 +6746,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " NOT CAST($5 as BOOL)" /* unclaimed orders are never paid */ " AND" " NOT CAST($7 as BOOL)" /* unclaimed orders are never wired */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial DESC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6747,6 +6795,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " NOT CAST($6 as BOOL)"/* unclaimed orders are never refunded */ " AND" " NOT CAST($7 as BOOL)" /* unclaimed orders are never wired */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial DESC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ @@ -6795,6 +6847,10 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " NOT CAST($6 as BOOL)"/* unclaimed orders are never refunded */ " AND" " NOT CAST($7 as BOOL)" /* unclaimed orders are never wired */ + " AND" + " order_serial NOT IN" + " (SELECT order_serial" + " FROM merchant_contract_terms)" /* only select unclaimed orders */ " ORDER BY order_serial DESC" " LIMIT $2)" "UNION " /* union ensures elements are distinct! */ |