From 10bed6b0c467e0a3e857110aeeea5b20e4da3afc Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Mon, 11 Sep 2023 18:22:31 -0500
Subject: [PATCH] Kludge to work-around lack of SUPERUSER role properties when
 vacuuming

---
 make_files/make_db.mk | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/make_files/make_db.mk b/make_files/make_db.mk
index 728a124..ecec9d1 100644
--- a/make_files/make_db.mk
+++ b/make_files/make_db.mk
@@ -80,6 +80,11 @@ export DB_DEPENDS := Makefile \
                      $(GENERIC_DEPENDS) \
                      $(wildcard $(M4_DB_INCLUDE_PATH)/*.m4) \
                      $(wildcard $(M4_DB_INCLUDE_PATH)/*.sql)
+# Code to handle vacuuming when not superuser (ugly kludge)
+VACUUM_CLEANUP := 2>&1 \
+                 | { result=$$? ; \
+                 grep -qv '^Warning: .* only superuser can vacuum it$$' ; \
+                 exit $$result ; }
 
 ##
 ## The available targets for make (make TARGET) are:
@@ -135,8 +140,9 @@ reinstall-db: db/schemas/dropschemas.sql \
 	( $(PSQL_SETUP) \
 	  cat db/schemas/dropschemas.sql ; ) \
 	| psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) --set=ON_ERROR_STOP=y
-	( echo 'VACUUM;' ; ) \
-	| psql $(PSQL_ARGS)
+	( $(PSQL_SETUP) \
+	  echo 'VACUUM;' ; ) \
+	| psql $(PSQL_ARGS) $(VACUUM_CLEANUP)
 	( $(PSQL_SETUP) \
 	  cat $(CREATE_DB_TARGETS) $(CREATE_SUB_DB_TARGETS) ; ) \
 	| psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) --set=ON_ERROR_STOP=y
@@ -148,8 +154,9 @@ destroy-db: $(DROP_SUB_DB_TARGETS) $(DROP_DB_TARGETS)
 	( $(PSQL_SETUP) \
 	  cat $? ; ) \
 	| psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) --set=ON_ERROR_STOP=y
-	( echo 'VACUUM;' ; ) \
-	| psql $(PSQL_ARGS)
+	( $(PSQL_SETUP) \
+	  echo 'VACUUM;' ; ) \
+	| psql $(PSQL_ARGS) $(VACUUM_CLEANUP)
 
 ##   installtables      Create all tables in the db and set their permissions
 ##   droptables         Drop all tables in the db
-- 
2.34.1