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

[jesse at bestpractical.com]

Author: jesse
Date: Sun Nov  6 18:10:20 2005
New Revision: 4037

Modified:
   Jifty-DBI/trunk/   (props changed)
   Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
Log:
 r18415 at truegrounds:  jesse | 2005-11-06 18:00:46 -0500
 * Collection code cleanup (minor)


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	Sun Nov  6 18:10:20 2005
@@ -681,7 +681,7 @@
 
 
 
-    my ( $Clause, $QualifiedField );
+    my ( $Clause, $qualified_field );
 
     #TODO: $args{'value'} should take an array of values and generate
     # the proper where clause.
@@ -690,7 +690,7 @@
     #left join criterion.
 
     if (   ( defined $args{'leftjoin'} )
-        && ( !defined $args{'alias'} ) )
+        && ( not defined $args{'alias'} ) )
     {
         $args{'alias'} = $args{'leftjoin'};
     }
@@ -709,13 +709,9 @@
             $args{'alias'} = 'main';
         }
 
-        # {{{ if we're joining, we need to work out the table alias
-
         else {
             $args{'alias'} = $self->new_alias( $args{'table'} );
         }
-
-        # }}}
     }
 
     # }}}
@@ -723,16 +719,15 @@
     # Set this to the name of the field and the alias, unless we've been
     # handed a subclause name
 
-    $QualifiedField = $args{'alias'} . "." . $args{'column'};
+    $qualified_field = $args{'alias'} . "." . $args{'column'};
 
     if ( $args{'subclause'} ) {
         $Clause = $args{'subclause'};
     } else {
-        $Clause = $QualifiedField;
+        $Clause = $qualified_field;
     }
 
-    print STDERR
-        "$self->_generic_restriction QualifiedField=$QualifiedField\n"
+        warn "$self->_generic_restriction qualified_field=$qualified_field\n"
         if ( $self->DEBUG );
 
     my ($restriction);
@@ -757,14 +752,14 @@
     {
 
         unless ( $args{'case_sensitive'} || !$args{'quote_value'} ) {
-            ( $QualifiedField, $args{'operator'}, $args{'value'} )
+            ( $qualified_field, $args{'operator'}, $args{'value'} )
                 = $self->_handle->_make_clause_case_insensitive(
-                $QualifiedField, $args{'operator'}, $args{'value'} );
+                $qualified_field, $args{'operator'}, $args{'value'} );
         }
 
     }
 
-    my $clause = "($QualifiedField $args{'operator'} $args{'value'})";
+    my $clause = "($qualified_field $args{'operator'} $args{'value'})";
 
     # Juju because this should come _AFTER_ the EA
     my $prefix = "";