From 13afe6c97aacfb0341952cd3848b084ca27a2233 Mon Sep 17 00:00:00 2001 From: Bienvenido Benoit Ranque Date: Wed, 3 Apr 2019 19:19:22 -0400 Subject: [PATCH] Renamed owner_id to owner_account_id accross whole schema --- postgres/admittance.psql | 20 +++++--------------- postgres/auth.psql | 17 +---------------- postgres/support.psql | 30 ++++++++++++------------------ 3 files changed, 18 insertions(+), 49 deletions(-) diff --git a/postgres/admittance.psql b/postgres/admittance.psql index 4259bac..cea7cb7 100644 --- a/postgres/admittance.psql +++ b/postgres/admittance.psql @@ -5,15 +5,13 @@ CREATE TABLE admittance.series ( series_name TEXT PRIMARY KEY, description TEXT NOT NULL, color TEXT NOT NULL, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() ); -CREATE TRIGGER admittance_series_set_created_at BEFORE INSERT ON admittance.series - FOR EACH ROW EXECUTE FUNCTION set_created_at(); CREATE TRIGGER admittance_series_set_updated_at BEFORE UPDATE ON admittance.series FOR EACH ROW EXECUTE FUNCTION set_updated_at(); @@ -23,7 +21,7 @@ CREATE TABLE admittance.bracelet ( ON UPDATE RESTRICT ON DELETE RESTRICT, serial BIGINT NOT NULL CHECK (serial > 0), - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), @@ -31,8 +29,6 @@ CREATE TABLE admittance.bracelet ( UNIQUE (series_name, serial) ); -CREATE TRIGGER admittance_bracelet_set_created_at BEFORE INSERT ON admittance.bracelet - FOR EACH ROW EXECUTE FUNCTION set_created_at(); CREATE TRIGGER admittance_bracelet_set_updated_at BEFORE UPDATE ON admittance.bracelet FOR EACH ROW EXECUTE FUNCTION set_updated_at(); @@ -46,15 +42,13 @@ CREATE TABLE admittance.product ( product_id UUID PRIMARY KEY DEFAULT gen_random_uuid(), product_name TEXT UNIQUE NOT NULL, description TEXT, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() ); -CREATE TRIGGER admittance_product_set_created_at BEFORE INSERT ON admittance.product - FOR EACH ROW EXECUTE FUNCTION set_created_at(); CREATE TRIGGER admittance_product_set_updated_at BEFORE UPDATE ON admittance.product FOR EACH ROW EXECUTE FUNCTION set_updated_at(); @@ -75,7 +69,7 @@ CREATE TABLE admittance.assignation ( ON DELETE RESTRICT, valid_from TIMESTAMP WITH TIME ZONE NOT NULL, valid_to TIMESTAMP WITH TIME ZONE NOT NULL, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), @@ -83,8 +77,6 @@ CREATE TABLE admittance.assignation ( CHECK (valid_from < valid_to) ); -CREATE TRIGGER admittance_assignation_set_created_at BEFORE INSERT ON admittance.assignation - FOR EACH ROW EXECUTE FUNCTION set_created_at(); CREATE TRIGGER admittance_assignation_set_updated_at BEFORE UPDATE ON admittance.assignation FOR EACH ROW EXECUTE FUNCTION set_updated_at(); @@ -94,7 +86,7 @@ CREATE TABLE admittance.assignation_cancelation ( ON UPDATE CASCADE ON DELETE RESTRICT, description TEXT, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), @@ -124,8 +116,6 @@ CREATE TABLE admittance.activation ( updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() ); -CREATE TRIGGER admittance_activation_set_created_at BEFORE INSERT ON admittance.activation - FOR EACH ROW EXECUTE FUNCTION set_created_at(); CREATE TRIGGER admittance_activation_set_updated_at BEFORE UPDATE ON admittance.activation FOR EACH ROW EXECUTE FUNCTION set_updated_at(); diff --git a/postgres/auth.psql b/postgres/auth.psql index 022bd6d..6b0b750 100644 --- a/postgres/auth.psql +++ b/postgres/auth.psql @@ -1,17 +1,3 @@ --- TimeStamp functions --- This trigger function will set the created_at value on insert -CREATE OR REPLACE FUNCTION set_created_at() -RETURNS TRIGGER AS $$ -BEGIN - NEW.created_at = now(); - NEW.updated_at = now(); - RETURN NEW; -END; -$$ language 'plpgsql'; --- usage example --- CREATE TRIGGER auth_account_set_created_at BEFORE INSERT ON auth.account --- FOR EACH ROW EXECUTE FUNCTION set_created_at(); - -- This trigger function will set the updated_at value if an update changes any values CREATE OR REPLACE FUNCTION set_updated_at() @@ -56,8 +42,6 @@ CREATE TABLE auth.account ( CREATE TRIGGER auth_account_hash_password BEFORE INSERT OR UPDATE ON auth.account FOR EACH ROW EXECUTE FUNCTION auth.hash_password(); -CREATE TRIGGER auth_account_set_created_at BEFORE INSERT ON auth.account - FOR EACH ROW EXECUTE FUNCTION set_created_at(); CREATE TRIGGER auth_account_set_updated_at BEFORE UPDATE ON auth.account FOR EACH ROW EXECUTE FUNCTION set_updated_at(); @@ -99,3 +83,4 @@ INSERT INTO auth.account_role SELECT account_id, role_name FROM administrator_account CROSS JOIN auth_roles; + diff --git a/postgres/support.psql b/postgres/support.psql index db6e7aa..f6d30f1 100644 --- a/postgres/support.psql +++ b/postgres/support.psql @@ -61,14 +61,13 @@ CREATE TABLE support.ticket ( priority_name TEXT DEFAULT 'MEDIUM' NOT NULL REFERENCES support.priority (priority_name) ON UPDATE CASCADE ON DELETE RESTRICT, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() ); -CREATE TRIGGER support_ticket_set_created_at BEFORE INSERT ON support.ticket - FOR EACH ROW EXECUTE FUNCTION set_created_at(); + CREATE TRIGGER support_ticket_set_updated_at BEFORE UPDATE ON support.ticket FOR EACH ROW EXECUTE FUNCTION set_updated_at(); @@ -88,14 +87,13 @@ CREATE TABLE support.ticket_entry ( ON UPDATE CASCADE ON DELETE CASCADE, body TEXT, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() ); -CREATE TRIGGER support_ticket_entry_set_created_at BEFORE INSERT ON support.ticket_entry - FOR EACH ROW EXECUTE FUNCTION set_created_at(); + CREATE TRIGGER support_ticket_entry_set_updated_at BEFORE UPDATE ON support.ticket_entry FOR EACH ROW EXECUTE FUNCTION set_updated_at(); @@ -107,14 +105,13 @@ CREATE TABLE support.ticket_status ( status_name TEXT REFERENCES support.status (status_name) ON UPDATE CASCADE ON DELETE RESTRICT, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() ); -CREATE TRIGGER support_ticket_status_set_created_at BEFORE INSERT ON support.ticket_status - FOR EACH ROW EXECUTE FUNCTION set_created_at(); + CREATE TRIGGER support_ticket_status_set_updated_at BEFORE UPDATE ON support.ticket_status FOR EACH ROW EXECUTE FUNCTION set_updated_at(); -- update ticket status @@ -138,14 +135,13 @@ CREATE TABLE support.ticket_priority ( priority_name TEXT NOT NULL REFERENCES support.priority (priority_name) ON UPDATE CASCADE ON DELETE RESTRICT, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() ); -CREATE TRIGGER support_ticket_priority_set_created_at BEFORE INSERT ON support.ticket_priority - FOR EACH ROW EXECUTE FUNCTION set_created_at(); + CREATE TRIGGER support_ticket_priority_set_updated_at BEFORE UPDATE ON support.ticket_priority FOR EACH ROW EXECUTE FUNCTION set_updated_at(); -- update ticket priority @@ -169,14 +165,13 @@ CREATE TABLE support.ticket_assignation ( assignee_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() ); -CREATE TRIGGER support_ticket_assignation_set_created_at BEFORE INSERT ON support.ticket_assignation - FOR EACH ROW EXECUTE FUNCTION set_created_at(); + CREATE TRIGGER support_ticket_assignation_set_updated_at BEFORE UPDATE ON support.ticket_assignation FOR EACH ROW EXECUTE FUNCTION set_updated_at(); @@ -186,14 +181,13 @@ CREATE TABLE support.attachement ( name TEXT NOT NULL, type TEXT NOT null, size BIGINT NOT NULL, - owner_id UUID NOT NULL REFERENCES auth.account (account_id) + owner_account_id UUID NOT NULL REFERENCES auth.account (account_id) ON UPDATE CASCADE ON DELETE RESTRICT, created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now() ); -CREATE TRIGGER support_attachement_set_created_at BEFORE INSERT ON support.attachement - FOR EACH ROW EXECUTE FUNCTION set_created_at(); + CREATE TRIGGER support_attachement_set_updated_at BEFORE UPDATE ON support.attachement FOR EACH ROW EXECUTE FUNCTION set_updated_at();