From 6965e2146d3e5e6a638f79cc2f78b96cc394ff37 Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Thu, 9 Nov 2023 15:24:16 -0600
Subject: [PATCH] Separate psql setup vars for different schemas

---
 conversion/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/conversion/Makefile b/conversion/Makefile
index 57363b4..5e40611 100644
--- a/conversion/Makefile
+++ b/conversion/Makefile
@@ -43,7 +43,8 @@ endif
 # Have a look as you'll probably want to set some of them.
 include $(MAKE_FILES)/defaults.mk
 # Adjust paths in defaults.mk
-PSQL_SETUP_ORIG := PSQL_SETUP
+PSQL_SETUP_ORIG := $(PSQL_SETUP)
+PSQL_SETUP := ../$(PSQL_SETUP)
 PSQL_DEPENDS := ../$(PSQL_DEPENDS)
 
 # Be sure that our dependences are met.
@@ -71,8 +72,8 @@ PSQL_SETUP: $(GENERIC_DEPENDS)
 #
 
 CONVERSION_SCHEMA := raw
-PSQL_SETUP := ../$(PSQL_SETUP) \
-              printf 'SET search_path TO $(CONVERSION_SCHEMA);\n' ;
+PSQL_RAW_SETUP := $(PSQL_SETUP) \
+                  printf 'SET search_path TO $(CONVERSION_SCHEMA);\n' ;
 
 ##
 ## The available targets for make (make TARGET) are:
@@ -108,7 +109,7 @@ restore: $(PSQL_DEPENDS)
 	[ -n "$(DATA_FILE)" ] \
            || { printf 'The DATA_FILE variable must be set\n' >&2 ; \
                 exit 1 ; }
-	( $(PSQL_SETUP) \
+	( $(PSQL_RAW_SETUP) \
 	  ./speedups.sh ; \
 	./mung_dump.sh $(DATA_FILE) ; ) \
 	| psql $(PSQL_ARGS) --set=ON_ERROR_STOP=y
@@ -116,6 +117,6 @@ restore: $(PSQL_DEPENDS)
 ##   grant_permissions  Give readers and writers read permission to all tables.
 .PHONY: grant_permissions
 grant_permissions: $(PSQL_DEPENDS) grant_permissions.sql
-	( $(PSQL_SETUP) \
+	( $(PSQL_RAW_SETUP) \
 	  cat grant_permissions.sql ; ) \
 	| psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) --set=ON_ERROR_STOP=y
-- 
2.34.1