diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java index cc0de5c46..4fd0a8f15 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java @@ -139,10 +139,10 @@ public class CQueryBuilder { if (!sqlTree.isIncludeJoins()) { // simple - update table set ... where ... - return aliasStrip(buildSql(updateClause, request, predicates, sqlTree).getSql()); + return aliasStrip(buildSqlUpdate(updateClause, request, predicates, sqlTree).getSql()); } // wrap as - update table set ... where id in (select id ...) - String sql = buildSql(null, request, predicates, sqlTree).getSql(); + String sql = buildSqlUpdate(null, request, predicates, sqlTree).getSql(); sql = updateClause + " " + request.getBeanDescriptor().getWhereIdInSql() + "in (" + sql + ")"; String alias = (rootTableAlias == null) ? "t0" : rootTableAlias; sql = aliasReplace(sql, alias); @@ -406,7 +406,21 @@ public class CQueryBuilder { return new SqlTreeBuilder(request, predicates, detail, rawNoId).build(); } + /** + * Return the SQL response with row limiting (when not an update statement). + */ private SqlLimitResponse buildSql(String selectClause, OrmQueryRequest request, CQueryPredicates predicates, SqlTree select) { + return buildSql(selectClause, request, predicates, select, false); + } + + /** + * Return the SQL response for update statement (stripping table alias for find by id expression). + */ + private SqlLimitResponse buildSqlUpdate(String selectClause, OrmQueryRequest request, CQueryPredicates predicates, SqlTree select) { + return buildSql(selectClause, request, predicates, select, true); + } + + private SqlLimitResponse buildSql(String selectClause, OrmQueryRequest request, CQueryPredicates predicates, SqlTree select, boolean stripAlias) { SpiQuery query = request.getQuery(); @@ -471,6 +485,10 @@ public class CQueryBuilder { throw new IllegalStateException("Executing FindById query on entity bean " + desc.getName() + " that doesn't have an @Id property??"); } + if (stripAlias) { + // strip the table alias for use in update statement + idSql = StringHelper.replaceString(idSql, "t0.",""); + } sb.append(idSql).append(" "); hasWhere = true; } diff --git a/src/test/java/com/avaje/ebean/EbeanServer_refresh.java b/src/test/java/com/avaje/ebean/EbeanServer_refresh.java new file mode 100644 index 000000000..31a84e78b --- /dev/null +++ b/src/test/java/com/avaje/ebean/EbeanServer_refresh.java @@ -0,0 +1,30 @@ +package com.avaje.ebean; + +import com.avaje.tests.model.basic.EBasic; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class EbeanServer_refresh { + + @Test + public void basic() { + + EbeanServer server = Ebean.getDefaultServer(); + + EBasic basic = new EBasic("basic refresh"); + basic.setStatus(EBasic.Status.NEW); + server.save(basic); + + int rows = + server.update(EBasic.class) + .set("status", EBasic.Status.ACTIVE) + .where().idEq(basic.getId()) + .update(); + + assertEquals(rows, 1); + + server.refresh(basic); + assertEquals(basic.getStatus(), EBasic.Status.ACTIVE); + } +} diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 466673fd5..c6a513108 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -76,10 +76,10 @@ - - - - + + + +