From 4dd72bcc0ca1686c1ac723acb26aa4dd0893d439 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 7 Apr 2009 13:17:13 +0000
Subject: [PATCH] LMS-835 bug in migration script and SamplePE fixed
SVN: 10613
---
.../ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java | 1 -
openbis/source/sql/postgresql/migration/migration-031-032.sql | 2 --
2 files changed, 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
index b8e0d5adef5..4910dc9a88c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
@@ -337,7 +337,6 @@ public class SamplePE implements IIdAndCodeHolder, Comparable<SamplePE>,
}
@ManyToOne(fetch = FetchType.LAZY)
- @NotNull(message = ValidationMessages.EXPERIMENT_NOT_NULL_MESSAGE)
@JoinColumn(name = ColumnNames.EXPERIMENT_COLUMN, updatable = true)
@IndexedEmbedded(prefix = SearchFieldConstants.PREFIX_EXPERIMENT)
private ExperimentPE getExperimentInternal()
diff --git a/openbis/source/sql/postgresql/migration/migration-031-032.sql b/openbis/source/sql/postgresql/migration/migration-031-032.sql
index d5f42cba773..2e1532900d4 100644
--- a/openbis/source/sql/postgresql/migration/migration-031-032.sql
+++ b/openbis/source/sql/postgresql/migration/migration-031-032.sql
@@ -61,8 +61,6 @@ DROP SEQUENCE procedure_type_id_seq;
-- Purpose: Replace trigger SAMPLE_CODE_UNIQUENESS_CHECK
------------------------------------------------------------------------------------
-DROP FUNCTION SAMPLE_CODE_UNIQUENESS_CHECK();
-
CREATE OR REPLACE FUNCTION SAMPLE_CODE_UNIQUENESS_CHECK() RETURNS trigger AS $$
DECLARE
counter INTEGER;
--
GitLab