Make sure _proxy_slots is not undef.

frioux · Sep 17, 2014 · 28a47a1 · 28a47a1
1 parent e480f17
commit 28a47a1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,8 @@ Revision history for {{$dist->name}}
 
 {{$NEXT}}
  - Fix ::Helper::ResultSet::DateMethods1 for Oracle (thanks Alexander Hartmaier!)
+ - Fix yet another issue with ->copy and proxied ResultSet methods (thanks again
+   moltar!)
 
 2.023006  2014-09-03 17:44:34-05:00 America/Chicago
  - Fix a few ::DateMethods1 methods when using a bound date (vs a column)

diff --git a/lib/DBIx/Class/Helper/Row/ProxyResultSetMethod.pm b/lib/DBIx/Class/Helper/Row/ProxyResultSetMethod.pm
@@ -40,7 +40,7 @@ sub proxy_resultset_method {
 }
 
 sub copy {
-   delete local @{$_[0]->{_column_data}}{@{$_[0]->_proxy_slots}};
+   delete local @{$_[0]->{_column_data}}{@{$_[0]->_proxy_slots||[]}};
 
    shift->next::method(@_);
 }

diff --git a/t/lib/TestSchema/Result/Bloaty.pm b/t/lib/TestSchema/Result/Bloaty.pm
@@ -1,7 +1,8 @@
 package TestSchema::Result::Bloaty;
 
 use DBIx::Class::Candy -components => [
-   'Helper::Row::ProxyResultSetUpdate'
+   'Helper::Row::ProxyResultSetUpdate',
+   'Helper::Row::ProxyResultSetMethod',
 ];
 
 table 'Bloaty';

diff --git a/t/row/proxy-resultset-method.t b/t/row/proxy-resultset-method.t
@@ -38,5 +38,11 @@ subtest 'copy result' => sub {
     is $g3->id, 100, 'id is correctly overridden';
 };
 
+subtest 'copy result without any proxy defined' => sub {
+   my $bloaty = $schema->resultset('Bloaty')->first;
+   ok my $bcopy = $bloaty->copy({ id => 100, name => 'boo' }), 'Copied result';
+   is $bcopy->id, 100, 'id is correctly overridden';
+};
+
 done_testing;