[Jifty-commit] r5867 - in Jifty-DBI/trunk: lib/Jifty/DBI
Jifty commits
jifty-commit at lists.jifty.org
Fri Sep 19 18:59:59 EDT 2008
Author: ruz
Date: Fri Sep 19 18:59:58 2008
New Revision: 5867
Modified:
Jifty-DBI/trunk/ (props changed)
Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
Log:
r5886 at cubic-pc: cubic | 2008-09-19 04:49:19 +0400
* delay some calls and don't rewrite results of previouse calls
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 Fri Sep 19 18:59:58 2008
@@ -1305,17 +1305,21 @@
# If it's a new value or we're overwriting this sort of restriction,
- my $case_sensitive = $column_obj ? $column_obj->case_sensitive : 0;
- $case_sensitive = $args{'case_sensitive'}
- if defined $args{'case_sensitive'};
- if ( $self->_handle->case_sensitive
- && defined $args{'value'}
- && $args{'quote_value'}
- && !$case_sensitive )
- {
+ if ( defined $args{'value'} && $args{'quote_value'} ) {
+ my $case_sensitive = 0;
+ if ( defined $args{'case_sensitive'} ) {
+ $case_sensitive = $args{'case_sensitive'};
+ }
+ elsif ( $column_obj ) {
+ $case_sensitive = $column_obj->case_sensitive;
+ }
+ # don't worry about case for numeric columns_in_db
+ # only be case insensitive when we KNOW it's a text
+ if ( $column_obj && !$case_sensitive && !$column_obj->is_string ) {
+ $case_sensitive = 1;
+ }
-# don't worry about case for numeric columns_in_db - only be case insensitive when we KNOW it's a blob
- if ( defined $column_obj ? $column_obj->is_string : 0 ) {
+ if ( !$case_sensitive && $self->_handle->case_sensitive ) {
( $qualified_column, $args{'operator'}, $args{'value'} )
= $self->_handle->_make_clause_case_insensitive(
$qualified_column, $args{'operator'}, $args{'value'} );
More information about the Jifty-commit
mailing list