fix: fix OR filters join when sub-filters uses lower (#2850)

Co-authored-by: Yuriy Movchan <Yuriy.Movchan@gmail.com>
JanssenProject · Nov 2, 2022 · 3dc6b32 · 3dc6b32
1 parent 42ec86d
commit 3dc6b32
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/jans-orm/couchbase-sample/pom.xml b/jans-orm/couchbase-sample/pom.xml
@@ -43,6 +43,12 @@
 			<artifactId>slf4j-simple</artifactId>
 		</dependency>
 
+		<!-- Couchbase -->
+		<dependency>
+			<groupId>com.couchbase.client</groupId>
+			<artifactId>java-client</artifactId>
+		</dependency>
+
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>

diff --git a/jans-orm/couchbase/src/main/java/io/jans/orm/couchbase/impl/CouchbaseFilterConverter.java b/jans-orm/couchbase/src/main/java/io/jans/orm/couchbase/impl/CouchbaseFilterConverter.java
@@ -97,16 +97,16 @@ public ConvertedExpression convertToCouchbaseFilter(Filter genericFilter, Map<St
                 	if (!canJoinOrFilters) {
                 		continue;
                 	}
-
-                	if (tmpFilter.getMultiValued() != null) {
-                		canJoinOrFilters = false;
-                    	continue;
-                	}
 
                 	if ((FilterType.EQUALITY != tmpFilter.getType()) || (tmpFilter.getFilters() != null)) {
                     	canJoinOrFilters = false;
                     	continue;
                     }
+
+                	if (tmpFilter.getMultiValued() != null) {
+                		canJoinOrFilters = false;
+                    	continue;
+                	}
 
                     Boolean isMultiValuedDetected = determineMultiValuedByType(tmpFilter.getAttributeName(), propertiesAnnotationsMap);
                 	if (!Boolean.FALSE.equals(isMultiValuedDetected)) {

diff --git a/jans-orm/spanner-sample/pom.xml b/jans-orm/spanner-sample/pom.xml
@@ -43,6 +43,12 @@
 			<artifactId>slf4j-simple</artifactId>
 		</dependency>
 
+		<!-- Cloud Spanner -->
+		<dependency>
+		    <groupId>com.google.cloud</groupId>
+		    <artifactId>google-cloud-spanner</artifactId>
+		</dependency>
+
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>

diff --git a/jans-orm/spanner/src/main/java/io/jans/orm/cloud/spanner/impl/SpannerFilterConverter.java b/jans-orm/spanner/src/main/java/io/jans/orm/cloud/spanner/impl/SpannerFilterConverter.java
@@ -129,16 +129,16 @@ private ConvertedExpression convertToSqlFilterImpl(TableMapping tableMapping, Fi
                 	if (!canJoinOrFilters) {
                 		continue;
                 	}
-
-                	if (tmpFilter.getMultiValued() != null) {
-                		canJoinOrFilters = false;
-                    	continue;
-                	}
 
                 	if ((FilterType.EQUALITY != tmpFilter.getType()) || (tmpFilter.getFilters() != null)) {
                     	canJoinOrFilters = false;
                     	continue;
                     }
+
+                	if (tmpFilter.getMultiValued() != null) {
+                		canJoinOrFilters = false;
+                    	continue;
+                	}
 
                     Boolean isMultiValuedDetected = determineMultiValuedByType(tmpFilter.getAttributeName(), propertiesAnnotationsMap);
                 	if (!Boolean.FALSE.equals(isMultiValuedDetected)) {

diff --git a/jans-orm/sql/src/main/java/io/jans/orm/sql/impl/SqlFilterConverter.java b/jans-orm/sql/src/main/java/io/jans/orm/sql/impl/SqlFilterConverter.java
@@ -123,17 +123,17 @@ private ConvertedExpression convertToSqlFilterImpl(TableMapping tableMapping, Fi
                 	if (!canJoinOrFilters) {
                 		continue;
                 	}
-
-                	if (tmpFilter.getMultiValued() != null) {
-                		canJoinOrFilters = false;
-                    	continue;
-                	}
 
                 	if ((FilterType.EQUALITY != tmpFilter.getType()) || (tmpFilter.getFilters() != null)) {
                     	canJoinOrFilters = false;
                     	continue;
                     }
 
+                	if (tmpFilter.getMultiValued() != null) {
+                		canJoinOrFilters = false;
+                    	continue;
+                	}
+
                     Boolean isMultiValuedDetected = determineMultiValuedByType(tmpFilter.getAttributeName(), propertiesAnnotationsMap);
                 	if (!Boolean.FALSE.equals(isMultiValuedDetected)) {
                 		if (!Boolean.FALSE.equals(currentGenericFilter.getMultiValued())) {