Return-Path: 
 <jdo-commits-return-3233-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
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 BA0C7177B6
	for <apmail-db-jdo-commits-archive@www.apache.org>;
 Sun,  8 Feb 2015 17:57:10 +0000 (UTC)
Received: (qmail 34681 invoked by uid 500); 8 Feb 2015 17:57:10 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 34670 invoked by uid 99); 8 Feb 2015 17:57:10 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Feb 2015 17:57:10 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 72277AC0051
	for <jdo-commits@db.apache.org>; Sun,  8 Feb 2015 17:57:10 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1658228 - in /db/jdo/trunk: copyjdorijars/pom.xml
 tck/src/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
 tck/src/java/org/apache/jdo/tck/query/result/IfElseResult.java
Date: Sun, 08 Feb 2015 17:57:10 -0000
To: jdo-commits@db.apache.org
From: mbo@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150208175710.72277AC0051@hades.apache.org>

Author: mbo
Date: Sun Feb  8 17:57:09 2015
New Revision: 1658228

URL: http://svn.apache.org/r1658228
Log:
JDO-650: upgrade to latest DN; add new test case to IfElseInFilter; updated negative tests

Modified:
    db/jdo/trunk/copyjdorijars/pom.xml
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/IfElseResult.java

Modified: db/jdo/trunk/copyjdorijars/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/copyjdorijars/pom.xml?rev=1658228&r1=1658227&r2=1658228&view=diff
==============================================================================
--- db/jdo/trunk/copyjdorijars/pom.xml (original)
+++ db/jdo/trunk/copyjdorijars/pom.xml Sun Feb  8 17:57:09 2015
@@ -93,22 +93,22 @@
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-core</artifactId>
-      <version>4.0.4</version>
+      <version>4.1.0-m1</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-rdbms</artifactId>
-      <version>4.0.5</version>
+      <version>4.1.0-m1</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-api-jdo</artifactId>
-      <version>4.0.4</version>
+      <version>4.1.0-m1</version>
     </dependency>
     <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-api-jpa</artifactId>
-      <version>4.0.5</version>
+      <version>4.1.0-m1</version>
     </dependency>
     <dependency>
       <groupId>c3p0</groupId>

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java?rev=1658228&r1=1658227&r2=1658228&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java Sun Feb  8 17:57:09 2015
@@ -19,6 +19,7 @@ package org.apache.jdo.tck.query.jdoql;
 
 import org.apache.jdo.tck.JDO_Test;
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
+import org.apache.jdo.tck.pc.company.DentalInsurance;
 import org.apache.jdo.tck.pc.company.Employee;
 import org.apache.jdo.tck.pc.company.FullTimeEmployee;
 import org.apache.jdo.tck.query.QueryElementHolder;
@@ -67,7 +68,21 @@ public class IfElseInFilter extends Quer
         /*INTO*/        null, 
         /*FROM*/        Employee.class,
         /*EXCLUDE*/     null,
-        /*WHERE*/       "(IF (this.manager == null) this.mentor.department ELSE this.manager.department) == this.department",
+        /*WHERE*/       "(IF (this.manager == null) this.mentor.department.deptid ELSE this.manager.department.deptid) == this.department.deptid",
+        /*VARIABLES*/   null,
+        /*PARAMETERS*/  null,
+        /*IMPORTS*/     null,
+        /*GROUP BY*/    null,
+        /*ORDER BY*/    "this.personid",
+        /*FROM*/        null,
+        /*TO*/          null),
+        new QueryElementHolder(
+        /*UNIQUE*/      null,
+        /*RESULT*/      null,
+        /*INTO*/        null, 
+        /*FROM*/        FullTimeEmployee.class,
+        /*EXCLUDE*/     null,
+        /*WHERE*/       "(IF (this.salary < 10001.0) 1 ELSE IF (this.salary < 20001.0) 2 ELSE IF (this.salary < 30001.0) 3 ELSE 4) == 2",
         /*VARIABLES*/   null,
         /*PARAMETERS*/  null,
         /*IMPORTS*/     null,
@@ -87,9 +102,9 @@ public class IfElseInFilter extends Quer
         /*UNIQUE*/      null,
         /*RESULT*/      null,
         /*INTO*/        null, 
-        /*FROM*/        FullTimeEmployee.class,
+        /*FROM*/        Employee.class,
         /*EXCLUDE*/     null,
-        /*WHERE*/       "IF (this.department) 0 ELSE 1",
+        /*WHERE*/       "(IF (this.firstname) 0 ELSE 1) == 0",
         /*VARIABLES*/   null,
         /*PARAMETERS*/  null,
         /*IMPORTS*/     null,
@@ -102,9 +117,9 @@ public class IfElseInFilter extends Quer
         /*UNIQUE*/      null,
         /*RESULT*/      null,
         /*INTO*/        null, 
-        /*FROM*/        FullTimeEmployee.class,
+        /*FROM*/        DentalInsurance.class,
         /*EXCLUDE*/     null,
-        /*WHERE*/       "IF (this.department.name == 'Development') 15000",
+        /*WHERE*/       "(IF (this.employee == null) 15000) == 15000",
         /*VARIABLES*/   null,
         /*PARAMETERS*/  null,
         /*IMPORTS*/     null,
@@ -117,9 +132,9 @@ public class IfElseInFilter extends Quer
         /*UNIQUE*/      null,
         /*RESULT*/      null,
         /*INTO*/        null, 
-        /*FROM*/        Employee.class,
+        /*FROM*/        DentalInsurance.class,
         /*EXCLUDE*/     null,
-        /*WHERE*/       "IF (this.department == null) 'Michael' ELSE this.department",
+        /*WHERE*/       "(IF (this.employee == null) 'Michael' ELSE this.employee) == 'Michael'",
         /*VARIABLES*/   null,
         /*PARAMETERS*/  null,
         /*IMPORTS*/     null,
@@ -134,7 +149,8 @@ public class IfElseInFilter extends Quer
      */
     private Object[] expectedResult = {
         getTransientCompanyModelInstancesAsList(new String[]{"emp1", "emp5"}),
-        getTransientCompanyModelInstancesAsList(new String[]{"emp1", "emp2", "emp3", "emp4", "emp5"})
+        getTransientCompanyModelInstancesAsList(new String[]{"emp1", "emp2", "emp3"}),
+        getTransientCompanyModelInstancesAsList(new String[]{"emp1"})
     };
     
     /**

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/IfElseResult.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/IfElseResult.java?rev=1658228&r1=1658227&r2=1658228&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/IfElseResult.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/IfElseResult.java Sun Feb  8 17:57:09 2015
@@ -101,7 +101,7 @@ public class IfElseResult extends QueryT
         // Invalid type of condition expression 
         new QueryElementHolder(
         /*UNIQUE*/      null,
-        /*RESULT*/      "IF (this.firstName) 0 ELSE 1",
+        /*RESULT*/      "IF (this.firstname) 0 ELSE 1",
         /*INTO*/        null, 
         /*FROM*/        Employee.class,
         /*EXCLUDE*/     null,