[exo-jcr-commits] exo-jcr SVN: r2331 - core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2010-04-26 11:03:58 -0400 (Mon, 26 Apr 2010)
New Revision: 2331

Modified:
   core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ObjectQuery.java
Log:
EXOJCR-700: fix problem in user search with MySql and PostgresDB

Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ObjectQuery.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ObjectQuery.java	2010-04-23 13:18:54 UTC (rev 2330)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ObjectQuery.java	2010-04-26 15:03:58 UTC (rev 2331)
@@ -151,7 +151,14 @@
             Parameter p = parameters_.get(i);
             if (p.value_ instanceof String)
             {
-               b.append(" o.").append(p.field_).append(p.op_).append("'").append(p.value_).append("'");
+               if (p.field_.startsWith("UPPER") || p.field_.startsWith("LOWER"))
+               {
+                  b.append(p.field_).append(p.op_).append("'").append(p.value_).append("'");
+               }
+               else
+               {
+                  b.append(" o.").append(p.field_).append(p.op_).append("'").append(p.value_).append("'");
+               }
             }
             else if (p.value_ instanceof Date)
             {
@@ -251,7 +258,14 @@
             Parameter p = parameters_.get(i);
             if (p.value_ instanceof String)
             {
-               b.append(" o.").append(p.field_).append(p.op_).append("'").append(p.value_).append("'");
+               if (p.field_.startsWith("UPPER") || p.field_.startsWith("LOWER"))
+               {
+                  b.append(p.field_).append(p.op_).append("'").append(p.value_).append("'");
+               }
+               else
+               {
+                  b.append(" o.").append(p.field_).append(p.op_).append("'").append(p.value_).append("'");
+               }
             }
             else if (p.value_ instanceof Date)
             {