From e17fe1ace257d2294a1f3aed8f039ddd68bc0f9a Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 6 Jul 2010 13:55:52 +0000
Subject: [PATCH] bugfix: cannot change data set property type assignment from
optional to mandatory (worked only for sample properties)
SVN: 16872
---
.../generic/server/dataaccess/db/EntityPropertyTypeDAO.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
index ec60ba102b1..b9527fce630 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
@@ -196,8 +196,9 @@ final class EntityPropertyTypeDAO extends AbstractDAO implements IEntityProperty
String query =
String
.format(
- "SELECT s.id FROM %s s WHERE s.sampleType = ? AND s not in (SELECT sp.entity FROM %s sp WHERE sp.entityTypePropertyType = ?)",
+ "SELECT e.id FROM %s e WHERE e.%s = ? AND e not in (SELECT p.entity FROM %s p WHERE p.entityTypePropertyType = ?)",
entityKind.getEntityClass().getSimpleName(), entityKind
+ .getEntityTypeFieldName(), entityKind
.getEntityPropertyClass().getSimpleName());
final List<Long> list =
cast(getHibernateTemplate().find(query,
--
GitLab