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

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Mon Nov 20 11:01:13 2006
New Revision: 2183

Modified:
   Jifty-DBI/trunk/   (props changed)
   Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
   Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm
   Jifty-DBI/trunk/t/12prefetch.t

Log:
 r45211 at pinglin:  jesse | 2006-11-20 11:01:03 -0500
 * A better attempt at prefetch (The last commit passed tests locally because M::I cached the old copy of the libs)


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	Mon Nov 20 11:01:13 2006
@@ -197,7 +197,7 @@
     my $data = {};
     my $column_map = {};
     foreach my $column (@names) {
-        if ($column =~ /^(.*?)\_(.*)$/) {
+        if ($column =~ /^((\w+)_?(?:\d*))_(.*?)$/) {
             $column_map->{$1}->{$2} =$column;
         }
     }

Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm	Mon Nov 20 11:01:13 2006
@@ -325,11 +325,9 @@
     return unless UNIVERSAL::isa( $classname, 'Jifty::DBI::Collection' );
 
     if ( my $prefetched_col = $self->_prefetched_collection($method_name)) {
-        warn "We have a preetch for $method_name";
         return $prefetched_col;
     }
 
-    warn "no prefetch";
     my $coll = $classname->new( handle => $self->_handle );
     $coll->limit( column => $column->by(), value => $self->id );
     return $coll;
@@ -339,10 +337,8 @@
     my $self =shift;
     my $column_name = shift;
     if (@_) {
-        warn "Setting up a prefetch collection for $column_name";
         $self->{'_prefetched_collections'}->{$column_name} = shift;
     } else {
-        warn "We'll load a prefetch collection for $column_name";
         return $self->{'_prefetched_collections'}->{$column_name};
     }
 

Modified: Jifty-DBI/trunk/t/12prefetch.t
==============================================================================
--- Jifty-DBI/trunk/t/12prefetch.t	(original)
+++ Jifty-DBI/trunk/t/12prefetch.t	Mon Nov 20 11:01:13 2006
@@ -106,7 +106,7 @@
 
         is (scalar @statements, 1, "all that. just one sql statement");
 
-#        cleanup_schema( 'TestApp', $handle );
+        cleanup_schema( 'TestApp', $handle );
         disconnect_handle( $handle );
 }} # SKIP, foreach blocks