From 4171c17aa1b18316ab89a778a65c21b5fa866b1c Mon Sep 17 00:00:00 2001 From: buczekp <buczekp> Date: Wed, 13 Jul 2011 12:54:58 +0000 Subject: [PATCH] [LMS-2368] fixed inconsistencies after improving trigger exception messages SVN: 22124 --- openbis/source/sql/postgresql/076/function-076.sql | 8 ++++---- openbis/source/sql/postgresql/077/function-077.sql | 8 ++++---- openbis/sourceTest/sql/postgresql/076/schema-076.sql | 10 +++++----- openbis/sourceTest/sql/postgresql/077/schema-077.sql | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/openbis/source/sql/postgresql/076/function-076.sql b/openbis/source/sql/postgresql/076/function-076.sql index 5a652603b2d..5580577c49b 100644 --- a/openbis/source/sql/postgresql/076/function-076.sql +++ b/openbis/source/sql/postgresql/076/function-076.sql @@ -359,14 +359,14 @@ BEGIN FROM samples WHERE samples.samp_id_part_of = NEW.id AND samples.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its component samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its component samples was not deleted.', NEW.code; END IF; -- all children need to be deleted SELECT count(*) INTO counter FROM sample_relationships sr, samples sc WHERE sample_id_parent = NEW.id AND sc.id = sr.sample_id_child AND sc.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its child samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its child samples was not deleted.', NEW.code; END IF; RETURN NEW; END; @@ -392,14 +392,14 @@ BEGIN FROM data WHERE data.expe_id = NEW.id AND data.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its data sets is not deleted.', NEW.code; + RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its data sets was not deleted.', NEW.code; END IF; -- check samples SELECT count(*) INTO counter FROM samples WHERE samples.expe_id = NEW.id AND samples.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its samples was not deleted.', NEW.code; END IF; RETURN NEW; END; diff --git a/openbis/source/sql/postgresql/077/function-077.sql b/openbis/source/sql/postgresql/077/function-077.sql index 5a652603b2d..5580577c49b 100644 --- a/openbis/source/sql/postgresql/077/function-077.sql +++ b/openbis/source/sql/postgresql/077/function-077.sql @@ -359,14 +359,14 @@ BEGIN FROM samples WHERE samples.samp_id_part_of = NEW.id AND samples.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its component samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its component samples was not deleted.', NEW.code; END IF; -- all children need to be deleted SELECT count(*) INTO counter FROM sample_relationships sr, samples sc WHERE sample_id_parent = NEW.id AND sc.id = sr.sample_id_child AND sc.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its child samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its child samples was not deleted.', NEW.code; END IF; RETURN NEW; END; @@ -392,14 +392,14 @@ BEGIN FROM data WHERE data.expe_id = NEW.id AND data.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its data sets is not deleted.', NEW.code; + RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its data sets was not deleted.', NEW.code; END IF; -- check samples SELECT count(*) INTO counter FROM samples WHERE samples.expe_id = NEW.id AND samples.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its samples was not deleted.', NEW.code; END IF; RETURN NEW; END; diff --git a/openbis/sourceTest/sql/postgresql/076/schema-076.sql b/openbis/sourceTest/sql/postgresql/076/schema-076.sql index 2834e6f2ea1..c9fb5005473 100644 --- a/openbis/sourceTest/sql/postgresql/076/schema-076.sql +++ b/openbis/sourceTest/sql/postgresql/076/schema-076.sql @@ -96,14 +96,14 @@ BEGIN FROM data WHERE data.expe_id = NEW.id AND data.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its data sets is not deleted.', NEW.code; + RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its data sets was not deleted.', NEW.code; END IF; -- check samples SELECT count(*) INTO counter FROM samples WHERE samples.expe_id = NEW.id AND samples.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its samples was not deleted.', NEW.code; END IF; RETURN NEW; END; @@ -120,21 +120,21 @@ BEGIN FROM data WHERE data.samp_id = NEW.id AND data.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its data sets is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its data sets was not deleted.', NEW.code; END IF; -- all components need to be deleted SELECT count(*) INTO counter FROM samples WHERE samples.samp_id_part_of = NEW.id AND samples.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its component samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its component samples was not deleted.', NEW.code; END IF; -- all children need to be deleted SELECT count(*) INTO counter FROM sample_relationships sr, samples sc WHERE sample_id_parent = NEW.id AND sc.id = sr.sample_id_child AND sc.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its child samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its child samples was not deleted.', NEW.code; END IF; RETURN NEW; END; diff --git a/openbis/sourceTest/sql/postgresql/077/schema-077.sql b/openbis/sourceTest/sql/postgresql/077/schema-077.sql index 2834e6f2ea1..c9fb5005473 100644 --- a/openbis/sourceTest/sql/postgresql/077/schema-077.sql +++ b/openbis/sourceTest/sql/postgresql/077/schema-077.sql @@ -96,14 +96,14 @@ BEGIN FROM data WHERE data.expe_id = NEW.id AND data.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its data sets is not deleted.', NEW.code; + RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its data sets was not deleted.', NEW.code; END IF; -- check samples SELECT count(*) INTO counter FROM samples WHERE samples.expe_id = NEW.id AND samples.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Experiment (Code: %) deletion failed because at least one of its samples was not deleted.', NEW.code; END IF; RETURN NEW; END; @@ -120,21 +120,21 @@ BEGIN FROM data WHERE data.samp_id = NEW.id AND data.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its data sets is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its data sets was not deleted.', NEW.code; END IF; -- all components need to be deleted SELECT count(*) INTO counter FROM samples WHERE samples.samp_id_part_of = NEW.id AND samples.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its component samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its component samples was not deleted.', NEW.code; END IF; -- all children need to be deleted SELECT count(*) INTO counter FROM sample_relationships sr, samples sc WHERE sample_id_parent = NEW.id AND sc.id = sr.sample_id_child AND sc.del_id IS NULL; IF (counter > 0) THEN - RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its child samples is not deleted.', NEW.code; + RAISE EXCEPTION 'Sample (Code: %) deletion failed because at least one of its child samples was not deleted.', NEW.code; END IF; RETURN NEW; END; -- GitLab