svn commit: r378891 - /db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java

[tfischer]

Author: tfischer
Date: Sun Feb 19 05:20:46 2006
New Revision: 378891

URL: http://svn.apache.org/viewcvs?rev=378891&view=rev
Log:
IgnoreCase in PsSelects now also takes into account Criterion's setIgnoreCase()
Fixes TRQS345+TRQS346.
Thanks to Robert Dietrick for reporting the error and an early version of the 
patch.

Modified:
    db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
URL: 
http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java?rev=378891&r1=378890&r2=378891&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java 
(original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java Sun 
Feb 19 05:20:46 2006
@@ -3430,7 +3430,7 @@
                             .toString();
                 }
                 SqlExpression.build(field, value, comparison,
-                        ignoreStringCase, getDb(), sb);
+                        ignoreStringCase || ignoreCase, getDb(), sb);
             }
 
             for (int i = 0; i < this.clauses.size(); i++)
@@ -3503,7 +3503,7 @@
                         Object item = Array.get(value, i);
 
                         inClause.add(SqlExpression.processInValue(item,
-                                             ignoreCase,
+                                             ignoreStringCase || ignoreCase,
                                              db));
                     }
 
@@ -3514,7 +3514,7 @@
                 }
                 else
                 {
-                    if (ignoreCase)
+                    if (ignoreStringCase || ignoreCase)
                     {
                         sb.append(db.ignoreCase(field))
                                 .append(comparison)



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]