diff options
| author | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2020-06-21 16:44:15 -0400 |
|---|---|---|
| committer | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2020-06-21 16:44:15 -0400 |
| commit | 4893f3525b19e29ba32af6a4382d43d9d435127c (patch) | |
| tree | 40d8326935854be7b07f15adad47a16597f79f41 /src/backenddb/plugin_merchantdb_postgres.c | |
| parent | e5c81bcae0e402877fc9b6c54f91ef9ef3267b67 (diff) | |
| download | merchant-4893f3525b19e29ba32af6a4382d43d9d435127c.tar.gz merchant-4893f3525b19e29ba32af6a4382d43d9d435127c.tar.bz2 merchant-4893f3525b19e29ba32af6a4382d43d9d435127c.zip | |
improved backenddb tests
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 12dc3498..831c676a 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -4472,10 +4472,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 @@ -6112,6 +6112,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! */ @@ -6155,6 +6159,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! */ @@ -6200,6 +6208,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! */ @@ -6244,6 +6256,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! */ @@ -6291,6 +6307,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! */ @@ -6336,6 +6356,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! */ @@ -6384,6 +6408,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! */ @@ -6472,6 +6500,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! */ @@ -6515,6 +6547,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! */ @@ -6560,6 +6596,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! */ @@ -6604,6 +6644,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! */ @@ -6651,6 +6695,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! */ @@ -6696,6 +6744,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! */ @@ -6744,6 +6796,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! */ |