From: Matt S Trout <mst@shadowcat.co.uk>
Date: Thu, 23 Nov 2006 21:21:39 +0000 (+0000)
Subject: Merge 'DBIx-Class-current' into 'source-handle'
X-Git-Tag: v0.08010~150^2~112^2~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=362c66db4c21efb954313e957bb6e5f8003ffa36;p=dbsrgits%2FDBIx-Class.git

Merge 'DBIx-Class-current' into 'source-handle'

r34019@cain (orig r2917):  matthewt | 2006-11-22 05:22:32 +0000
moved tests to compose_namespace instead of compose_connection, marked compose_connection as deprecated, undocumented DB.pm
r34020@cain (orig r2918):  matthewt | 2006-11-22 05:30:06 +0000
class reg test
r34029@cain (orig r2921):  claco | 2006-11-22 17:38:43 +0000
Updated version requirement for Class::Accessor::Grouped to 0.03
r34035@cain (orig r2925):  ningu | 2006-11-22 22:10:30 +0000
 r18925@haferschleim (orig r2919):  ningu | 2006-11-21 22:44:26 -0800
 - slight optimization to ident_condition in PK.pm
 - get ident_cond in update() before applying arguments, so a column's pk can be updated
 r18926@haferschleim (orig r2920):  ningu | 2006-11-21 22:54:10 -0800
 revert update() change
 r18953@haferschleim (orig r2922):  ningu | 2006-11-22 12:12:43 -0800
 re-commit minimal pk-mutation in update(), with test
 r18956@haferschleim (orig r2924):  ningu | 2006-11-22 14:09:07 -0800
 add shallow copy of $attrs in ResultSet->new

r34039@cain (orig r2929):  ningu | 2006-11-23 00:02:14 +0000
trivial test cleanup
r34041@cain (orig r2931):  matthewt | 2006-11-23 20:05:52 +0000
 r28722@cain (orig r2813):  castaway | 2006-10-06 19:45:42 +0000
 Versioning! With tests! Woo!


r34042@cain (orig r2932):  matthewt | 2006-11-23 20:05:58 +0000
 r28723@cain (orig r2814):  castaway | 2006-10-06 19:52:38 +0000
 s/Path::Class/File::Spec/


r34043@cain (orig r2933):  matthewt | 2006-11-23 20:06:02 +0000

r34044@cain (orig r2934):  matthewt | 2006-11-23 20:06:06 +0000

r34045@cain (orig r2935):  matthewt | 2006-11-23 20:06:09 +0000
 r34031@cain (orig r2923):  castaway | 2006-11-22 20:44:36 +0000
 Fix tests, remove some random rints


r34046@cain (orig r2936):  matthewt | 2006-11-23 20:06:14 +0000
---

362c66db4c21efb954313e957bb6e5f8003ffa36
diff --cc lib/DBIx/Class/ResultSet.pm
index 1ace329,8eff3f6..718cb1a
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@@ -85,8 -84,8 +85,9 @@@ sub new 
    return $class->new_result(@_) if ref $class;
  
    my ($source, $attrs) = @_;
 -  #weaken $source;
 +  $source = $source->handle 
 +    unless $source->isa('DBIx::Class::ResultSourceHandle');
+   $attrs = { %{$attrs||{}} };
  
    if ($attrs->{page}) {
      $attrs->{rows} ||= 10;