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

[jifty-commit at lists.jifty.org]

Author: autrijus
Date: Wed Mar  8 15:02:10 2006
New Revision: 682

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

Log:
* Jifty::DBI::Collection - minor doc ceanup, change join() to CORE::join().
* When both "function" and "order" are present in _order_clause generation,
  separate them whitespace lest we get bogus SQL.

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	Wed Mar  8 15:02:10 2006
@@ -532,13 +532,13 @@
 creating a C<Jifty::DBI::Collection> object to create an 'anonymous'
 collection class.
 
-If you haven't specified a record class, this eturns a best guess at
+If you haven't specified a record class, this returns a best guess at
 the name of the record class for this collection.
 
 It uses a simple heuristic to determine the record class name -- It
 chops "Collection" off its own name. If you want to name your records
 and collections differently, go right ahead, but don't say we didn't
-warn you
+warn you.
 
 =cut
 
@@ -861,7 +861,7 @@
         push @subclauses, $self->{'subclauses'}{"$subclause"};
     }
 
-    $where_clause = " WHERE " . join( ' AND ', @subclauses ) if (@subclauses);
+    $where_clause = " WHERE " . CORE::join( ' AND ', @subclauses ) if (@subclauses);
 
     return ($where_clause);
 
@@ -969,7 +969,7 @@
 
         if ( $rowhash{'function'} ) {
             $clause .= ( $clause ? ", " : " " );
-            $clause .= $rowhash{'function'};
+            $clause .= $rowhash{'function'} . ' ';
             $clause .= $rowhash{'order'};
 
         } elsif ( ( $rowhash{'alias'} )