X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FPK.pm;h=db9b8a1ea952493e332a36d3332b6f63c6d87194;hb=867f1b28c4934e62ad3545c8607b2bf4c145b34a;hp=722dcf6bd57671ac2342aec7d8f71d5980535ef6;hpb=7077c96d00d2b539de5943ad18d3e9724af80199;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm
index 722dcf6..db9b8a1 100644
--- a/lib/DBIx/Class/PK.pm
+++ b/lib/DBIx/Class/PK.pm
@@ -36,12 +36,12 @@ sub id {
 }
 
 sub _ident_values {
-  my ($self) = @_;
+  my ($self, $use_storage_state) = @_;
 
   my (@ids, @missing);
 
   for ($self->_pri_cols) {
-    push @ids, exists $self->{_column_data_in_storage}{$_}
+    push @ids, ($use_storage_state and exists $self->{_column_data_in_storage}{$_})
       ? $self->{_column_data_in_storage}{$_}
       : $self->get_column($_)
     ;
@@ -103,10 +103,18 @@ Produces a condition hash to locate a row based on the primary key(s).
 =cut
 
 sub ident_condition {
-  my ($self, $alias) = @_;
+  shift->_mk_ident_cond(@_);
+}
+
+sub _storage_ident_condition {
+  shift->_mk_ident_cond(shift, 1);
+}
+
+sub _mk_ident_cond {
+  my ($self, $alias, $use_storage_state) = @_;
 
   my @pks = $self->_pri_cols;
-  my @vals = $self->_ident_values;
+  my @vals = $self->_ident_values($use_storage_state);
 
   my (%cond, @undef);
   my $prefix = defined $alias ? $alias.'.' : '';