[Rt-commit] r4342 - in Jifty-DBI/trunk: . inc/Module inc/Module/Install lib/Jifty/DBI

jesse at bestpractical.com jesse at bestpractical.com
Thu Dec 22 16:40:45 EST 2005 

Author: jesse
Date: Thu Dec 22 16:40:44 2005
New Revision: 4342

Modified:
   Jifty-DBI/trunk/   (props changed)
   Jifty-DBI/trunk/META.yml
   Jifty-DBI/trunk/inc/Module/AutoInstall.pm
   Jifty-DBI/trunk/inc/Module/Install.pm
   Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm
   Jifty-DBI/trunk/inc/Module/Install/Base.pm
   Jifty-DBI/trunk/inc/Module/Install/Can.pm
   Jifty-DBI/trunk/inc/Module/Install/Fetch.pm
   Jifty-DBI/trunk/inc/Module/Install/Include.pm
   Jifty-DBI/trunk/inc/Module/Install/Makefile.pm
   Jifty-DBI/trunk/inc/Module/Install/Metadata.pm
   Jifty-DBI/trunk/inc/Module/Install/Win32.pm
   Jifty-DBI/trunk/inc/Module/Install/WriteAll.pm
   Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
Log:
 r20953 at truegrounds:  jesse | 2005-12-22 16:39:31 -0500
  * better collection resetting


Modified: Jifty-DBI/trunk/META.yml
==============================================================================
--- Jifty-DBI/trunk/META.yml	(original)
+++ Jifty-DBI/trunk/META.yml	Thu Dec 22 16:40:44 2005
@@ -21,4 +21,4 @@
 no_index:
   directory:
     - inc
-generated_by: Module::Install version 0.45
+generated_by: Module::Install version 0.46

Modified: Jifty-DBI/trunk/inc/Module/AutoInstall.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/AutoInstall.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/AutoInstall.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/AutoInstall.pm"
+#line 1 "inc/Module/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/AutoInstall.pm"
 package Module::AutoInstall;
 $Module::AutoInstall::VERSION = '1.00';
 

Modified: Jifty-DBI/trunk/inc/Module/Install.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install.pm	Thu Dec 22 16:40:44 2005
@@ -1,8 +1,8 @@
-#line 1 "/home/chmrr/work/rt/local/Jifty-DBI/inc/Module/Install.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install.pm"
+#line 1 "/home/jesse/svk/Jifty-DBI/inc/Module/Install.pm - /usr/local/share/perl/5.8.7/Module/Install.pm"
 package Module::Install;
 use 5.004;
 
-$VERSION = '0.45';
+$VERSION = '0.46';
 
 die << "." unless $INC{join('/', inc => split(/::/, __PACKAGE__)).'.pm'};
 Please invoke ${\__PACKAGE__} with:

Modified: Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/AutoInstall.pm"
+#line 1 "inc/Module/Install/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/Install/AutoInstall.pm"
 package Module::Install::AutoInstall;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

Modified: Jifty-DBI/trunk/inc/Module/Install/Base.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Base.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install/Base.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Base.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Base.pm"
+#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.7/Module/Install/Base.pm"
 package Module::Install::Base;
 
 # Suspend handler for "redefined" warnings

Modified: Jifty-DBI/trunk/inc/Module/Install/Can.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Can.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install/Can.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Can.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Can.pm"
+#line 1 "inc/Module/Install/Can.pm - /usr/local/share/perl/5.8.7/Module/Install/Can.pm"
 package Module::Install::Can;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 $VERSION = '0.01';

Modified: Jifty-DBI/trunk/inc/Module/Install/Fetch.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Fetch.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install/Fetch.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Fetch.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Fetch.pm"
+#line 1 "inc/Module/Install/Fetch.pm - /usr/local/share/perl/5.8.7/Module/Install/Fetch.pm"
 package Module::Install::Fetch;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

Modified: Jifty-DBI/trunk/inc/Module/Install/Include.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Include.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install/Include.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Include.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Include.pm"
+#line 1 "inc/Module/Install/Include.pm - /usr/local/share/perl/5.8.7/Module/Install/Include.pm"
 package Module::Install::Include;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

Modified: Jifty-DBI/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Makefile.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install/Makefile.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Makefile.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Makefile.pm"
+#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.7/Module/Install/Makefile.pm"
 package Module::Install::Makefile;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 
@@ -62,10 +62,7 @@
     $args->{VERSION} = $self->version || $self->determine_VERSION($args);
     $args->{NAME} =~ s/-/::/g;
 
-    # Only call $self->tests if we haven't been given explicit
-    # tests from makemaker_args.
-    $args->{test} ||= {TESTS => $self->tests};
-
+    $args->{test} = {TESTS => $self->tests} if $self->tests;
 
     if ($] >= 5.005) {
 	$args->{ABSTRACT} = $self->abstract;
@@ -157,4 +154,4 @@
 
 __END__
 
-#line 290
+#line 287

Modified: Jifty-DBI/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Metadata.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install/Metadata.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Metadata.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Metadata.pm"
+#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/perl/5.8.7/Module/Install/Metadata.pm"
 package Module::Install::Metadata;
 use Module::Install::Base;
 @ISA = qw(Module::Install::Base);

Modified: Jifty-DBI/trunk/inc/Module/Install/Win32.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Win32.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install/Win32.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Win32.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Win32.pm"
+#line 1 "inc/Module/Install/Win32.pm - /usr/local/share/perl/5.8.7/Module/Install/Win32.pm"
 package Module::Install::Win32;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

Modified: Jifty-DBI/trunk/inc/Module/Install/WriteAll.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/WriteAll.pm	(original)
+++ Jifty-DBI/trunk/inc/Module/Install/WriteAll.pm	Thu Dec 22 16:40:44 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/WriteAll.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/WriteAll.pm"
+#line 1 "inc/Module/Install/WriteAll.pm - /usr/local/share/perl/5.8.7/Module/Install/WriteAll.pm"
 package Module::Install::WriteAll;
 use Module::Install::Base; @ISA = qw(Module::Install::Base);
 

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	Thu Dec 22 16:40:44 2005
@@ -566,7 +566,8 @@
 sub redo_search {
     my $self = shift;
     $self->{'must_redo_search'} = 1;
-    delete $self->{'raw_rows'};
+    delete $self->{$_} for qw(items raw_rows count_all);
+    $self->{'itemscount'} = 0;
 }
 
 =head2 unlimit
@@ -1514,11 +1515,7 @@
     my $obj = bless {}, ref($self);
     %$obj = %$self;
 
-    delete $obj->{$_} for qw(
-        items
-    );
-    $obj->{'must_redo_search'} = 1;
-    $obj->{'itemscount'}       = 0;
+    $obj->redo_search(); # clean out the object of data
     
     $obj->{$_} = Clone::clone($obj->{$_}) for ( $self->_cloned_attributes );
     return $obj;

More information about the Rt-commit mailing list