diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java index 222f00b9a..ef939a8f5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java @@ -391,6 +391,11 @@ public interface SpiQuery extends Query, SpiQueryFetch, TxnProfileEventCod */ void incrementAsOfTableCount(); + /** + * Increment the counter of tables used in 'As Of' query. + */ + void incrementAsOfTableCount(int asOfTableCount); + /** * Return the table alias used for the base table. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java index 1fccc46f3..ff6839723 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java @@ -119,6 +119,11 @@ public interface DbSqlContext { */ boolean isIncludeSoftDelete(); + /** + * Return the count of history table AS OF predicates added via joins. + */ + int asOfTableCount(); + /** * Return true if the query is a 'asDraft' query. */ 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 77dc2b1e6..dfdae96c0 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 @@ -647,6 +647,7 @@ final class CQueryBuilder { if (query.isAsOfBaseTable() && !historySupport.isStandardsBased()) { appendAndOrWhere(); sb.append(historySupport.getAsOfPredicate(request.baseTableAlias())); + query.incrementAsOfTableCount(); } } 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 4e45c564c..308e79f9f 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 @@ -30,6 +30,7 @@ final class DefaultDbSqlContext implements DbSqlContext { private boolean useColumnAlias; private int columnIndex; + private int asOfTableCount; private StringBuilder sb = new StringBuilder(STRING_BUILDER_INITIAL_CAPACITY); @@ -178,6 +179,7 @@ final class DefaultDbSqlContext implements DbSqlContext { } if (addAsOfOnClause) { sb.append(" and ").append(historySupport.getAsOfPredicate(a2)); + asOfTableCount++; } if (extraWhere != null && !extraWhere.isEmpty()) { sb.append(" and "); @@ -195,6 +197,11 @@ final class DefaultDbSqlContext implements DbSqlContext { } } + @Override + public int asOfTableCount() { + return asOfTableCount; + } + @Override public boolean isDraftQuery() { return draftSupport != null; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index c0142ddbc..672e5acff 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -127,6 +127,7 @@ public final class SqlTreeBuilder { groupBy = buildGroupByClause(); distinctOn = buildDistinctOn(); encryptedProps = ctx.getEncryptedProps(); + query.incrementAsOfTableCount(ctx.asOfTableCount()); } boolean includeJoins = alias != null && alias.isIncludeJoins(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java index 1ed4df10d..621820862 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -302,20 +302,7 @@ class SqlTreeNodeBean implements SqlTreeNode { @Override public void addAsOfTableAlias(SpiQuery query) { - // if history on this bean type add it's alias - // for each alias we add an effect date predicate - if (desc.isHistorySupport()) { - query.incrementAsOfTableCount(); - } - if (lazyLoadParent != null && lazyLoadParent.isManyToManyWithHistory()) { - query.incrementAsOfTableCount(); - } - if (intersectionAsOfTableAlias) { - query.incrementAsOfTableCount(); - } - for (SqlTreeNode child : children) { - child.addAsOfTableAlias(query); - } + // do nothing for non-root, handled by DbSqlContext for joins } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java index c25024624..be58c1938 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java @@ -58,13 +58,6 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean { public void addAsOfTableAlias(SpiQuery query) { if (desc.isHistorySupport()) { query.setAsOfBaseTable(); - query.incrementAsOfTableCount(); - } - if (lazyLoadParent != null && lazyLoadParent.isManyToManyWithHistory()) { - query.incrementAsOfTableCount(); - } - for (SqlTreeNode aChildren : children) { - aChildren.addAsOfTableAlias(query); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 6aa0f9a6a..0ffc61941 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -316,6 +316,11 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< asOfTableCount++; } + @Override + public void incrementAsOfTableCount(int increment) { + asOfTableCount += increment; + } + @Override public int getAsOfTableCount() { return asOfTableCount; diff --git a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java index d8df4254c..3abebab1a 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java @@ -12,7 +12,7 @@ public class HistoryOneToOne extends BaseDomain { String name; - @OneToOne(cascade = {CascadeType.REFRESH, CascadeType.REFRESH}) + @OneToOne(cascade = CascadeType.REFRESH) HistorylessOneToOne historylessOneToOne; public HistoryOneToOne(String name) { diff --git a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java index b4929ca03..b35326f79 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java @@ -1,23 +1,28 @@ package org.tests.model.history; +import org.tests.model.draftable.BaseDomain; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.OneToOne; -import org.tests.model.draftable.BaseDomain; @Entity public class HistorylessOneToOne extends BaseDomain { + private String name; + /** + * This @OneToOne(mappedBy=...) side should really be FetchType.LAZY + */ + @OneToOne(mappedBy = "historylessOneToOne", cascade = CascadeType.ALL, orphanRemoval = true)//, fetch = FetchType.LAZY) + HistoryOneToOne historyOneToOne; + public HistorylessOneToOne() {} public HistorylessOneToOne(final String name) { this.name = name; } - @OneToOne(mappedBy = "historylessOneToOne", cascade = CascadeType.ALL, orphanRemoval = true) - HistoryOneToOne historyOneToOne; - public HistoryOneToOne getHistoryOneToOne() { return historyOneToOne; } diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToOne.java index a2badeeb8..ec452bbe2 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToOne.java @@ -1,33 +1,86 @@ package org.tests.model.history; -import static org.assertj.core.api.Assertions.assertThat; - import io.ebean.DB; import io.ebean.annotation.Platform; -import io.ebean.test.LoggedSql; import io.ebean.xtest.BaseTestCase; import io.ebean.xtest.IgnorePlatform; -import java.sql.Timestamp; -import java.util.List; import org.junit.jupiter.api.Test; -public class TestHistoryOneToOne extends BaseTestCase { +import java.sql.Timestamp; + +import static org.assertj.core.api.Assertions.assertThat; + +class TestHistoryOneToOne extends BaseTestCase { + + private Long expectedLessId; + private Long expectedHistoryId; @IgnorePlatform({Platform.ORACLE, Platform.COCKROACH}) @Test - public void test() throws InterruptedException { + void test() throws InterruptedException { HistorylessOneToOne historylessOneToOne = new HistorylessOneToOne(); historylessOneToOne.setHistoryOneToOne(new HistoryOneToOne("one")); DB.save(historylessOneToOne); Thread.sleep(20); - LoggedSql.start(); + expectedLessId = historylessOneToOne.getId(); + expectedHistoryId = historylessOneToOne.getHistoryOneToOne().getId(); + + findViaHistory(); + findViaLess(); + + findViaLess_fetch(); + findViaHistory_fetch(); + } + + private void findViaLess() { + HistorylessOneToOne lessFetched = DB.find(HistorylessOneToOne.class) + .asOf(new Timestamp(System.currentTimeMillis())) + .findOne(); + + expected_findViaLess(lessFetched); + } + + + private void findViaLess_fetch() { + HistorylessOneToOne lessFetched = DB.find(HistorylessOneToOne.class) + .asOf(new Timestamp(System.currentTimeMillis())) + .fetch("historyOneToOne") + .findOne(); + + expected_findViaLess(lessFetched); + } + + private void expected_findViaLess(HistorylessOneToOne lessFetched) { + assert lessFetched != null; + assertThat(lessFetched.getId()).isEqualTo(expectedLessId); + HistoryOneToOne history1 = lessFetched.getHistoryOneToOne(); + assertThat(history1.getId()).isEqualTo(expectedHistoryId); + assertThat(history1.getHistorylessOneToOne().getId()).isEqualTo(expectedLessId); + } + + + private void findViaHistory_fetch() { + + HistoryOneToOne oneFetched = DB.find(HistoryOneToOne.class) + .asOf(new Timestamp(System.currentTimeMillis())) + .fetch("historylessOneToOne") + .findOne(); + + expected_viaHistory(oneFetched); + } + + private void findViaHistory() { HistoryOneToOne oneFetched = DB.find(HistoryOneToOne.class) .asOf(new Timestamp(System.currentTimeMillis())) .findOne(); - assertThat(oneFetched.getHistorylessOneToOne().getHistoryOneToOne().getId()).isEqualTo(historylessOneToOne.getHistoryOneToOne().getId()); + expected_viaHistory(oneFetched); + } - List sql = LoggedSql.stop(); + private void expected_viaHistory(HistoryOneToOne oneFetched) { + assert oneFetched != null; + assertThat(oneFetched.getId()).isEqualTo(expectedHistoryId); + assertThat(oneFetched.getHistorylessOneToOne().getId()).isEqualTo(expectedLessId); } }