From 4f24944ec4cf3501a6186ad26841bfde4691beb8 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Thu, 26 Mar 2015 22:28:29 +0600 Subject: [PATCH] Do not use getPreWhere in case of unparsed SQL. Fixes #259. --- .../avaje/ebeaninternal/server/query/CQueryPredicates.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java index c1951fb8b..8ec32e4a1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; +import com.avaje.ebean.RawSql; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -234,7 +235,8 @@ public class CQueryPredicates { // RawSql query hit cached query plan. Need to convert // named parameters into positioned parameters so that // the named parameters are bound - String s = query.getRawSql().getSql().getPreWhere(); + RawSql.Sql sql = query.getRawSql().getSql(); + String s = sql.isParsed() ? sql.getPreWhere() : sql.getUnparsedSql(); if (bindParams.requiresNamedParamsPrepare()) { BindParamsParser.parse(bindParams, s); }