Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-03-09 14:36:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2012: Support in-memory MIN()/MAX() on non-numeric types

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1133605 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Pinaki Poddar 2011-06-08 23:50:30 +00:00
parent 14816f465b
commit 0de12ed492
3 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
View File

@ -364,6 +364,8 @@ public class Filters {
return Short.valueOf(((Number) o).shortValue());
} else if (type == Byte.class && allowNumericConversion(o.getClass(), type, strictNumericConversion)) {
return Byte.valueOf(((Number) o).byteValue());
} else if (type == Character.class) {
return (char) ((Number) o).intValue();
} else if (!strictNumericConversion) {
return ((Number) o).intValue();
} else {

48
openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/UniqueResultObjectProvider.java
View File

@ -18,6 +18,10 @@
*/
package org.apache.openjpa.slice.jdbc;
import java.util.Date;
import org.apache.openjpa.jdbc.kernel.exps.Val;
import org.apache.openjpa.kernel.Filters;
import org.apache.openjpa.kernel.StoreQuery;
import org.apache.openjpa.kernel.exps.QueryExpressions;
import org.apache.openjpa.kernel.exps.Value;
@ -86,6 +90,7 @@ public class UniqueResultObjectProvider implements ResultObjectProvider {
for (int i=0; i<values.length; i++) {
Value v = values[i];
boolean isAggregate = v.isAggregate();
String op = v.getClass().getSimpleName();
for (ResultObjectProvider rop:_rops) {
if (i == 0)
@ -107,6 +112,7 @@ public class UniqueResultObjectProvider implements ResultObjectProvider {
} else {
single[i] = row[i];
}
single[i] = Filters.convert(single[i], v.getType());
}
}
_single = single;
@ -126,8 +132,21 @@ public class UniqueResultObjectProvider implements ResultObjectProvider {
return other;
if (other == null)
return current;
return Math.max(((Number)current).doubleValue(),
if (current instanceof Number) {
return Math.max(((Number)current).doubleValue(),
((Number)other).doubleValue());
}
if (current instanceof String) {
return ((String)current).compareTo((String)other) > 0 ? current : other;
}
if (current instanceof Date) {
return ((Date)current).compareTo((Date)other) > 0 ? current : other;
}
if (current instanceof Character) {
return ((Character)current).compareTo((Character)other) > 0 ? current : other;
}
throw new UnsupportedOperationException(_loc.get("aggregate-unsupported-on-type",
"MAX()", (current == null ? other : current).getClass().getName()).toString());
}
Object min(Object current, Object other) {
@ -135,8 +154,21 @@ public class UniqueResultObjectProvider implements ResultObjectProvider {
return other;
if (other == null)
return current;
return Math.min(((Number)current).doubleValue(),
((Number)other).doubleValue());
if (current instanceof Number) {
return Math.min(((Number)current).doubleValue(),
((Number)other).doubleValue());
}
if (current instanceof String) {
return ((String)current).compareTo((String)other) < 0 ? current : other;
}
if (current instanceof Date) {
return ((Date)current).compareTo((Date)other) < 0 ? current : other;
}
if (current instanceof Character) {
return ((Character)current).compareTo((Character)other) < 0 ? current : other;
}
throw new UnsupportedOperationException(_loc.get("aggregate-unsupported-on-type",
"MIN()", (current == null ? other : current).getClass().getName()).toString());
}
Object sum(Object current, Object other) {
@ -144,12 +176,14 @@ public class UniqueResultObjectProvider implements ResultObjectProvider {
return other;
if (other == null)
return current;
return (((Number)current).doubleValue() +
if (current instanceof Number) {
return (((Number)current).doubleValue() +
((Number)other).doubleValue());
}
throw new UnsupportedOperationException(_loc.get("aggregate-unsupported-on-type",
"SUM()", (current == null ? other : current).getClass().getName()).toString());
}
public void open() throws Exception {
for (ResultObjectProvider rop:_rops)
rop.open();

3
openjpa-slice/src/main/resources/org/apache/openjpa/slice/jdbc/localizer.properties
View File

@ -64,4 +64,5 @@ resource-not-xa-tm-2pc: One or more slices is not using XA-complaint driver \
but the configured "{0}" transaction manager can only enlist XA-aware \
resource.
not-open: The underlying result sets are not open.
aggregate-unsupported: The query uses unsupported aggregate operation "{0}".
aggregate-unsupported: The query uses unsupported aggregate operation {0}.
aggregate-unsupported-on-type: Aggregate operation {0} not supported on {1}