You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ab...@apache.org on 2019/05/10 09:04:53 UTC

[cayenne] branch master updated: CAY-2577 Between property with extended type failure

This is an automated email from the ASF dual-hosted git repository.

abulatski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 6926928  CAY-2577 Between property with extended type failure
6926928 is described below

commit 69269284c99066c3b38202aa5d9bac18279a8928
Author: Arseni Bulatski <an...@gmail.com>
AuthorDate: Fri May 10 12:04:03 2019 +0300

    CAY-2577 Between property with extended type failure
---
 RELEASE-NOTES.txt                                                      | 1 +
 .../apache/cayenne/access/translator/select/QualifierTranslator.java   | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index aee19d7..8877fce 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -54,6 +54,7 @@ CAY-2572 Queries are not sorted by name in data map XML
 CAY-2573 DI field injection is triggered when creating sql Driver
 CAY-2575 Select translator: Wrong translation of IN Expression
 CAY-2576 Ant cgen task is broken
+CAY-2577 Between property with extended type failure
 
 ----------------------------------
 Release: 4.1.B1
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
index 206996b..7adb459 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
@@ -345,8 +345,7 @@ class QualifierTranslator implements TraversalHandler {
     }
 
     protected DbAttribute findDbAttribute(Expression node) {
-        int len = node.getOperandCount();
-        if (len != 2) {
+        if(node.getType() == Expression.LIST) {
             if (node instanceof SimpleNode) {
                 Expression parent = (Expression) ((SimpleNode) node).jjtGetParent();
                 if (parent != null) {