From a6ef18e07aefedda50c59c68b657acd2734fb9a6 Mon Sep 17 00:00:00 2001 From: Jorrit Schaap <schaap@astron.nl> Date: Mon, 8 May 2017 12:34:48 +0000 Subject: [PATCH] Task #10811: db create scripts don't issue superfluous NOTICE messages anymore. --- .../sql/add_notifications.sql | 94 +++++-------------- .../sql/add_triggers.sql | 6 ++ .../sql/create_database.sql | 3 + 3 files changed, 30 insertions(+), 73 deletions(-) diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_notifications.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_notifications.sql index 05906465401..75b70085890 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_notifications.sql +++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_notifications.sql @@ -6,8 +6,10 @@ --this RADBPGListener then broadcasts the event on the lofar bus. -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_task_INSERT ON resource_allocation.task CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_task_INSERT(); +BEGIN; + +-- only issue >warnings log messages. (only during this transaction) +SET LOCAL client_min_messages=warning; CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_task_INSERT() @@ -21,16 +23,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_task_INSERT +CREATE TRIGGER T_NOTIFY_task_INSERT AFTER INSERT ON resource_allocation.task FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_task_INSERT(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_task_UPDATE ON resource_allocation.task CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_task_UPDATE(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_task_UPDATE() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -44,16 +42,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_task_UPDATE +CREATE TRIGGER T_NOTIFY_task_UPDATE AFTER UPDATE ON resource_allocation.task FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_task_UPDATE(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_task_DELETE ON resource_allocation.task CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_task_DELETE(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_task_DELETE() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -65,16 +59,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_task_DELETE +CREATE TRIGGER T_NOTIFY_task_DELETE AFTER DELETE ON resource_allocation.task FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_task_DELETE(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_task_predecessor_INSERT_column_task_id ON resource_allocation.task_predecessor CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_task_predecessor_INSERT_column_task_id(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_task_predecessor_INSERT_column_task_id() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -86,16 +76,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_task_predecessor_INSERT_column_task_id +CREATE TRIGGER T_NOTIFY_task_predecessor_INSERT_column_task_id AFTER INSERT ON resource_allocation.task_predecessor FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_task_predecessor_INSERT_column_task_id(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_task_predecessor_UPDATE_column_task_id ON resource_allocation.task_predecessor CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_task_predecessor_UPDATE_column_task_id(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_task_predecessor_UPDATE_column_task_id() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -109,16 +95,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_task_predecessor_UPDATE_column_task_id +CREATE TRIGGER T_NOTIFY_task_predecessor_UPDATE_column_task_id AFTER UPDATE ON resource_allocation.task_predecessor FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_task_predecessor_UPDATE_column_task_id(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_task_predecessor_DELETE_column_task_id ON resource_allocation.task_predecessor CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_task_predecessor_DELETE_column_task_id(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_task_predecessor_DELETE_column_task_id() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -130,16 +112,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_task_predecessor_DELETE_column_task_id +CREATE TRIGGER T_NOTIFY_task_predecessor_DELETE_column_task_id AFTER DELETE ON resource_allocation.task_predecessor FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_task_predecessor_DELETE_column_task_id(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_task_predecessor_INSERT_column_predecessor_id ON resource_allocation.task_predecessor CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_task_predecessor_INSERT_column_predecessor_id(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_task_predecessor_INSERT_column_predecessor_id() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -151,16 +129,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_task_predecessor_INSERT_column_predecessor_id +CREATE TRIGGER T_NOTIFY_task_predecessor_INSERT_column_predecessor_id AFTER INSERT ON resource_allocation.task_predecessor FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_task_predecessor_INSERT_column_predecessor_id(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_task_predecessor_UPDATE_column_predecessor_id ON resource_allocation.task_predecessor CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_task_predecessor_UPDATE_column_predecessor_id(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_task_predecessor_UPDATE_column_predecessor_id() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -174,16 +148,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_task_predecessor_UPDATE_column_predecessor_id +CREATE TRIGGER T_NOTIFY_task_predecessor_UPDATE_column_predecessor_id AFTER UPDATE ON resource_allocation.task_predecessor FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_task_predecessor_UPDATE_column_predecessor_id(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_task_predecessor_DELETE_column_predecessor_id ON resource_allocation.task_predecessor CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_task_predecessor_DELETE_column_predecessor_id(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_task_predecessor_DELETE_column_predecessor_id() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -195,16 +165,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_task_predecessor_DELETE_column_predecessor_id +CREATE TRIGGER T_NOTIFY_task_predecessor_DELETE_column_predecessor_id AFTER DELETE ON resource_allocation.task_predecessor FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_task_predecessor_DELETE_column_predecessor_id(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_specification_UPDATE ON resource_allocation.specification CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_specification_UPDATE(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_specification_UPDATE() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -218,16 +184,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_specification_UPDATE +CREATE TRIGGER T_NOTIFY_specification_UPDATE AFTER UPDATE ON resource_allocation.specification FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_specification_UPDATE(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_resource_claim_INSERT ON resource_allocation.resource_claim CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_resource_claim_INSERT(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_resource_claim_INSERT() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -239,16 +201,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_resource_claim_INSERT +CREATE TRIGGER T_NOTIFY_resource_claim_INSERT AFTER INSERT ON resource_allocation.resource_claim FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_resource_claim_INSERT(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_resource_claim_UPDATE ON resource_allocation.resource_claim CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_resource_claim_UPDATE(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_resource_claim_UPDATE() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -262,16 +220,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_resource_claim_UPDATE +CREATE TRIGGER T_NOTIFY_resource_claim_UPDATE AFTER UPDATE ON resource_allocation.resource_claim FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_resource_claim_UPDATE(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_resource_claim_DELETE ON resource_allocation.resource_claim CASCADE; -DROP FUNCTION IF EXISTS resource_allocation.NOTIFY_resource_claim_DELETE(); - - CREATE OR REPLACE FUNCTION resource_allocation.NOTIFY_resource_claim_DELETE() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -283,16 +237,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_resource_claim_DELETE +CREATE TRIGGER T_NOTIFY_resource_claim_DELETE AFTER DELETE ON resource_allocation.resource_claim FOR EACH ROW EXECUTE PROCEDURE resource_allocation.NOTIFY_resource_claim_DELETE(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_resource_availability_UPDATE_column_resource_id ON resource_monitoring.resource_availability CASCADE; -DROP FUNCTION IF EXISTS resource_monitoring.NOTIFY_resource_availability_UPDATE_column_resource_id(); - - CREATE OR REPLACE FUNCTION resource_monitoring.NOTIFY_resource_availability_UPDATE_column_resource_id() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -306,16 +256,12 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_resource_availability_UPDATE_column_resource_id +CREATE TRIGGER T_NOTIFY_resource_availability_UPDATE_column_resource_id AFTER UPDATE ON resource_monitoring.resource_availability FOR EACH ROW EXECUTE PROCEDURE resource_monitoring.NOTIFY_resource_availability_UPDATE_column_resource_id(); -DROP TRIGGER IF EXISTS TRIGGER_NOTIFY_NOTIFY_resource_capacity_UPDATE_column_resource_id ON resource_monitoring.resource_capacity CASCADE; -DROP FUNCTION IF EXISTS resource_monitoring.NOTIFY_resource_capacity_UPDATE_column_resource_id(); - - CREATE OR REPLACE FUNCTION resource_monitoring.NOTIFY_resource_capacity_UPDATE_column_resource_id() RETURNS TRIGGER AS $$ DECLARE payload text; @@ -329,8 +275,10 @@ END; $$ LANGUAGE plpgsql; -CREATE TRIGGER TRIGGER_NOTIFY_NOTIFY_resource_capacity_UPDATE_column_resource_id +CREATE TRIGGER T_NOTIFY_resource_capacity_UPDATE_column_resource_id AFTER UPDATE ON resource_monitoring.resource_capacity FOR EACH ROW EXECUTE PROCEDURE resource_monitoring.NOTIFY_resource_capacity_UPDATE_column_resource_id(); + +COMMIT; diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_triggers.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_triggers.sql index bb754b359b9..1339178a299 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_triggers.sql +++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_triggers.sql @@ -1,5 +1,10 @@ --add triggers and trigger functions to radb (note, there are also the notification triggers in the add_notifications.sql file) +BEGIN; + +-- only issue >warnings log messages. (only during this transaction) +SET LOCAL client_min_messages=warning; + DROP TRIGGER IF EXISTS trigger_delete_resource_claims_for_approved_task ON resource_allocation.task CASCADE; DROP FUNCTION IF EXISTS resource_allocation.delete_resource_claims_for_approved_task(); @@ -232,3 +237,4 @@ CREATE TRIGGER trigger_specification_insertupdate_check_startendtimes --------------------------------------------------------------------------------------------------------------------- +COMMIT; diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql index c4dc8357a97..a3275290381 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql +++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_database.sql @@ -12,6 +12,9 @@ BEGIN; +-- only issue >warnings log messages. (only during this transaction) +SET LOCAL client_min_messages=warning; + DROP SCHEMA IF EXISTS virtual_instrument CASCADE; DROP SCHEMA IF EXISTS resource_monitoring CASCADE; DROP SCHEMA IF EXISTS resource_allocation CASCADE; -- GitLab