From 5b1c56ccdc7212f6dcc40b61a0000bb5123ffd9c Mon Sep 17 00:00:00 2001 From: buczekp <buczekp> Date: Wed, 13 Jul 2011 13:04:21 +0000 Subject: [PATCH] [LMS-2368] fixed inconsistencies part2 SVN: 22126 --- openbis/source/sql/postgresql/076/function-076.sql | 2 +- openbis/source/sql/postgresql/077/function-077.sql | 2 +- openbis/source/sql/postgresql/migration/migration-075-076.sql | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openbis/source/sql/postgresql/076/function-076.sql b/openbis/source/sql/postgresql/076/function-076.sql index 5580577c49b..ebca1a7d743 100644 --- a/openbis/source/sql/postgresql/076/function-076.sql +++ b/openbis/source/sql/postgresql/076/function-076.sql @@ -352,7 +352,7 @@ 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 diff --git a/openbis/source/sql/postgresql/077/function-077.sql b/openbis/source/sql/postgresql/077/function-077.sql index 5580577c49b..ebca1a7d743 100644 --- a/openbis/source/sql/postgresql/077/function-077.sql +++ b/openbis/source/sql/postgresql/077/function-077.sql @@ -352,7 +352,7 @@ 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 diff --git a/openbis/source/sql/postgresql/migration/migration-075-076.sql b/openbis/source/sql/postgresql/migration/migration-075-076.sql index 86ee1ba0e3f..745cc5b7eda 100644 --- a/openbis/source/sql/postgresql/migration/migration-075-076.sql +++ b/openbis/source/sql/postgresql/migration/migration-075-076.sql @@ -119,14 +119,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; -- GitLab