added objectindex tests for search and add

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

diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm
index d1dc87c..fc03c57 100644 (file)
--- a/lib/DBIx/Class/PK.pm
+++ b/lib/DBIx/Class/PK.pm
@@ -26,13 +26,14 @@ sub set_primary_key {
 
 sub retrieve {
   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;
   my $query;
   if (ref $vals[0] eq 'HASH') {
     $query = $vals[0];
   } elsif (@pk == @vals) {
-    my $ret = ($class->retrieve_from_sql($class->_ident_cond, @vals))[0];
+    my $ret = ($class->retrieve_from_sql($class->_ident_cond, @vals, $attrs))[0];
     #warn "$class: ".join(', ', %{$ret->{_column_data}});
     return $ret;
   } else {
@@ -49,7 +50,22 @@ sub retrieve {
 sub discard_changes {
   my ($self) = @_;
   delete $self->{_dirty_columns};
-  $_[0] = $self->retrieve($self->id);
+  return unless $self->in_database; # Don't reload if we aren't real!
+  my ($reload) = $self->retrieve($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};
+  return $self;
+}
+
+sub id {
+  my ($self) = @_;
+  die "Can't call id() as a class method" unless ref $self;
+  my @pk = $self->_ident_values;
+  return (wantarray ? @pk : $pk[0]);
 }
 
 1;