You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2021/05/07 23:12:13 UTC
[db-jdo] 31/43: JDO-410: merge changes from trunk into branch 2.0.1
This is an automated email from the ASF dual-hosted git repository.
clr pushed a commit to branch origin/2.0.1
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 675a30ae52729a03347495df26ad1512c68d8108
Author: Michael Bouschen <mb...@apache.org>
AuthorDate: Tue Oct 3 22:02:35 2006 +0000
JDO-410: merge changes from trunk into branch 2.0.1
---
.../jdo/tck/query/result/AggregateResult.java | 36 +++++++++++-----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/tck20/src/java/org/apache/jdo/tck/query/result/AggregateResult.java b/tck20/src/java/org/apache/jdo/tck/query/result/AggregateResult.java
index 1e26190..2f2ccb1 100644
--- a/tck20/src/java/org/apache/jdo/tck/query/result/AggregateResult.java
+++ b/tck20/src/java/org/apache/jdo/tck/query/result/AggregateResult.java
@@ -197,10 +197,10 @@ public class AggregateResult extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
- // SUM(manager.salary)
+ // SUM(((FullTimeEmployee)manager).salary)
new QueryElementHolder(
/*UNIQUE*/ null,
- /*RESULT*/ "SUM(manager.salary)",
+ /*RESULT*/ "SUM(((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
/*FROM*/ FullTimeEmployee.class,
/*EXCLUDE*/ null,
@@ -213,10 +213,10 @@ public class AggregateResult extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
- // SUM(DISTINCT manager.salary)
+ // SUM(DISTINCT ((FullTimeEmployee)manager).salary)
new QueryElementHolder(
/*UNIQUE*/ null,
- /*RESULT*/ "SUM(DISTINCT manager.salary)",
+ /*RESULT*/ "SUM(DISTINCT ((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
/*FROM*/ FullTimeEmployee.class,
/*EXCLUDE*/ null,
@@ -293,10 +293,10 @@ public class AggregateResult extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
- // MIN(manager.salary)
+ // MIN(((FullTimeEmployee)manager).salary)
new QueryElementHolder(
/*UNIQUE*/ null,
- /*RESULT*/ "MIN(manager.salary)",
+ /*RESULT*/ "MIN(((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
/*FROM*/ FullTimeEmployee.class,
/*EXCLUDE*/ null,
@@ -373,10 +373,10 @@ public class AggregateResult extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
- // MAX(manager.salary)
+ // MAX(((FullTimeEmployee)manager).salary)
new QueryElementHolder(
/*UNIQUE*/ null,
- /*RESULT*/ "MAX(manager.salary)",
+ /*RESULT*/ "MAX(((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
/*FROM*/ FullTimeEmployee.class,
/*EXCLUDE*/ null,
@@ -453,10 +453,10 @@ public class AggregateResult extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
- // AVG(manager.salary)
+ // AVG(((FullTimeEmployee)manager).salary)
new QueryElementHolder(
/*UNIQUE*/ null,
- /*RESULT*/ "AVG(manager.salary)",
+ /*RESULT*/ "AVG(((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
/*FROM*/ FullTimeEmployee.class,
/*EXCLUDE*/ null,
@@ -469,10 +469,10 @@ public class AggregateResult extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
- // AVG(DISTINCT manager.salary)
+ // AVG(DISTINCT ((FullTimeEmployee)manager).salary)
new QueryElementHolder(
/*UNIQUE*/ null,
- /*RESULT*/ "AVG(DISTINCT manager.salary)",
+ /*RESULT*/ "AVG(DISTINCT ((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
/*FROM*/ FullTimeEmployee.class,
/*EXCLUDE*/ null,
@@ -532,9 +532,9 @@ public class AggregateResult extends QueryTest {
(new BigDecimal("50000.00")).add(new BigDecimal("2000.99")),
// SUM(budget)
null,
- // SUM(manager.salary)
+ // SUM(((FullTimeEmployee)manager).salary)
new Double(20000),
- // SUM(DISTINCT manager.salary)
+ // SUM(DISTINCT ((FullTimeEmployee)manager).salary)
new Double(10000),
// MIN(long)
new Long(1),
@@ -544,7 +544,7 @@ public class AggregateResult extends QueryTest {
new BigDecimal("2000.99"),
// MIN(budget)
null,
- // MIN(manager.salary)
+ // MIN(((FullTimeEmployee)manager).salary)
new Double(10000),
// MAX(long)
new Long(5),
@@ -554,7 +554,7 @@ public class AggregateResult extends QueryTest {
new BigDecimal("2500000.99"),
// MAX(budget)
null,
- // MAX(manager.salary)
+ // MAX(((FullTimeEmployee)manager).salary)
new Double(10000),
// AVG(long)
new Long(3),
@@ -564,9 +564,9 @@ public class AggregateResult extends QueryTest {
new BigDecimal("99.999"),
// AVG(lifetimeOrthoBenefit)
null,
- // AVG(manager.salary)
+ // AVG(((FullTimeEmployee)manager).salary)
new Double(10000),
- // AVG(DISTINCT manager.salary)
+ // AVG(DISTINCT ((FullTimeEmployee)manager).salary)
new Double(10000)
};