github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1333 - ENH: Support "dynamic formula" with findSingleAttributeList() ... e.g. .select("concat(lastName,', ',firstName)")

Browse Source 
Concat automatically maps to String ScalarType
This commit is contained in:
Rob Bygrave
2018-03-06 17:35:26 +13:00
parent c1c85b67c2
commit e1af7c29eb
2 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+14 -7
View File
@@ -10,7 +10,7 @@ import java.util.regex.Pattern;
class FormulaPropertyPath {
private static final String[] AGG_FUNCTIONS = {"count","max","min","avg"};
private static final String[] AGG_FUNCTIONS = {"count", "max", "min", "avg"};
private static final Pattern pattern = Pattern.compile("([a-zA-Z]*)\\((.*)\\)");
@@ -41,7 +41,7 @@ class FormulaPropertyPath {
}
private String trimDistinct(String propertyName) {
if (propertyName.startsWith(DISTINCT_)){
if (propertyName.startsWith(DISTINCT_)) {
countDistinct = true;
return propertyName.substring(DISTINCT_.length());
} else {
@@ -67,19 +67,22 @@ class FormulaPropertyPath {
ScalarType<?> scalarType;
if (isCount()) {
// count maps to Long / BIGINT
scalarType = descriptor.getScalarType(Types.BIGINT);
} else if (isConcat()) {
scalarType = descriptor.getScalarType(Types.VARCHAR);
} else {
// determine scalarType based on first property found by parser
if (firstProp != null) {
scalarType = firstProp.getBeanProperty().getScalarType();
} else {
throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor+" - maybe use a cast like ::String ?");
throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor + " - maybe use a cast like ::String ?");
}
}
String parsedAggregation = buildFormula(parsed);
return new DynamicPropertyAggregationFormula(formula, scalarType, parsedAggregation, isAggregate(),null);
return new DynamicPropertyAggregationFormula(formula, scalarType, parsedAggregation, isAggregate(), null);
}
private boolean isAggregate() {
@@ -93,9 +96,9 @@ class FormulaPropertyPath {
private String buildFormula(String parsed) {
if (countDistinct) {
return "count(distinct "+parsed+")";
return "count(distinct " + parsed + ")";
} else {
return outerFunction +"("+parsed+")";
return outerFunction + "(" + parsed + ")";
}
}
@@ -103,4 +106,8 @@ class FormulaPropertyPath {
return outerFunction.equals("count");
}
private boolean isConcat() {
return outerFunction.equals("concat");
}
}