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

OPENJPA-1726: fix the locate and substring for Postgres as it only accepts integer as the start index.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@964967 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Fay Wang 2010-07-16 22:39:06 +00:00
parent 6820830299
commit 90373cb93f
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
View File

@ -1287,7 +1287,12 @@ public class JPQLExpressionBuilder
if (node.children.length == 3) { if (node.children.length == 3) {
val1 = getValue(child(node, 0, 3)); val1 = getValue(child(node, 0, 3));
val2 = getValue(child(node, 1, 3)); val2 = getValue(child(node, 1, 3));
val3 = getValue(child(node, 2, 3)); JPQLNode child3 = child(node, 2, 3);
if (child3.id == JJTINTEGERLITERAL)
val3 = getIntegerValue(child3);
else
val3 = getValue(child3);
} else if (node.children.length == 2) { } else if (node.children.length == 2) {
val1 = getValue(child(node, 0, 2)); val1 = getValue(child(node, 0, 2));
val2 = getValue(child(node, 1, 2)); val2 = getValue(child(node, 1, 2));
@ -1306,9 +1311,13 @@ public class JPQLExpressionBuilder
Value locatePath = getValue(firstChild(node)); Value locatePath = getValue(firstChild(node));
Value locateSearch = getValue(secondChild(node)); Value locateSearch = getValue(secondChild(node));
Value locateFromIndex = null; Value locateFromIndex = null;
if (node.getChildCount() > 2) // optional start index arg if (node.getChildCount() > 2) { // optional start index arg
locateFromIndex = getValue(thirdChild(node)); JPQLNode child3 = thirdChild(node);
if (child3.id == JJTINTEGERLITERAL) {
locateFromIndex = getIntegerValue(child3);
} else
locateFromIndex = getValue(child3);
}
setImplicitType(locatePath, TYPE_STRING); setImplicitType(locatePath, TYPE_STRING);
setImplicitType(locateSearch, TYPE_STRING); setImplicitType(locateSearch, TYPE_STRING);
@ -1405,6 +1414,16 @@ public class JPQLExpressionBuilder
} }
} }
private Value getIntegerValue(JPQLNode node) {
BigDecimal bigdec = new BigDecimal
(node.text.endsWith("l") || node.text.endsWith("L")
? node.text.substring(0, node.text.length() - 1)
: node.text).
multiply(new BigDecimal(negative(node)));
return factory.newLiteral(Integer.valueOf(bigdec.intValue()),
Literal.TYPE_NUMBER);
}
/** /**
* Converts JPQL substring() function to OpenJPA ExpressionFactory * Converts JPQL substring() function to OpenJPA ExpressionFactory
* substring() arguments. * substring() arguments.