[exo-jcr-commits] exo-jcr SVN: r2051 - in core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization: jdbc and 1 other directory.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2010-03-11 04:32:07 -0500 (Thu, 11 Mar 2010)
New Revision: 2051

Modified:
   core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java
   core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java
Log:
EXOJCR-584: not case-sensitive user's search

Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java	2010-03-10 15:39:06 UTC (rev 2050)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java	2010-03-11 09:32:07 UTC (rev 2051)
@@ -178,9 +178,18 @@
    public ListAccess<User> findUsersByQuery(Query q) throws Exception
    {
       ObjectQuery oq = new ObjectQuery(UserImpl.class);
-      oq.addLIKE("userName", q.getUserName());
-      oq.addLIKE("firstName", q.getFirstName());
-      oq.addLIKE("lastName", q.getLastName());
+      if (q.getUserName() != null)
+      {
+         oq.addLIKE("UPPER(userName)", q.getUserName().toUpperCase());
+      }
+      if (q.getFirstName() != null)
+      {
+         oq.addLIKE("UPPER(firstName)", q.getFirstName().toUpperCase());
+      }
+      if (q.getLastName() != null)
+      {
+         oq.addLIKE("UPPER(lastName)", q.getLastName().toUpperCase());
+      }
       oq.addLIKE("email", q.getEmail());
       oq.addGT("lastLoginTime", q.getFromLoginDate());
       oq.addLT("lastLoginTime", q.getToLoginDate());

Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java	2010-03-10 15:39:06 UTC (rev 2050)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java	2010-03-11 09:32:07 UTC (rev 2051)
@@ -110,9 +110,18 @@
    public ListAccess<User> findUsersByQuery(Query orgQuery) throws Exception
    {
       DBObjectQuery dbQuery = new DBObjectQuery<UserImpl>(UserImpl.class);
-      dbQuery.addLIKE("USER_NAME", orgQuery.getUserName());
-      dbQuery.addLIKE("FIRST_NAME", orgQuery.getFirstName());
-      dbQuery.addLIKE("LAST_NAME", orgQuery.getLastName());
+      if (orgQuery.getUserName() != null)
+      {
+         dbQuery.addLIKE("UPPER(USER_NAME)", orgQuery.getUserName().toUpperCase());
+      }
+      if (orgQuery.getFirstName() != null)
+      {
+         dbQuery.addLIKE("UPPER(FIRST_NAME)", orgQuery.getFirstName().toUpperCase());
+      }
+      if (orgQuery.getLastName() != null)
+      {
+         dbQuery.addLIKE("UPPER(LAST_NAME)", orgQuery.getLastName().toUpperCase());
+      }
       dbQuery.addLIKE("EMAIL", orgQuery.getEmail());
       dbQuery.addGT("LAST_LOGIN_TIME", orgQuery.getFromLoginDate());
       dbQuery.addLT("LAST_LOGIN_TIME", orgQuery.getToLoginDate());