X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FPK.pm;h=e420ac62497daf7b861e1bc51f14ad2a153f3f14;hb=656796f2088da66cc80f4eb127c39c923ef3c1dd;hp=1ae5331f496285b096b9d8175ceabcf3a5243845;hpb=95a70f01eae4b2c325a3a527a72cf8ae91796e8c;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm
index 1ae5331..e420ac6 100644
--- a/lib/DBIx/Class/PK.pm
+++ b/lib/DBIx/Class/PK.pm
@@ -44,22 +44,23 @@ sub set_primary_key {
   $class->_primaries(\%pri);
 }
 
-sub retrieve {
+sub find {
   my ($class, @vals) = @_;
   my $attrs = (@vals > 1 && ref $vals[$#vals] eq 'HASH' ? pop(@vals) : {});
   my @pk = keys %{$class->_primaries};
-  die "Can't retrieve unless primary columns are defined" unless @pk;
+  $class->throw( "Can't find unless primary columns are defined" ) 
+    unless @pk;
   my $query;
   if (ref $vals[0] eq 'HASH') {
     $query = $vals[0];
   } elsif (@pk == @vals) {
-    my $ret = ($class->retrieve_from_sql($class->_ident_cond, @vals, $attrs))[0];
+    my $ret = ($class->search_literal($class->_ident_cond, @vals, $attrs))[0];
     #warn "$class: ".join(', ', %{$ret->{_column_data}});
     return $ret;
   } else {
     $query = {@vals};
   }
-  die "Can't retrieve unless all primary keys are specified"
+  $class->throw( "Can't find unless all primary keys are specified" )
     unless (keys %$query >= @pk); # If we check 'em we run afoul of uc/lc
                                   # column names etc. Not sure what to do yet
   my $ret = ($class->search($query))[0];
@@ -71,23 +72,29 @@ sub discard_changes {
   my ($self) = @_;
   delete $self->{_dirty_columns};
   return unless $self->in_database; # Don't reload if we aren't real!
-  my ($reload) = $self->retrieve($self->id);
+  my ($reload) = $self->find($self->id);
   unless ($reload) { # If we got deleted in the mean-time
     $self->in_database(0);
     return $self;
   }
-  $self->store_column($_ => $reload->get_column($_))
-    foreach keys %{$self->_columns};
+  delete @{$self}{keys %$self};
+  @{$self}{keys %$reload} = values %$reload;
+  #$self->store_column($_ => $reload->get_column($_))
+  #  foreach keys %{$self->_columns};
   return $self;
 }
 
 sub id {
   my ($self) = @_;
-  die "Can't call id() as a class method" unless ref $self;
+  $self->throw( "Can't call id() as a class method" ) unless ref $self;
   my @pk = $self->_ident_values;
   return (wantarray ? @pk : $pk[0]);
 }
 
+sub primary_columns {
+  return keys %{shift->_primaries};
+}
+
 1;
 
 =back