github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-14 14:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1021 Fix for query plan clash with single inheritance and cached query

Browse Source
This commit is contained in:
rob bygrave committed 2017-05-11 21:57:24 +12:00
1 parent 2a64a02211
commit 8cef603d1c
3 files changed
+85 -72
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+1 -1
View File
@@ -961,7 +961,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
if (isNativeSql()) {
queryPlanKey = new NativeSqlQueryPlanKey(nativeSql);
} else {
queryPlanKey = new OrmQueryPlanKey(m2mIncludeJoin, type, detail, maxRows, firstRow,
queryPlanKey = new OrmQueryPlanKey(beanDescriptor.getDiscValue(), m2mIncludeJoin, type, detail, maxRows, firstRow,
disableLazyLoading, orderBy,
distinct, sqlDistinct, mapKey, id, bindParams, whereExpressions, havingExpressions,
temporalMode, forUpdate, rootTableAlias, rawSql, updateProperties);
src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+4 -1
View File
@@ -26,7 +26,7 @@ class OrmQueryPlanKey implements CQueryPlanKey {
private final int bindCount;
private final String options;
OrmQueryPlanKey(TableJoin m2mIncludeTable, SpiQuery.Type type, OrmQueryDetail detail, int maxRows, int firstRow, boolean disableLazyLoading,
OrmQueryPlanKey(String discValue, TableJoin m2mIncludeTable, SpiQuery.Type type, OrmQueryDetail detail, int maxRows, int firstRow, boolean disableLazyLoading,
OrderBy<?> orderBy, boolean distinct, boolean sqlDistinct, String mapKey, Object id, BindParams bindParams,
SpiExpression whereExpressions, SpiExpression havingExpressions, SpiQuery.TemporalMode temporalMode,
Query.ForUpdate forUpdate, String rootTableAlias, RawSql rawSql, OrmUpdateProperties updateProperties) {
@@ -35,6 +35,9 @@ class OrmQueryPlanKey implements CQueryPlanKey {
if (type != null) {
sb.append("t:").append(type.ordinal());
}
if (discValue != null) {
sb.append("disc:").append(discValue);
}
if (temporalMode != SpiQuery.TemporalMode.CURRENT) {
sb.append(",temp:").append(temporalMode.ordinal());
}