From 303e73f327a059df1ef3fbd5869f84fb06fb3a2d Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 1 Oct 2023 15:22:58 -0500 Subject: [PATCH] Add dependencies everywhere psql is called --- db/schemas/Makefile | 36 +++++++++++++++++++----------------- make_files/defaults.mk | 3 +++ make_files/make_db.mk | 3 --- make_files/things.mk | 7 ++++--- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/db/schemas/Makefile b/db/schemas/Makefile index 2465929..0259803 100644 --- a/db/schemas/Makefile +++ b/db/schemas/Makefile @@ -68,6 +68,7 @@ M4_DB_INCLUDE_ARGS := -I $(M4_DB_INCLUDE_PATH) -I $(M4_GLOBAL_INCLUDE_PATH) # psql helper script PSQL_SETUP := ../../$(PSQL_SETUP) +PSQL_DEPENDS := $(patsubst %,../../%, $(PSQL_DEPENDS)) # Where the RST files are HTML_SRCDIR := ../../$(HTML_SRCDIR) @@ -203,21 +204,21 @@ clean-db: ## installtables Install the tables into the database .PHONY: installtables -installtables: createtables.sql +installtables: $(PSQL_DEPENDS) createtables.sql ( $(PSQL_SETUP) \ cat createtables.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## droptables Remove the tables from the database .PHONY: droptables -droptables: droptables.sql +droptables: $(PSQL_DEPENDS) droptables.sql ( $(PSQL_SETUP) \ cat droptables.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## installtriggers Install the triggers into the database .PHONY: installtriggers -installtriggers: createtriggers.sql +installtriggers: $(PSQL_DEPENDS) createtriggers.sql ( $(PSQL_SETUP) \ cat createtriggers.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) @@ -226,7 +227,7 @@ installtriggers: createtriggers.sql ## Install the triggers into the database outside of ## a transaction. .PHONY: installtriggersnolock -installtriggersnolock: createtriggers.sql +installtriggersnolock: $(PSQL_DEPENDS) createtriggers.sql ( $(PSQL_SETUP) \ cat createtriggers.sql ; ) \ | psql $(PSQL_ARGS) @@ -235,70 +236,70 @@ installtriggersnolock: createtriggers.sql ## Drop the triggers from the database outside of ## a transaction. .PHONY: droptriggersnolock -droptriggersnolock: droptriggers.sql +droptriggersnolock: $(PSQL_DEPENDS) droptriggers.sql ( $(PSQL_SETUP) \ cat droptriggers.sql ; ) \ | psql $(PSQL_ARGS) ## droptriggers Remove the triggers from the database .PHONY: droptriggers -droptriggers: droptriggers.sql +droptriggers: $(PSQL_DEPENDS) droptriggers.sql ( $(PSQL_SETUP) \ cat droptriggers.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## installfunctions Install the functions into the database .PHONY: installfunctions -installfunctions: createfunctions.sql +installfunctions: $(PSQL_DEPENDS) createfunctions.sql ( $(PSQL_SETUP) \ cat createfunctions.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## dropfunctions Remove the functions from the database .PHONY: dropfunctions -dropfunctions: dropfunctions.sql +dropfunctions: $(PSQL_DEPENDS) dropfunctions.sql ( $(PSQL_SETUP) \ cat dropfunctions.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## installviews Install the views into the database .PHONY: installviews -installviews: createviews.sql +installviews: $(PSQL_DEPENDS) createviews.sql ( $(PSQL_SETUP) \ cat createviews.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## dropviews Remove the views from the database .PHONY: dropviews -dropviews: dropviews.sql +dropviews: $(PSQL_DEPENDS) dropviews.sql ( $(PSQL_SETUP) \ cat dropviews.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## installindexes Install the indexes into the database .PHONY: installindexes -installindexes: createindexes.sql +installindexes: $(PSQL_DEPENDS) createindexes.sql ( $(PSQL_SETUP) \ cat createindexes.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## dropindexes Remove the indexes from the database .PHONY: dropindexes -dropindexes: dropindexes.sql +dropindexes: $(PSQL_DEPENDS) dropindexes.sql ( $(PSQL_SETUP) \ cat dropindexes.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## installcomments Install the comments into the database .PHONY: installcomments -installcomments: comment_on.sql +installcomments: $(PSQL_DEPENDS) comment_on.sql ( $(PSQL_SETUP) \ cat comment_on.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) ## dropcomments Remove the comments from the database .PHONY: dropcomments -dropcomments: comment_off.sql +dropcomments: $(PSQL_DEPENDS) comment_off.sql ( $(PSQL_SETUP) \ cat comment_off.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) @@ -532,7 +533,7 @@ $(COMMENT_SCHEMA_PATHS): # Having the template directory as a prerequsite not only creates # the template directory, but also creates it's content. .PHONY: $(COMMENT_TEMPLATE_PATHS) -$(COMMENT_TEMPLATE_PATHS): +$(COMMENT_TEMPLATE_PATHS): $(PSQL_DEPENDS) mkdir -p $@ ( $(PSQL_SETUP) \ printf "SELECT * FROM gen_func_comment_tmpl('%s');\n" \ @@ -542,7 +543,7 @@ $(COMMENT_TEMPLATE_PATHS): # Put the sql function we use for function comments into the db .PHONY: gen_func_comment_tmpl -gen_func_comment_tmpl: gen_func_comment_tmpl.sql +gen_func_comment_tmpl: $(PSQL_DEPENDS) gen_func_comment_tmpl.sql ( $(PSQL_SETUP) \ cat gen_func_comment_tmpl.sql ; ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) --set=ON_ERROR_STOP=y @@ -553,7 +554,8 @@ gen_func_comment_tmpl: gen_func_comment_tmpl.sql # and creates the pre-requsites. # Build our internal dependencies by way of prerequsites. .PHONY: build_comment_files -build_comment_files: $(COMMENT_TEMPLATE_PATHS) gen_func_comment_tmpl \ +build_comment_files: $(PSQL_DEPENDS) \ + $(COMMENT_TEMPLATE_PATHS) gen_func_comment_tmpl \ $(COMMENT_SCHEMA_PATHS) ./gen_comments.py $(HTML_SRCDIR) $(ORDER) # Aggregate comments in schemas into 2 single files. diff --git a/make_files/defaults.mk b/make_files/defaults.mk index 3061aea..a945572 100644 --- a/make_files/defaults.mk +++ b/make_files/defaults.mk @@ -51,3 +51,6 @@ export PSQL_SINGLE_TRANS := --single-transaction --file - # Variable to setup connections before use. export PSQL_SETUP := db/psql_setup.sh ; +# Almost all psql execution needs these targets, and who knows what sub-makes +# need (except for "clean" and "check") so always depend sub-makes on this too. +export PSQL_DEPENDS := db/psql_setup.sh diff --git a/make_files/make_db.mk b/make_files/make_db.mk index 2eaaea7..2d17ffa 100644 --- a/make_files/make_db.mk +++ b/make_files/make_db.mk @@ -85,9 +85,6 @@ VACUUM_CLEANUP := 2>&1 \ | { result=$$? ; \ grep -qv '^Warning: .* only superuser can vacuum it$$' ; \ exit $$result ; } -# Almost all psql execution needs these targets, and who knows what sub-makes -# need (except for "clean" and "check") so always depend sub-makes on this too. -PSQL_DEPENDS := db/psql_setup.sh ## ## The available targets for make (make TARGET) are: diff --git a/make_files/things.mk b/make_files/things.mk index cfb8f5f..d4fb868 100644 --- a/make_files/things.mk +++ b/make_files/things.mk @@ -46,6 +46,7 @@ M4_DB_INCLUDE_ARGS := -I $(M4_DB_INCLUDE_PATH) -I $(M4_GLOBAL_INCLUDE_PATH) # psql helper script PSQL_SETUP := ../../$(PSQL_SETUP) +PSQL_DEPENDS := $(patsubst %,../../%, $(PSQL_DEPENDS)) # All the files that might matter when building the database DB_DEPENDS := $(patsubst %,../../%,$(DB_DEPENDS)) Makefile @@ -86,7 +87,7 @@ check: ## install Install the database objects into the database .PHONY: install -install: createthings.sql +install: $(PSQL_DEPENDS) createthings.sql ( $(PSQL_SETUP) \ ../../../../make_files/set_search_path.sh ; \ cat createthings.sql ) \ @@ -94,7 +95,7 @@ install: createthings.sql ## destroy Remove the database objects from the database .PHONY: destroy -destroy: dropthings.sql +destroy: $(PSQL_DEPENDS) dropthings.sql ( $(PSQL_SETUP) \ ../../../../make_files/set_search_path.sh ; \ cat dropthings.sql ) \ @@ -102,7 +103,7 @@ destroy: dropthings.sql ## destroytables Remove the tables from the database .PHONY: destroytables -destroytables: droptables.sql +destroytables: $(PSQL_DEPENDS) droptables.sql ( $(PSQL_SETUP) \ ../../../../make_files/set_search_path.sh ; \ cat droptables.sql ) \ -- 2.34.1