Author: bleny Date: 2014-04-07 16:36:01 +0200 (Mon, 07 Apr 2014) New Revision: 1854 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1854 Log: refs #4490 fix query generation for boats registration code filter Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-04-07 14:17:38 UTC (rev 1853) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-04-07 14:36:01 UTC (rev 1854) @@ -100,9 +100,9 @@ } if (StringUtils.isNotEmpty(filter.getRegistrationCode())) { - //FIXME ! - query.addLike(Boat.PROPERTY_IMMATRICULATION + "::text", filter.getRegistrationCode() + "%"); + query.addWhereClause("str(b." + Boat.PROPERTY_IMMATRICULATION + ") like :registrationCode", ImmutableMap.of("registrationCode", (Object) (filter.getRegistrationCode() + "%"))); } + if (CollectionUtils.isNotEmpty(filter.getShipOwnerIds())) { query.addWhereClause( "b.topiaId IN (SELECT b2.topiaId FROM fr.ifremer.wao.entity.BoatImpl AS b2 JOIN b2.shipOwner AS shipOwner WHERE shipOwner.topiaId IN (:shipOwnerIds))",