From 5dc0708fb3bfe329de432470deaab7dd82b96d37 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Fri, 6 Oct 2023 23:15:50 +0000 Subject: [PATCH] Ensure function installation into the db is before comment generation Function signatures cannot be obtained until after functions are put into the database. This means that comment SQL cannot be generated before functions go in. Alter the big install/re-install targets to be sure that things happen in the right order. The user can still invoke the "installcomments" target without having all the functions installed. In this case comment installation fails. It is up to the user to install things in the proper order, as with tables and views, when invoking targets that install piecemeal. --- make_files/make_db.mk | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/make_files/make_db.mk b/make_files/make_db.mk index 66b8c44..ed88d47 100644 --- a/make_files/make_db.mk +++ b/make_files/make_db.mk @@ -105,15 +105,16 @@ CREATE_DB_TARGETS := db/createtypes.sql DROP_DB_TARGETS := db/droptypes.sql DB_TARGETS := $(CREATE_DB_TARGETS) $(DROP_DB_TARGETS) # The files built by other Makefiles -# (Order is significant for CREATE/DROP targets, it is used to determine -# install order.) +# Order is significant for CREATE/DROP targets, it is used to determine +# install order. +# Comments are not included here because their SQL cannot be generated +# until the rest of the database objects are in place. CREATE_SUB_DB_TARGETS := db/schemas/createschemas.sql \ db/schemas/createtables.sql \ db/schemas/createindexes.sql \ db/schemas/createfunctions.sql \ db/schemas/createviews.sql \ - db/schemas/createtriggers.sql \ - db/schemas/comment_on.sql + db/schemas/createtriggers.sql # Don't target db/schemas/comment_off.sql since all the comments may not # be in the db. DROP_SUB_DB_TARGETS := db/schemas/droptriggers.sql \ @@ -137,10 +138,11 @@ check: $(MAKE) -C db/schemas check ## install-db Install all database objects (schemas, tables, etc.) +## Comments are installed in a separate transaction. # Because $? is used, and we've "extra" dependencies, we need a level of # indirection. .PHONY: install-db -install-db: $(PSQL_DEPENDS) do-install-db +install-db: $(PSQL_DEPENDS) do-install-db installcomments .PHONY: do-install-db do-install-db: db/schemas/createschemas.sql \ $(CREATE_DB_TARGETS) $(CREATE_SUB_DB_TARGETS) @@ -149,13 +151,16 @@ do-install-db: db/schemas/createschemas.sql \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) --set=ON_ERROR_STOP=y ## reinstall-db Drop all the database objects and re-install them -## This is done in two transactions, one to drop -## database objects and another to create them. +## This is done in three transactions, one to drop +## database objects, another to create them, and a +## third to install comments. ## (This does _not_ exercise destroy-db. It is slower ## but more through than recreate-db.) # This drops entire schemas to delete the database objects. .PHONY: reinstall-db -reinstall-db: db/schemas/dropschemas.sql \ +reinstall-db: do-reinstall-db installcomments + +do-reinstall-db: db/schemas/dropschemas.sql \ clean-db-cache \ $(PSQL_DEPENDS) \ $(CREATE_DB_TARGETS) $(CREATE_SUB_DB_TARGETS) @@ -170,8 +175,9 @@ reinstall-db: db/schemas/dropschemas.sql \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) --set=ON_ERROR_STOP=y ## recreate-db Drop all the database objects and re-install them -## This is done in two transactions, one to drop -## database objects and another to create them. +## This is done in three transactions, one to drop +## database objects, another to create them, and a +## third to install comments. ## (This _does_ exercise destroy-db.) .PHONY: recreate-db recreate-db: destroy-db install-db -- 2.34.1