From 91bb7653cbb0337f4a05b730de91f5cc34d135ab Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Mon, 29 Jan 2024 13:12:14 -0600 Subject: [PATCH] Change the name of the lookup schema to "codes" --- db/include/macros.m4 | 2 +- db/schemas/Makefile | 8 ++++---- db/schemas/{lookup => codes}/indexes/Makefile | 0 db/schemas/{lookup => codes}/indexes/create/comm_ids.m4 | 0 db/schemas/{lookup => codes}/indexes/drop/comm_ids.m4 | 0 db/schemas/{lookup => codes}/tables/Makefile | 0 db/schemas/{lookup => codes}/tables/create/comm_ids.m4 | 0 db/schemas/{lookup => codes}/tables/create/departtypes.m4 | 0 db/schemas/{lookup => codes}/tables/create/entrytypes.m4 | 0 db/schemas/{lookup => codes}/tables/create/people.m4 | 0 db/schemas/createschemas.m4 | 4 ++-- db/schemas/dropschemas.m4 | 2 +- make_files/make_cluster.mk | 2 +- 13 files changed, 9 insertions(+), 9 deletions(-) rename db/schemas/{lookup => codes}/indexes/Makefile (100%) rename db/schemas/{lookup => codes}/indexes/create/comm_ids.m4 (100%) rename db/schemas/{lookup => codes}/indexes/drop/comm_ids.m4 (100%) rename db/schemas/{lookup => codes}/tables/Makefile (100%) rename db/schemas/{lookup => codes}/tables/create/comm_ids.m4 (100%) rename db/schemas/{lookup => codes}/tables/create/departtypes.m4 (100%) rename db/schemas/{lookup => codes}/tables/create/entrytypes.m4 (100%) rename db/schemas/{lookup => codes}/tables/create/people.m4 (100%) diff --git a/db/include/macros.m4 b/db/include/macros.m4 index 42be667..52cebed 100644 --- a/db/include/macros.m4 +++ b/db/include/macros.m4 @@ -48,7 +48,7 @@ define(`sdb_generated_comment', ') dnl SET clause used in all function definition statements. -define(`sdb_function_search_path', `sokwedb, lookup, upload, pg_temp') +define(`sdb_function_search_path', `sokwedb, codes, upload, pg_temp') define(`sdb_function_set_search_path', `SET search_path = sdb_function_search_path') diff --git a/db/schemas/Makefile b/db/schemas/Makefile index 7882423..f896e66 100644 --- a/db/schemas/Makefile +++ b/db/schemas/Makefile @@ -31,18 +31,18 @@ include ../../make_files/help.mk # This determines the order in which the schemas are put into the database. # This is important because the tables containing foreign keys must be put # into the database after the tables they reference, etc. -ORDER := lookup \ +ORDER := codes \ sokwedb \ lib # upload # The schemas that contain tables, functions, etc. -TABLE_SCHEMAS := lookup sokwedb +TABLE_SCHEMAS := codes sokwedb FUNCTION_SCHEMAS := sokwedb TRIGGER_SCHEMAS := lib VIEW_SCHEMAS := sokwedb -INDEX_SCHEMAS := lookup sokwedb -COMMENT_SCHEMAS := lookup sokwedb +INDEX_SCHEMAS := codes sokwedb +COMMENT_SCHEMAS := codes sokwedb ## ## CAUTION: This Makefile is not designed to be run directly. It is normally diff --git a/db/schemas/lookup/indexes/Makefile b/db/schemas/codes/indexes/Makefile similarity index 100% rename from db/schemas/lookup/indexes/Makefile rename to db/schemas/codes/indexes/Makefile diff --git a/db/schemas/lookup/indexes/create/comm_ids.m4 b/db/schemas/codes/indexes/create/comm_ids.m4 similarity index 100% rename from db/schemas/lookup/indexes/create/comm_ids.m4 rename to db/schemas/codes/indexes/create/comm_ids.m4 diff --git a/db/schemas/lookup/indexes/drop/comm_ids.m4 b/db/schemas/codes/indexes/drop/comm_ids.m4 similarity index 100% rename from db/schemas/lookup/indexes/drop/comm_ids.m4 rename to db/schemas/codes/indexes/drop/comm_ids.m4 diff --git a/db/schemas/lookup/tables/Makefile b/db/schemas/codes/tables/Makefile similarity index 100% rename from db/schemas/lookup/tables/Makefile rename to db/schemas/codes/tables/Makefile diff --git a/db/schemas/lookup/tables/create/comm_ids.m4 b/db/schemas/codes/tables/create/comm_ids.m4 similarity index 100% rename from db/schemas/lookup/tables/create/comm_ids.m4 rename to db/schemas/codes/tables/create/comm_ids.m4 diff --git a/db/schemas/lookup/tables/create/departtypes.m4 b/db/schemas/codes/tables/create/departtypes.m4 similarity index 100% rename from db/schemas/lookup/tables/create/departtypes.m4 rename to db/schemas/codes/tables/create/departtypes.m4 diff --git a/db/schemas/lookup/tables/create/entrytypes.m4 b/db/schemas/codes/tables/create/entrytypes.m4 similarity index 100% rename from db/schemas/lookup/tables/create/entrytypes.m4 rename to db/schemas/codes/tables/create/entrytypes.m4 diff --git a/db/schemas/lookup/tables/create/people.m4 b/db/schemas/codes/tables/create/people.m4 similarity index 100% rename from db/schemas/lookup/tables/create/people.m4 rename to db/schemas/codes/tables/create/people.m4 diff --git a/db/schemas/createschemas.m4 b/db/schemas/createschemas.m4 index c9c1e53..8570428 100644 --- a/db/schemas/createschemas.m4 +++ b/db/schemas/createschemas.m4 @@ -22,11 +22,11 @@ include(`constants.m4')dnl dnl CREATE SCHEMA IF NOT EXISTS lib; -CREATE SCHEMA IF NOT EXISTS lookup; +CREATE SCHEMA IF NOT EXISTS codes; CREATE SCHEMA IF NOT EXISTS sokwedb; CREATE SCHEMA IF NOT EXISTS upload; GRANT USAGE ON SCHEMA lib TO sdb_reader, sdb_writer; -GRANT USAGE ON SCHEMA lookup TO sdb_reader, sdb_writer; +GRANT USAGE ON SCHEMA codes TO sdb_reader, sdb_writer; GRANT USAGE ON SCHEMA sokwedb TO sdb_reader, sdb_writer; GRANT USAGE ON SCHEMA upload TO sdb_reader, sdb_writer; diff --git a/db/schemas/dropschemas.m4 b/db/schemas/dropschemas.m4 index 70a71d7..6ad7ff6 100644 --- a/db/schemas/dropschemas.m4 +++ b/db/schemas/dropschemas.m4 @@ -22,5 +22,5 @@ dnl DROP SCHEMA IF EXISTS upload CASCADE; DROP SCHEMA IF EXISTS sokwedb CASCADE; -DROP SCHEMA IF EXISTS lookup CASCADE; +DROP SCHEMA IF EXISTS codes CASCADE; diff --git a/make_files/make_cluster.mk b/make_files/make_cluster.mk index 56614e1..d5d31d0 100644 --- a/make_files/make_cluster.mk +++ b/make_files/make_cluster.mk @@ -161,7 +161,7 @@ CREATE_DB := db/run_createdb.sh # printf statement using them is executed.) # ($$user because make otherwise interprets the $.) SET_SEARCH_PATH := ALTER DATABASE $(TARGET_DB) \ - SET search_path = sokwedb, lookup, upload, lib, "$$user"; + SET search_path = sokwedb, codes, upload, lib, "$$user"; SET_DATESTYLE := ALTER DATABASE $(TARGET_DB) \ SET DATESTYLE = 'ISO,MDY'; SET_ISOLATION_LEVEL := ALTER DATABASE $(TARGET_DB) \ -- 2.34.1