X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FPK.pm;h=5be483325f8de54751f396d555394a511075da3d;hb=234193451aa53051d0c675f7236ab8fc55f8b6b0;hp=32efba643a39518c43b27908756049fe4dd46b60;hpb=a737512cdbe7f21dae158d1b60d71d30df658745;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm
index 32efba6..5be4833 100644
--- a/lib/DBIx/Class/PK.pm
+++ b/lib/DBIx/Class/PK.pm
@@ -25,7 +25,7 @@ sub _ident_values {
   return (map { $self->{_column_data}{$_} } $self->primary_columns);
 }
 
-=head2 discard_changes
+=head2 discard_changes ($attrs)
 
 Re-selects the row from the database, losing any changes that had
 been made.
@@ -33,22 +33,25 @@ been made.
 This method can also be used to refresh from storage, retrieving any
 changes made since the row was last read from storage.
 
+$attrs is expected to be a hashref of attributes suitable for passing as the
+second argument to $resultset->search($cond, $attrs);
+
 =cut
 
 sub discard_changes {
-  my ($self) = @_;
+  my ($self, $attrs) = @_;
   delete $self->{_dirty_columns};
   return unless $self->in_storage; # Don't reload if we aren't real!
-  
-  if( my $current_storage = $self->get_from_storage) {
-  	
+
+  if( my $current_storage = $self->get_from_storage($attrs)) {
+
     # Set $self to the current.
   	%$self = %$current_storage;
-  	
+
     # Avoid a possible infinite loop with
     # sub DESTROY { $_[0]->discard_changes }
     bless $current_storage, 'Do::Not::Exist';
-    
+
     return $self;  	
   } else {
     $self->in_storage(0);