[SYNCOPE-1855] Rewriting JPAAnySearchDAO to reduce subqueries (#957)

apache · Jan 23, 2025 · 1b4edb7 · 1b4edb7
1 parent d2760f4
commit 1b4edb7
Show file tree

Hide file tree

Showing 16 changed files with 1,478 additions and 1,912 deletions.
diff --git a/...on/src/main/java/org/apache/syncope/core/persistence/common/dao/AbstractAnySearchDAO.java b/...on/src/main/java/org/apache/syncope/core/persistence/common/dao/AbstractAnySearchDAO.java
@@ -69,6 +69,8 @@ public abstract class AbstractAnySearchDAO implements AnySearchDAO {
 
     protected static final Logger LOG = LoggerFactory.getLogger(AnySearchDAO.class);
 
+    protected static final String ALWAYS_FALSE_CLAUSE = "1=2";
+
     private static final String[] ORDER_BY_NOT_ALLOWED = {
         "serialVersionUID", "password", "securityQuestion", "securityAnswer", "token", "tokenExpireTime"
     };
@@ -281,6 +283,9 @@ protected Triple<PlainSchema, PlainAttrValue, AnyCond> check(final AnyCond cond,
                 schema.setType(attrSchemaType);
             }
         }
+        if (schema.getType() == null || schema.getType() == AttrSchemaType.Dropdown) {
+            schema.setType(AttrSchemaType.String);
+        }
 
         // Deal with any Integer fields logically mapping to boolean values
         boolean foundBooleanMin = false;

diff --git a/core/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml
@@ -119,6 +119,16 @@ under the License.
       <artifactId>oracle-free</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>