From 951a1bb2a7550197d5164bf4d3b5a952eea70bdc Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 30 Jan 2024 18:01:22 -0600 Subject: [PATCH] Add DROP_EXISTING variable to for when there's no 'drop' file --- make_files/things.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/make_files/things.mk b/make_files/things.mk index 38a387b..7514865 100644 --- a/make_files/things.mk +++ b/make_files/things.mk @@ -21,6 +21,10 @@ # containing foreign keys must be put into the database after the # tables they reference, likewise with functions and views, etc. # +# if $DROP_EXISTING has a value, then only those files in $ORDER that exist +# are used to drop database objects. Otherwise, there should be a file in +# drop/ for every file in create/. +# # Karl O. Pinc ## @@ -34,7 +38,11 @@ include ../../../../make_files/defaults.mk ## CREATE_TARGETS := $(patsubst %,create/%.sql,$(ORDER)) + DROP_TARGETS := $(patsubst %,drop/%.sql,$(ORDER)) +ifdef DROP_EXISTING +DROP_TARGETS := $(filter $(DROP_TARGETS),$(wildcard drop/*.m4)) +endif # These are the targets that can be made TARGETS := createthings.sql dropthings.sql $(CREATE_TARGETS) $(DROP_TARGETS) @@ -75,7 +83,8 @@ check: || { printf "Target %s.%s has no m4 file to create it\n" \ $${schema} $${target} \ ; exit 1 ; } ; \ - if [ $$(basename $$(pwd)) != 'tables' \ + if [ -z '$(DROP_EXISTING)' \ + -a $$(basename $$(pwd)) != 'tables' \ -a $$(basename $$(pwd)) != 'views' ] ; then \ [ -f drop/$${target}.m4 ] \ || { printf "Target %s.%s has no m4 file to drop it\n" \ -- 2.34.1