diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index dfdae96c0..b32492cec 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -644,10 +644,12 @@ final class CQueryBuilder { } private void appendHistoryAsOfPredicate() { - if (query.isAsOfBaseTable() && !historySupport.isStandardsBased()) { - appendAndOrWhere(); - sb.append(historySupport.getAsOfPredicate(request.baseTableAlias())); + if (query.isAsOfBaseTable()) { query.incrementAsOfTableCount(); + if (!historySupport.isStandardsBased()){ + appendAndOrWhere(); + sb.append(historySupport.getAsOfPredicate(request.baseTableAlias())); + } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java index d61038eb5..63fa76d92 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java @@ -134,6 +134,9 @@ final class DefaultDbSqlContext implements DbSqlContext { String asOfView = historySupport.getAsOfView(table); appendTable(table, asOfView); if (asOfView != null) { + if (historySupport.isStandardsBased()) { + asOfTableCount++; + } addAsOfOnClause = !historySupport.isStandardsBased(); } }