mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
Merge branch 'feature/StdExpressions'
This commit is contained in:
commit
5882169641
61 files changed
+1019
-202
No files matched your search
@@ -2,7 +2,6 @@ package io.ebeaninternal.server.querydefn;
|
||||
|
||||
import io.avaje.lang.NonNullApi;
|
||||
import io.ebean.*;
|
||||
import io.ebean.OrderBy.Property;
|
||||
import io.ebean.bean.CallOrigin;
|
||||
import io.ebean.bean.ObjectGraphNode;
|
||||
import io.ebean.bean.ObjectGraphOrigin;
|
||||
@@ -420,7 +419,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
|
||||
havingExpressions.containsMany(beanDescriptor, manyWhere);
|
||||
}
|
||||
if (orderBy != null) {
|
||||
for (Property orderProperty : orderBy.getProperties()) {
|
||||
for (OrderBy.Property orderProperty : orderBy.getProperties()) {
|
||||
ElPropertyDeploy elProp = beanDescriptor.elPropertyDeploy(orderProperty.getProperty());
|
||||
if (elProp != null && elProp.containsFormulaWithJoin()) {
|
||||
manyWhere.addFormulaWithJoin(elProp.elPrefix(), elProp.name());
|
||||
@@ -460,10 +459,10 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
|
||||
for (OrmQueryProperties joinPath : queryJoins) {
|
||||
// loop through the orderBy properties and
|
||||
// move any ones related to the query join
|
||||
List<Property> properties = orderBy.getProperties();
|
||||
Iterator<Property> it = properties.iterator();
|
||||
List<OrderBy.Property> properties = orderBy.getProperties();
|
||||
Iterator<OrderBy.Property> it = properties.iterator();
|
||||
while (it.hasNext()) {
|
||||
Property property = it.next();
|
||||
OrderBy.Property property = it.next();
|
||||
if (property.getProperty().startsWith(joinPath.getPath())) {
|
||||
// remove this orderBy segment and
|
||||
// add it to the secondary join
|
||||
@@ -1963,7 +1962,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
|
||||
havingExpressions.validate(validation);
|
||||
}
|
||||
if (orderBy != null) {
|
||||
for (Property property : orderBy.getProperties()) {
|
||||
for (OrderBy.Property property : orderBy.getProperties()) {
|
||||
validation.validate(property.getProperty());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.querydefn;
|
||||
|
||||
import io.ebean.ExpressionList;
|
||||
import io.ebean.ProfileLocation;
|
||||
import io.ebean.Query;
|
||||
import io.ebean.UpdateQuery;
|
||||
import io.ebean.core.type.ScalarType;
|
||||
import io.ebeaninternal.server.deploy.BeanDescriptor;
|
||||
@@ -34,6 +35,16 @@ public final class DefaultUpdateQuery<T> implements UpdateQuery<T> {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <P> UpdateQuery<T> set(Query.Property<P> property, P value) {
|
||||
return set(property.toString(), value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateQuery<T> setNull(Query.Property<?> property) {
|
||||
return setNull(property.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public UpdateQuery<T> setNull(String property) {
|
||||
values.setNull(property);
|
||||
|
||||
Reference in new issue
Block a user