From 9714dbf60f96cf78138e9f8d6051887818923094 Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Tue, 30 Jan 2024 09:44:12 -0600
Subject: [PATCH] Automatically generate statements to drop views

---
 db/schemas/Makefile  | 14 +++++++++-----
 make_files/things.mk | 20 ++++++++++++--------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/db/schemas/Makefile b/db/schemas/Makefile
index f896e66..b502626 100644
--- a/db/schemas/Makefile
+++ b/db/schemas/Makefile
@@ -126,8 +126,7 @@ VIEW_SCHEMA_PATHS := $(patsubst %,%/views, \
                              $(filter $(VIEW_SCHEMAS),$(ORDER)))
 VIEW_CREATE_FILES := $(patsubst %,%/createthings.sql, \
                                     $(VIEW_SCHEMA_PATHS))
-VIEW_DROP_FILES := $(patsubst %,%/dropthings.sql, \
-                                  $(VIEW_SCHEMA_PATHS))
+VIEW_DROP_FILES := $(patsubst %,%/dropviews.sql,$(VIEW_SCHEMA_PATHS))
 INDEX_SCHEMA_PATHS := $(patsubst %,%/indexes, \
                              $(filter $(INDEX_SCHEMAS),$(ORDER)))
 INDEX_CREATE_FILES := $(patsubst %,%/createthings.sql, \
@@ -540,7 +539,7 @@ createviews.sql: $(DB_DEPENDS) $(VIEW_CREATE_FILES) \
 	./create_sql.sh '$(VIEW_CREATE_FILES)' > createviews.sql
 
 ##   dropviews.sql
-##                 A file with the SQL which drops all the tables
+##                 A file with the SQL which drops all the views
 dropviews.sql: $(DB_DEPENDS) $(VIEW_DROP_FILES) drop_sql.sh
 	./drop_sql.sh '$(VIEW_DROP_FILES)' > dropviews.sql
 
@@ -573,9 +572,9 @@ $(TABLE_CREATE_FILES) $(FUNCTION_CREATE_FILES) $(VIEW_CREATE_FILES) \
 $(TRIGGER_CREATE_FILES) $(INDEX_CREATE_FILES):
 	$(MAKE) -C $$(dirname $@) createthings.sql
 
-.PHONY: $(FUNCTION_DROP_FILES) $(VIEW_DROP_FILES) \
+.PHONY: $(FUNCTION_DROP_FILES) \
         $(TRIGGER_DROP_FILES) $(INDEX_DROP_FILES)
-$(FUNCTION_DROP_FILES) $(VIEW_DROP_FILES) \
+$(FUNCTION_DROP_FILES) \
 $(TRIGGER_DROP_FILES) $(INDEX_DROP_FILES):
 	$(MAKE) -C $$(dirname $@) dropthings.sql
 
@@ -584,6 +583,11 @@ $(TRIGGER_DROP_FILES) $(INDEX_DROP_FILES):
 $(TABLE_DROP_FILES):
 	$(MAKE) -C $$(dirname $@) droptables.sql
 
+# View drop files have a special target
+.PHONY: $(VIEW_DROP_FILES)
+$(VIEW_DROP_FILES):
+	$(MAKE) -C $$(dirname $@) dropviews.sql
+
 #
 # Documentation related targets
 #
diff --git a/make_files/things.mk b/make_files/things.mk
index d4fb868..8515e0d 100644
--- a/make_files/things.mk
+++ b/make_files/things.mk
@@ -152,18 +152,22 @@ dropthings.sql: $(DROP_TARGETS) $(DB_DEPENDS)
 	  cat $${target} >> dropthings.sql ; \
 	done
 
-# The tables are a special case -- we write the drop statements
+# The tables and view are a special case -- we write the drop statements
 ##   droptables.sql
 ##                 A file with the SQL which drops all the tables
-droptables.sql: $(DB_DEPENDS)
+##   dropviews.sql
+##                 A file with the SQL which drops all the views
+droptables.sql dropviews.sql: $(DB_DEPENDS)
 	printf '%s %s\n' '-- Copyright (C) 2023 The Meme Factory, Inc.' \
-	       '  https://karlpinc.com/' > droptables.sql
-	cat ../../../include/copyright.sql >> droptables.sql
-	cat ../../../include/do_not_edit.sql >> droptables.sql
+	       '  https://karlpinc.com/' > $@
+	cat ../../../include/copyright.sql >> $@
+	cat ../../../include/do_not_edit.sql >> $@
 	export "REVERSE=$$(printf '%s ' '$(ORDER)' | tac -s ' ')" ; \
-	for table in $${REVERSE} ; do \
-	  printf 'DROP TABLE IF EXISTS %s CASCADE;\n' $${table} \
-	    >> droptables.sql ; \
+	for relation in $${REVERSE} ; do \
+	  printf 'DROP %s IF EXISTS %s CASCADE;\n' \
+	         $(if $($filter droptables.sql,$@),TABLE,VIEW) \
+	         $${relation} \
+	    >> $@ ; \
 	done
 
 ##   THING         Put SQL which creates the database object into a file
-- 
2.34.1