Tweaked, prodded, refactored. Thanks to draven for the in_database bits

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

diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm
index 1163725..ad70690 100644 (file)
--- a/lib/DBIx/Class/PK.pm
+++ b/lib/DBIx/Class/PK.pm
@@ -17,7 +17,7 @@ sub _ident_values {
   return (map { $self->{_column_data}{$_} } keys %{$self->_primaries});
 }
 
-sub set_primary {
+sub set_primary_key {
   my ($class, @cols) = @_;
   my %pri;
   $pri{$_} = {} for @cols;
@@ -26,20 +26,38 @@ sub set_primary {
 
 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) {
-    return ($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 {
     $query = {@vals};
   }
   die "Can't retrieve 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
-  return ($class->search($query))[0];
+  my $ret = ($class->search($query))[0];
+  #warn "$class: ".join(', ', %{$ret->{_column_data}});
+  return $ret;
+}
+
+sub discard_changes {
+  my ($self) = @_;
+  delete $self->{_dirty_columns};
+  $_[0] = $self->retrieve($self->id);
+}
+
+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;