removed ->reload_row from storage, changed this to a method based on the actual row...

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / PK.pm

diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm
index bb820e2..f664cc6 100644 (file)
--- a/lib/DBIx/Class/PK.pm
+++ b/lib/DBIx/Class/PK.pm
@@ -37,9 +37,23 @@ changes made since the row was last read from storage.
 
 sub discard_changes {
   my ($self) = @_;
-  my $storage = $self->result_source->schema->storage;
-  $storage->reload_row($self);
-  return $self;
+  delete $self->{_dirty_columns};
+  return unless $self->in_storage; # Don't reload if we aren't real!
+  
+  if( my $current_storage = $self->get_current_storage) {
+       
+    # 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);
+    return $self;      
+  }
 }
 
 =head2 id