From e0d46f96859b33b3f04791028e30bce4f0173567 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 18 Jan 2024 12:08:53 +0100 Subject: auditordb tabularasa --- src/auditordb/Makefile.am | 126 ++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 67 deletions(-) (limited to 'src/auditordb/Makefile.am') diff --git a/src/auditordb/Makefile.am b/src/auditordb/Makefile.am index af5c5a1e0..3e7d83d09 100644 --- a/src/auditordb/Makefile.am +++ b/src/auditordb/Makefile.am @@ -15,22 +15,32 @@ sqldir = $(prefix)/share/taler/sql/auditor/ sqlinputs = \ 0002-*.sql \ - auditor-0002.sql.in -# auditor_do_*.sql -# procedures.sql.in + auditor-0002.sql.in \ + auditor_do_*.sql \ + procedures.sql.in sql_DATA = \ versioning.sql \ auditor-0001.sql \ auditor-0002.sql \ drop.sql \ - restart.sql + restart.sql \ + procedures.sql + +CLEANFILES = \ + auditor-0002.sql + +procedures.sql: procedures.sql.in auditor_do_*.sql + chmod +w $@ || true + gcc -E -P -undef - < procedures.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@ + chmod ugo-w $@ auditor-0002.sql: auditor-0002.sql.in 0002-*.sql chmod +w $@ || true gcc -E -P -undef - < auditor-0002.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@ chmod ugo-w $@ + EXTRA_DIST = \ auditordb-postgres.conf \ test-auditor-db-postgres.conf \ @@ -48,67 +58,38 @@ endif libtaler_plugin_auditordb_postgres_la_SOURCES = \ plugin_auditordb_postgres.c pg_helper.h \ - pg_insert_auditor_progress_reserve.h pg_insert_auditor_progress_reserve.c \ - pg_update_auditor_progress_reserve.h pg_update_auditor_progress_reserve.c \ - pg_get_auditor_progress_reserve.h pg_get_auditor_progress_reserve.c \ - pg_insert_auditor_progress_purse.h pg_insert_auditor_progress_purse.c \ - pg_update_auditor_progress_purse.h pg_update_auditor_progress_purse.c \ - pg_get_auditor_progress_purse.h pg_get_auditor_progress_purse.c \ - pg_insert_auditor_progress_aggregation.h pg_insert_auditor_progress_aggregation.c \ - pg_update_auditor_progress_aggregation.h pg_update_auditor_progress_aggregation.c \ - pg_get_auditor_progress_aggregation.h pg_get_auditor_progress_aggregation.c \ - pg_insert_auditor_progress_deposit_confirmation.h pg_insert_auditor_progress_deposit_confirmation.c \ - pg_update_auditor_progress_deposit_confirmation.h pg_update_auditor_progress_deposit_confirmation.c \ - pg_get_auditor_progress_deposit_confirmation.h pg_get_auditor_progress_deposit_confirmation.c \ - pg_insert_auditor_progress_coin.h pg_insert_auditor_progress_coin.c \ - pg_update_auditor_progress_coin.h pg_update_auditor_progress_coin.c \ - pg_get_auditor_progress_coin.h pg_get_auditor_progress_coin.c \ - pg_insert_wire_auditor_account_progress.h pg_insert_wire_auditor_account_progress.c \ - pg_update_wire_auditor_account_progress.h pg_update_wire_auditor_account_progress.c \ - pg_get_wire_auditor_account_progress.h pg_get_wire_auditor_account_progress.c \ - pg_insert_wire_auditor_progress.h pg_insert_wire_auditor_progress.c \ - pg_update_wire_auditor_progress.h pg_update_wire_auditor_progress.c \ - pg_get_wire_auditor_progress.h pg_get_wire_auditor_progress.c \ - pg_insert_reserve_info.h pg_insert_reserve_info.c \ - pg_update_reserve_info.h pg_update_reserve_info.c \ - pg_del_reserve_info.h pg_del_reserve_info.c \ - pg_get_reserve_info.h pg_get_reserve_info.c \ - pg_insert_reserve_summary.h pg_insert_reserve_summary.c \ - pg_update_reserve_summary.h pg_update_reserve_summary.c \ - pg_select_pending_deposits.h pg_select_pending_deposits.c \ - pg_delete_pending_deposit.h pg_delete_pending_deposit.c \ - pg_insert_pending_deposit.h pg_insert_pending_deposit.c \ - pg_get_reserve_summary.h pg_get_reserve_summary.c \ - pg_insert_wire_fee_summary.h pg_insert_wire_fee_summary.c \ - pg_update_wire_fee_summary.h pg_update_wire_fee_summary.c \ - pg_get_wire_fee_summary.h pg_get_wire_fee_summary.c \ - pg_insert_denomination_balance.h pg_insert_denomination_balance.c \ - pg_update_denomination_balance.h pg_update_denomination_balance.c \ - pg_get_denomination_balance.h pg_get_denomination_balance.c \ - pg_insert_balance_summary.h pg_insert_balance_summary.c \ - pg_update_balance_summary.h pg_update_balance_summary.c \ - pg_get_balance_summary.h pg_get_balance_summary.c \ - pg_insert_historic_denom_revenue.h pg_insert_historic_denom_revenue.c \ - pg_select_historic_denom_revenue.h pg_select_historic_denom_revenue.c \ - pg_insert_historic_reserve_revenue.h pg_insert_historic_reserve_revenue.c \ - pg_select_historic_reserve_revenue.h pg_select_historic_reserve_revenue.c \ - pg_insert_predicted_result.h pg_insert_predicted_result.c \ - pg_update_predicted_result.h pg_update_predicted_result.c \ - pg_get_predicted_balance.h pg_get_predicted_balance.c \ - pg_insert_exchange.h pg_insert_exchange.c \ - pg_list_exchanges.h pg_list_exchanges.c \ - pg_delete_exchange.h pg_delete_exchange.c \ - pg_insert_exchange_signkey.h pg_insert_exchange_signkey.c \ - pg_insert_deposit_confirmation.h pg_insert_deposit_confirmation.c \ - pg_get_purse_info.h pg_get_purse_info.c \ - pg_delete_purse_info.h pg_delete_purse_info.c \ - pg_update_purse_info.h pg_update_purse_info.c \ - pg_insert_purse_info.h pg_insert_purse_info.c \ - pg_get_purse_summary.h pg_get_purse_summary.c \ - pg_select_purse_expired.h pg_select_purse_expired.c \ - pg_insert_purse_summary.h pg_insert_purse_summary.c \ - pg_update_purse_summary.h pg_update_purse_summary.c \ - pg_get_deposit_confirmations.h pg_get_deposit_confirmations.c + pg_delete_deposit_confirmations.c pg_delete_deposit_confirmations.h \ + pg_delete_pending_deposit.c pg_delete_pending_deposit.h \ + pg_delete_purse_info.c pg_delete_purse_info.h \ + pg_del_denomination_balance.h pg_del_denomination_balance.c \ + pg_del_reserve_info.c pg_del_reserve_info.h \ + pg_get_auditor_progress.c pg_get_auditor_progress.h \ + pg_get_balance.c pg_get_balance.h \ + pg_get_denomination_balance.c pg_get_denomination_balance.h \ + pg_get_deposit_confirmations.c pg_get_deposit_confirmations.h \ + pg_get_purse_info.c pg_get_purse_info.h \ + pg_get_reserve_info.c pg_get_reserve_info.h \ + pg_get_wire_fee_summary.c pg_get_wire_fee_summary.h \ + pg_insert_auditor_progress.c pg_insert_auditor_progress.h \ + pg_insert_balance.c pg_insert_balance.h \ + pg_insert_denomination_balance.c pg_insert_denomination_balance.h \ + pg_insert_deposit_confirmation.c pg_insert_deposit_confirmation.h \ + pg_insert_exchange_signkey.c pg_insert_exchange_signkey.h \ + pg_insert_historic_denom_revenue.c pg_insert_historic_denom_revenue.h \ + pg_insert_historic_reserve_revenue.c pg_insert_historic_reserve_revenue.h \ + pg_insert_pending_deposit.c pg_insert_pending_deposit.h \ + pg_insert_purse_info.c pg_insert_purse_info.h \ + pg_insert_reserve_info.c pg_insert_reserve_info.h \ + pg_select_historic_denom_revenue.c pg_select_historic_denom_revenue.h \ + pg_select_historic_reserve_revenue.c pg_select_historic_reserve_revenue.h \ + pg_select_pending_deposits.c pg_select_pending_deposits.h \ + pg_select_purse_expired.c pg_select_purse_expired.h \ + pg_update_auditor_progress.c pg_update_auditor_progress.h \ + pg_update_balance.c pg_update_balance.h \ + pg_update_denomination_balance.c pg_update_denomination_balance.h \ + pg_update_purse_info.c pg_update_purse_info.h \ + pg_update_reserve_info.c pg_update_reserve_info.h \ + pg_update_wire_fee_summary.c pg_update_wire_fee_summary.h libtaler_plugin_auditordb_postgres_la_LDFLAGS = \ $(TALER_PLUGIN_LDFLAGS) libtaler_plugin_auditordb_postgres_la_LIBADD = \ @@ -139,11 +120,22 @@ libtalerauditordb_la_LDFLAGS = \ check_PROGRAMS = \ - test-auditordb-postgres + test_auditordb_checkpoints-postgres \ + test_auditordb-postgres AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ - test-auditordb-postgres + test_auditordb_checkpoints-postgres \ + test_auditordb-postgres + +test_auditordb_checkpoints_postgres_SOURCES = \ + test_auditordb_checkpoints.c +test_auditordb_checkpoints_postgres_LDADD = \ + libtalerauditordb.la \ + $(top_srcdir)/src/pq/libtalerpq.la \ + $(top_srcdir)/src/util/libtalerutil.la \ + -lgnunetutil \ + $(XLIB) test_auditordb_postgres_SOURCES = \ test_auditordb.c -- cgit v1.2.3