[Jifty-commit] r3485 - Jifty-DBI/trunk/lib/Jifty/DBI

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Thu Jun 14 15:10:18 EDT 2007


Author: ruz
Date: Thu Jun 14 15:10:15 2007
New Revision: 3485

Modified:
   Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm

Log:
* allow to use STARTSWITH, ENDSWITH and MATCHES operators
  with NOT prefix

Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm	Thu Jun 14 15:10:15 2007
@@ -946,18 +946,14 @@
     if ( $args{'column'} ) {
 
         #If it's a like, we supply the %s around the search term
-        if ( $args{'operator'} =~ /LIKE/i ) {
-            $args{'value'} = $args{'value'};
-        } elsif ( $args{'operator'} =~ /MATCHES/i ) {
+        if ( $args{'operator'} =~ /MATCHES/i ) {
             $args{'value'}    = "%" . $args{'value'} . "%";
-            $args{'operator'} = "LIKE";
         } elsif ( $args{'operator'} =~ /STARTSWITH/i ) {
             $args{'value'}    = $args{'value'} . "%";
-            $args{'operator'} = "LIKE";
         } elsif ( $args{'operator'} =~ /ENDSWITH/i ) {
             $args{'value'}    = "%" . $args{'value'};
-            $args{'operator'} = "LIKE";
         }
+        $args{'operator'} =~ s/(?:MATCHES|ENDSWITH|STARTSWITH)/LIKE/i;
 
         #if we're explicitly told not to to quote the value or
         # we're doing an IS or IS NOT (null), don't quote the operator.


More information about the Jifty-commit mailing list