mirror of https://github.com/apache/openjpa.git
OPENJPA-488, OPENJPA-489, OPENJPA-490, OPENJPA-491, OPENJPA-492. Reduce logging in test case; use onlyChild() to validate tree structure.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@612348 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3d3cb67c5a
commit
206f0f04e1
|
@ -1075,13 +1075,13 @@ public class JPQLExpressionBuilder
|
||||||
return factory.getCurrentTimestamp();
|
return factory.getCurrentTimestamp();
|
||||||
|
|
||||||
case JJTSELECTEXTENSION:
|
case JJTSELECTEXTENSION:
|
||||||
return eval(node.children[0]);
|
return eval(onlyChild(node));
|
||||||
|
|
||||||
case JJTGROUPBYEXTENSION:
|
case JJTGROUPBYEXTENSION:
|
||||||
return eval(node.children[0]);
|
return eval(onlyChild(node));
|
||||||
|
|
||||||
case JJTORDERBYEXTENSION:
|
case JJTORDERBYEXTENSION:
|
||||||
return eval(node.children[0]);
|
return eval(onlyChild(node));
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw parseException(EX_FATAL, "bad-tree",
|
throw parseException(EX_FATAL, "bad-tree",
|
||||||
|
|
|
@ -38,7 +38,7 @@ public abstract class GroupingTestCase
|
||||||
protected abstract void prepareQuery(Query q);
|
protected abstract void prepareQuery(Query q);
|
||||||
|
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
super.setUp(AllFieldTypes.class, CLEAR_TABLES, "openjpa.Log", "SQL=TRACE");
|
super.setUp(AllFieldTypes.class, CLEAR_TABLES);
|
||||||
|
|
||||||
AllFieldTypes pc1 = new AllFieldTypes();
|
AllFieldTypes pc1 = new AllFieldTypes();
|
||||||
AllFieldTypes pc2 = new AllFieldTypes();
|
AllFieldTypes pc2 = new AllFieldTypes();
|
||||||
|
|
Loading…
Reference in New Issue