From d5f7f19736d3458729d8424c2d6f902aacbc080a Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 10 Sep 2023 14:32:26 -0500 Subject: [PATCH] Give macros dealing with speical values better names --- db/include/macros.m4 | 8 ++++---- db/schemas/lookup/triggers/create/comm_ids.m4 | 2 +- db/schemas/lookup/triggers/create/departtypes.m4 | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/db/include/macros.m4 b/db/include/macros.m4 index 4a86cb8..2c7e6fa 100644 --- a/db/include/macros.m4 +++ b/db/include/macros.m4 @@ -103,13 +103,13 @@ define(`sdb_superuser_hint', dnl plpgsql fragment for checking that a column cannot be changed dnl by regular users dnl -dnl Syntax: restrict_all_change(table, column) +dnl Syntax: restrict_special_column(table, column) dnl dnl table The table dnl column The column dnl changequote({,}) -define({restrict_all_change},{dnl +define({restrict_special_column},{dnl IF (NEW.$2 <> OLD.$2 OR NEW.$2 IS NULL AND OLD.$2 IS NOT NULL OR NEW.$2 IS NOT NULL AND OLD.$2 IS NULL) @@ -125,7 +125,7 @@ changequote(`,')dnl dnl plpgsql fragment for checking that a row cannot be changed by regular users dnl -dnl Syntax: restrict_change(table, column, value) +dnl Syntax: restrict_special_row(table, column, value) dnl dnl table The table dnl column The column identifying the unchanging row @@ -133,7 +133,7 @@ dnl value The value identifying the row that can't be changed by dnl ordinary users. dnl changequote({,}) -define({restrict_change},{dnl +define({restrict_special_row},{dnl IF (NEW.$2 = '$3' OR OLD.$2 = '$3') AND (NEW <> OLD) AND NOT(has_table_privilege('$1', 'trigger')) THEN diff --git a/db/schemas/lookup/triggers/create/comm_ids.m4 b/db/schemas/lookup/triggers/create/comm_ids.m4 index 194ada3..09126b8 100644 --- a/db/schemas/lookup/triggers/create/comm_ids.m4 +++ b/db/schemas/lookup/triggers/create/comm_ids.m4 @@ -35,7 +35,7 @@ CREATE OR REPLACE FUNCTION comm_ids_func () `The Meme Factory, Inc., www.karlpinc.com') IF TG_OP = 'UPDATE' THEN - restrict_change(`COMM_IDS', `CommID', sdb_unknown_comm) + restrict_special_row(`COMM_IDS', `CommID', sdb_unknown_comm) END IF; END; $$; diff --git a/db/schemas/lookup/triggers/create/departtypes.m4 b/db/schemas/lookup/triggers/create/departtypes.m4 index 515c456..4e3568e 100644 --- a/db/schemas/lookup/triggers/create/departtypes.m4 +++ b/db/schemas/lookup/triggers/create/departtypes.m4 @@ -35,7 +35,7 @@ CREATE OR REPLACE FUNCTION departtypes_func () `The Meme Factory, Inc., www.karlpinc.com') IF TG_OP = 'UPDATE' THEN - restrict_change(`DEPARTTYPES', `CommID', sdb_end_of_obs) + restrict_special_row(`DEPARTTYPES', `CommID', sdb_end_of_obs) END IF; END; $$; -- 2.34.1