mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
#716 - Remove createNamedQuery() and createQuery(Class<T> beanType, String query) ... use criteria API, query beans and RawSql
This commit is contained in:
1 parent
a20822a9e1
commit
11d623cb69
58 files changed
+56
-3578
No files matched your search
@@ -21,14 +21,11 @@ import com.avaje.ebeaninternal.api.SpiQuerySecondary;
|
||||
import com.avaje.ebeaninternal.server.autotune.ProfilingListener;
|
||||
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
|
||||
import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
|
||||
import com.avaje.ebeaninternal.server.deploy.DRawSqlSelect;
|
||||
import com.avaje.ebeaninternal.server.deploy.DeployNamedQuery;
|
||||
import com.avaje.ebeaninternal.server.deploy.TableJoin;
|
||||
import com.avaje.ebeaninternal.server.expression.DefaultExpressionList;
|
||||
import com.avaje.ebeaninternal.server.expression.SimpleExpression;
|
||||
import com.avaje.ebeaninternal.server.query.CancelableQuery;
|
||||
|
||||
import javax.persistence.PersistenceException;
|
||||
import java.sql.Timestamp;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
@@ -61,11 +58,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
|
||||
private CancelableQuery cancelableQuery;
|
||||
|
||||
/**
|
||||
* The name of the query.
|
||||
*/
|
||||
private String name;
|
||||
|
||||
private Type type;
|
||||
|
||||
private Mode mode = Mode.NORMAL;
|
||||
@@ -194,8 +186,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
|
||||
private PersistenceContextScope persistenceContextScope;
|
||||
|
||||
private boolean sqlSelect;
|
||||
|
||||
/**
|
||||
* Allow for explicit on off or null for default.
|
||||
*/
|
||||
@@ -240,47 +230,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
|
||||
private boolean useDocStore;
|
||||
|
||||
public DefaultOrmQuery(BeanDescriptor<T> desc, EbeanServer server, ExpressionFactory expressionFactory, String query) {
|
||||
public DefaultOrmQuery(BeanDescriptor<T> desc, EbeanServer server, ExpressionFactory expressionFactory) {
|
||||
this.beanDescriptor = desc;
|
||||
this.beanType = desc.getBeanType();
|
||||
this.server = server;
|
||||
this.expressionFactory = expressionFactory;
|
||||
this.detail = new OrmQueryDetail();
|
||||
this.name = "";
|
||||
if (query != null) {
|
||||
setQuery(query);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Additional supply a query which is parsed.
|
||||
*/
|
||||
public DefaultOrmQuery(BeanDescriptor<T> desc, EbeanServer server, ExpressionFactory expressionFactory,
|
||||
DeployNamedQuery namedQuery) throws PersistenceException {
|
||||
|
||||
this.beanDescriptor = desc;
|
||||
this.beanType = desc.getBeanType();
|
||||
this.server = server;
|
||||
this.expressionFactory = expressionFactory;
|
||||
this.detail = new OrmQueryDetail();
|
||||
if (namedQuery == null) {
|
||||
this.name = "";
|
||||
} else {
|
||||
this.name = namedQuery.getName();
|
||||
this.sqlSelect = namedQuery.isSqlSelect();
|
||||
if (sqlSelect) {
|
||||
// potentially with where and having clause...
|
||||
DRawSqlSelect sqlSelect = namedQuery.getSqlSelect();
|
||||
additionalWhere = sqlSelect.getWhereClause();
|
||||
additionalHaving = sqlSelect.getHavingClause();
|
||||
} else if (namedQuery.isRawSql()) {
|
||||
rawSql = namedQuery.getRawSql();
|
||||
|
||||
} else {
|
||||
// parse the entire query...
|
||||
setQuery(namedQuery.getQuery());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -290,7 +245,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
|
||||
@Override
|
||||
public boolean isAutoTunable() {
|
||||
return beanDescriptor.isAutoTunable() && !isSqlSelect();
|
||||
return beanDescriptor.isAutoTunable();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -496,7 +451,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
|
||||
if (Mode.LAZYLOAD_MANY.equals(getMode())) {
|
||||
return false;
|
||||
} else if (hasMaxRowsOrFirstRow() && !isRawSql() && !isSqlSelect()) {
|
||||
} else if (hasMaxRowsOrFirstRow() && !isRawSql()) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -605,8 +560,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
@Override
|
||||
public DefaultOrmQuery<T> copy(EbeanServer server) {
|
||||
|
||||
DefaultOrmQuery<T> copy = new DefaultOrmQuery<T>(beanDescriptor, server, expressionFactory, (String) null);
|
||||
copy.name = name;
|
||||
DefaultOrmQuery<T> copy = new DefaultOrmQuery<T>(beanDescriptor, server, expressionFactory);
|
||||
copy.includeTableJoin = includeTableJoin;
|
||||
copy.profilingListener = profilingListener;
|
||||
|
||||
@@ -623,7 +577,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
copy.excludeBeanCache = excludeBeanCache;
|
||||
copy.useQueryCache = useQueryCache;
|
||||
copy.readOnly = readOnly;
|
||||
copy.sqlSelect = sqlSelect;
|
||||
if (detail != null) {
|
||||
copy.detail = detail.copy();
|
||||
}
|
||||
@@ -744,7 +697,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
|
||||
@Override
|
||||
public Boolean isAutoTune() {
|
||||
return sqlSelect ? Boolean.FALSE : autoTune;
|
||||
return autoTune;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -946,19 +899,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
return new HashQuery(queryPlanKey, hc);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the query name.
|
||||
*/
|
||||
@Override
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSqlSelect() {
|
||||
return sqlSelect;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRawSql() {
|
||||
return rawSql != null;
|
||||
@@ -1065,16 +1005,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setQuery(String queryString) throws PersistenceException {
|
||||
|
||||
this.query = queryString;
|
||||
|
||||
OrmQueryDetailParser parser = new OrmQueryDetailParser(queryString);
|
||||
parser.parse();
|
||||
parser.assign(this);
|
||||
}
|
||||
|
||||
|
||||
protected void setRawWhereClause(String rawWhereClause) {
|
||||
this.rawWhereClause = rawWhereClause;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ import java.io.Serializable;
|
||||
import com.avaje.ebean.EbeanServer;
|
||||
import com.avaje.ebeaninternal.api.BindParams;
|
||||
import com.avaje.ebeaninternal.api.SpiUpdate;
|
||||
import com.avaje.ebeaninternal.server.deploy.DeployNamedUpdate;
|
||||
|
||||
/**
|
||||
* Default implementation of OrmUpdate.
|
||||
@@ -60,20 +59,6 @@ public final class DefaultOrmUpdate<T> implements SpiUpdate<T>, Serializable {
|
||||
this.name = "";
|
||||
this.updateStatement = updateStatement;
|
||||
this.type = deriveType(updateStatement);
|
||||
|
||||
}
|
||||
|
||||
public DefaultOrmUpdate(Class<?> beanType, EbeanServer server, String baseTable, DeployNamedUpdate namedUpdate) {
|
||||
|
||||
this.beanType = beanType;
|
||||
this.server = server;
|
||||
this.baseTable = baseTable;
|
||||
this.name = namedUpdate.getName();
|
||||
this.notifyCache = namedUpdate.isNotifyCache();
|
||||
|
||||
// named updates are always converted to sql as part of the initialisation
|
||||
this.updateStatement = namedUpdate.getSqlUpdateStatement();
|
||||
this.type = deriveType(updateStatement);
|
||||
}
|
||||
|
||||
public DefaultOrmUpdate<T> setTimeout(int secs) {
|
||||
|
||||
Reference in new issue
Block a user