diff options
| author | ivan <ivan> | 2002-10-13 01:14:36 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2002-10-13 01:14:36 +0000 |
| commit | 1b85e1fc96951d6b8ba914907e9bfef673da9e16 (patch) | |
| tree | b6f7295bc6fc7194905c5937c979f17630f044ff | |
| parent | f81975da5262aba563cf4e61fc1b0c7815307d3b (diff) | |
change ILIKE into LOWER() for compatibility with non-Pg and Pg before 7.1
| -rw-r--r-- | FS/FS/Record.pm | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm index c247ed2db..0ffd90951 100644 --- a/FS/FS/Record.pm +++ b/FS/FS/Record.pm @@ -210,34 +210,40 @@ sub qsearch { $statement .= ' WHERE '. join(' AND ', map { my $op = '='; + my $column = $_; if ( ref($record->{$_}) ) { $op = $record->{$_}{'op'} if $record->{$_}{'op'}; - $op = 'LIKE' if $op =~ /^ILIKE$/i && driver_name !~ /^Pg$/i; + #$op = 'LIKE' if $op =~ /^ILIKE$/i && driver_name !~ /^Pg$/i; + if ( uc($op) eq 'ILIKE' ) { + $op = 'LIKE'; + $record->{$_}{'value'} = lc($record->{$_}{'value'}); + $column = "LOWER($_)"; + } $record->{$_} = $record->{$_}{'value'} } if ( ! defined( $record->{$_} ) || $record->{$_} eq '' ) { if ( $op eq '=' ) { if ( driver_name =~ /^Pg$/i ) { - qq-( $_ IS NULL OR $_ = '' )-; + qq-( $column IS NULL OR $column = '' )-; } else { - qq-( $_ IS NULL OR $_ = "" )-; + qq-( $column IS NULL OR $column = "" )-; } } elsif ( $op eq '!=' ) { if ( driver_name =~ /^Pg$/i ) { - qq-( $_ IS NOT NULL AND $_ != '' )-; + qq-( $column IS NOT NULL AND $column != '' )-; } else { - qq-( $_ IS NOT NULL AND $_ != "" )-; + qq-( $column IS NOT NULL AND $column != "" )-; } } else { if ( driver_name =~ /^Pg$/i ) { - qq-( $_ $op '' )-; + qq-( $column $op '' )-; } else { - qq-( $_ $op "" )-; + qq-( $column $op "" )-; } } } else { - "$_ $op ?"; + "$column $op ?"; } } @fields ); } |