Fix oversight to adopt PostgreSQL 12.

From PostgreSQL 12 WAL dir is renamed to "pg_wal". pgpool_setup should
have dealt with this.

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index a70846d64939aa02e5186eb654353b97337e3d1d..6a389ebe36de0549cdcdba35e930996d529ce5cf 100755 (executable)
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 #
+<<<<<<< HEAD
 # Copyright (c) 2013-2018 PgPool Global Development Group
+=======
+# Copyright (c) 2013-2020 PgPool Global Development Group
+>>>>>>> d847702e... Fix oversight to adopt PostgreSQL 12.
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby
@@ -434,12 +438,17 @@ echo "source: $master_db_cluster dest: $DEST_CLUSTER" >> $log
 rsync -C -a -c --delete --exclude postgresql.conf --exclude postmaster.pid \
 --exclude postmaster.opts --exclude pg_log \
 --exclude recovery.conf --exclude recovery.done \
---exclude pg_xlog \
+--exclude pg_xlog pg_wal \
 $master_db_cluster/ $DEST_CLUSTER/
 
 rm -fr $DEST_CLUSTER/pg_xlog 
 mkdir $DEST_CLUSTER/pg_xlog
 chmod 700 $DEST_CLUSTER/pg_xlog
+
+rm -fr $DEST_CLUSTER/pg_wal 
+mkdir $DEST_CLUSTER/pg_wal
+chmod 700 $DEST_CLUSTER/pg_wal
+
 rm $DEST_CLUSTER/recovery.done standby.signal
 rm standby.signal
 fi
@@ -532,13 +541,17 @@ REOF
 rsync -C -a -c --delete --exclude postgresql.conf --exclude postmaster.pid \
 --exclude postmaster.opts --exclude pg_log \
 --exclude recovery.done \
---exclude pg_xlog \
+--exclude pg_xlog pg_wal \
 $master_db_cluster/ $DEST_CLUSTER/
 
 rm -fr $DEST_CLUSTER/pg_xlog 
 mkdir $DEST_CLUSTER/pg_xlog
 chmod 700 $DEST_CLUSTER/pg_xlog
 
+rm -fr $DEST_CLUSTER/pg_wal
+mkdir $DEST_CLUSTER/pg_wal
+chmod 700 $DEST_CLUSTER/pg_wal
+
 $psql -p $PORT -c "SELECT pg_stop_backup()" postgres
 EOF