You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/07/23 15:21:02 UTC

cayenne git commit: CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()

Repository: cayenne
Updated Branches:
  refs/heads/STABLE-4.0 ac446f9ac -> fed071c16


CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/fed071c1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/fed071c1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/fed071c1

Branch: refs/heads/STABLE-4.0
Commit: fed071c16ec3ed907112ce9e556b5ca66fd4f11b
Parents: ac446f9
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Jul 23 18:20:49 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Jul 23 18:20:49 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                               |  3 +-
 .../dba/oracle/OracleQualifierTranslator.java   |  3 +-
 .../org/apache/cayenne/query/SelectQueryIT.java | 31 ++++++++++++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/fed071c1/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index f7d400d..a8faffd 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -12,8 +12,6 @@ Release: 4.0.RC2
 Date:
 ----------------------------------
 
-Changes/New Features:
-
 Bug Fixes:
 
 CAY-2418 Modeler: unable to edit entity selected via Search
@@ -23,6 +21,7 @@ CAY-2435 cdbimport: procedure parameters are not imported
 CAY-2436 NPE in CayenneRuntimeException constructor
 CAY-2442 Broken EventBridge providers implementations
 CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
+CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
 
 ----------------------------------
 Release: 4.0.RC1

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fed071c1/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java
index fadd468..53791a5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleQualifierTranslator.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.exp.parser.ASTFunctionCall;
 import org.apache.cayenne.exp.parser.ASTIn;
 import org.apache.cayenne.exp.parser.ASTList;
 import org.apache.cayenne.exp.parser.ASTNegate;
+import org.apache.cayenne.exp.parser.ASTNot;
 import org.apache.cayenne.exp.parser.ASTNotIn;
 import org.apache.cayenne.exp.parser.ASTPath;
 import org.apache.cayenne.exp.parser.Node;
@@ -65,7 +66,7 @@ public class OracleQualifierTranslator extends TrimmingQualifierTranslator {
 
 			Expression trimmed = trimmedInExpression((ASTPath) exp.getOperand(0), objects, maxInSize);
 			if (exp instanceof ASTNotIn) {
-				return new ASTNegate(trimmed);
+				return new ASTNot((Node)trimmed);
 			}
 			return trimmed;
 		}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fed071c1/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
index 6108934..cbb58ca 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
@@ -835,18 +835,37 @@ public class SelectQueryIT extends ServerCase {
 	 * Tests INs with more than 1000 elements
 	 */
 	@Test
-	public void testSelectLongIn() {
-		// not all adapters strip INs, so we just make sure query with such
-		// qualifier
-		// fires OK
+	public void testSelectLongIn() throws Exception {
+		createArtistsDataSet();
+
+		// not all adapters strip INs, so we just make sure query with such qualifier fires OK
 		Object[] numbers = new String[2009];
 		for (int i = 0; i < numbers.length; i++) {
-			numbers[i] = "" + i;
+			numbers[i] = "artist" + i;
 		}
 
 		SelectQuery<Artist> query = new SelectQuery<>(Artist.class,
 				ExpressionFactory.inExp("artistName", numbers));
-		context.performQuery(query);
+		List<Artist> artists = query.select(context);
+		assertEquals(20, artists.size());
+	}
+
+	/**
+	 * Tests NOT INs with more than 1000 elements
+	 */
+	@Test
+	public void testSelectLongNotIn() throws Exception {
+        createArtistsDataSet();
+
+		Object[] numbers = new String[1001];
+		for (int i = 0; i < numbers.length; i++) {
+			numbers[i] = "artist" + i;
+		}
+
+		SelectQuery<Artist> query = new SelectQuery<>(Artist.class,
+				ExpressionFactory.notInExp("artistName", numbers));
+		List<Artist> artists = query.select(context);
+		assertEquals(0, artists.size());
 	}
 
 	@Test