[Jifty-commit] r1334 - in Jifty-DBI/trunk: . lib/Jifty/DBI

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Wed Jun 21 13:28:05 2006
New Revision: 1334

Modified:
   Jifty-DBI/trunk/   (props changed)
   Jifty-DBI/trunk/lib/Jifty/DBI/Handle.pm
   Jifty-DBI/trunk/lib/Jifty/DBI/Handle/Pg.pm

Log:
 r14154 at zoq-fot-pik:  chmrr | 2006-06-21 13:28:01 -0400
  * Better fix than using lc, so it works with non-ASCII


Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Handle.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Handle.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Handle.pm	Wed Jun 21 13:28:05 2006
@@ -605,9 +605,9 @@
 
     if ( $value !~ /^\d+$/ ) {    # don't downcase integer values
         $column = "lower($column)";
-        $value  = lc($value);
+        $value  = "lower($value)";
     }
-    return ( $column, $operator, $value, undef );
+    return ( $column, $operator, $value );
 }
 
 =head2 begin_transaction

Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Handle/Pg.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Handle/Pg.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Handle/Pg.pm	Wed Jun 21 13:28:05 2006
@@ -180,7 +180,7 @@
         $operator =~ s/LIKE/ILIKE/ig;
         return ( $column, $operator, $value );
     } elsif ( $operator =~ /=/ ) {
-        return ( "LOWER($column)", $operator, lc $value, "LOWER(?)" );
+        return ( "LOWER($column)", $operator, "LOWER($value)" );
     } else {
         $self->SUPER::_make_clause_case_insensitive( $column, $operator,
             $value );