From jdo-commits-return-3430-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Sat Aug 12 18:12:00 2017 Return-Path: X-Original-To: apmail-db-jdo-commits-archive@www.apache.org Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2FE91AED1 for ; Sat, 12 Aug 2017 18:11:59 +0000 (UTC) Received: (qmail 86002 invoked by uid 500); 12 Aug 2017 18:11:59 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 85993 invoked by uid 99); 12 Aug 2017 18:11:59 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Aug 2017 18:11:59 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 44C553A002C for ; Sat, 12 Aug 2017 18:11:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1804869 - in /db/jdo/trunk: specification/OOO/ tck/src/java/org/apache/jdo/tck/query/api/ tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ Date: Sat, 12 Aug 2017 18:11:59 -0000 To: jdo-commits@db.apache.org From: mbo@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170812181159.44C553A002C@svn01-us-west.apache.org> Author: mbo Date: Sat Aug 12 18:11:58 2017 New Revision: 1804869 URL: http://svn.apache.org/viewvc?rev=1804869&view=rev Log: JDO-761: named queries using CDATA syntax Modified: db/jdo/trunk/specification/OOO/Ch14-Query.odt db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/api/SampleQueries.java db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo Modified: db/jdo/trunk/specification/OOO/Ch14-Query.odt URL: http://svn.apache.org/viewvc/db/jdo/trunk/specification/OOO/Ch14-Query.odt?rev=1804869&r1=1804868&r2=1804869&view=diff ============================================================================== Binary files - no diff available. Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/api/SampleQueries.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/api/SampleQueries.java?rev=1804869&r1=1804868&r2=1804869&view=diff ============================================================================== --- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/api/SampleQueries.java (original) +++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/api/SampleQueries.java Sat Aug 12 18:11:58 2017 @@ -1093,7 +1093,7 @@ public class SampleQueries extends Query "select new org.apache.jdo.tck.query.api.SampleQueries$Info (firstname, salary, manager) " + "from org.apache.jdo.tck.pc.company.FullTimeEmployee " + "where department.name == :deptName"; - Query q = pm.newNamedQuery(FullTimeEmployee.class, "construct"); + Query q = pm.newNamedQuery(FullTimeEmployee.class, "constructor"); q.setParameters("R&D"); List infos = q.executeResultList(Info.class); @@ -1447,7 +1447,7 @@ public class SampleQueries extends Query "select avg(salary), sum(salary), department.name " + "from org.apache.jdo.tck.pc.company.FullTimeEmployee " + "group by department.name having count(department.name) > 1"; - Query q = pm.newNamedQuery(FullTimeEmployee.class, "group"); + Query q = pm.newNamedQuery(FullTimeEmployee.class, "grouping"); List results = q.executeResultList(Object[].class); if (results.size() != 1) { fail(ASSERTION_FAILED, @@ -2114,7 +2114,7 @@ public class SampleQueries extends Query "select e.firstname from org.apache.jdo.tck.pc.company.Department " + "where name.startsWith('R&D') && employees.contains(e) " + "variables org.apache.jdo.tck.pc.company.Employee e"; - Query q = pm.newNamedQuery(Department.class, "variables"); + Query q = pm.newNamedQuery(Department.class, "projectingVariables"); List names = q.executeResultList(String.class); List expected = Arrays.asList("Michael", "Craig", "Joe"); checkQueryResultWithoutOrder(ASSERTION_FAILED, singleStringQuery, names, expected); Modified: db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=1804869&r1=1804868&r2=1804869&view=diff ============================================================================== --- db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo (original) +++ db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo Sat Aug 12 18:11:58 2017 @@ -62,10 +62,12 @@ has application identity. - - select e.firstname - where name.startsWith('R&D') && employees.contains(e) - variables org.apache.jdo.tck.pc.company.Employee e + + @@ -89,13 +91,17 @@ has application identity. - - select new org.apache.jdo.tck.query.api.SampleQueries$Info (firstname, salary, manager) - where department.name == :deptName + + - - select avg(salary), sum(salary), department.name - group by department.name having count(department.name) > 1 + + 1 + ]]> Modified: db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=1804869&r1=1804868&r2=1804869&view=diff ============================================================================== --- db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo (original) +++ db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo Sat Aug 12 18:11:58 2017 @@ -52,10 +52,12 @@ has datastore identity. - - select e.firstname - where name.startsWith('R&D') && employees.contains(e) - variables org.apache.jdo.tck.pc.company.Employee e + + @@ -75,13 +77,17 @@ has datastore identity. - - select new org.apache.jdo.tck.query.api.SampleQueries$Info (firstname, salary, manager) - where department.name == :deptName + + - - select avg(salary), sum(salary), department.name - group by department.name having count(department.name) > 1 + + 1 + ]]>