X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FPK.pm;h=db9b8a1ea952493e332a36d3332b6f63c6d87194;hb=218b7c12fa60ffdd37000b73b8ebca4c9d91a8a2;hp=a25c4319c7fa07708bd7501c0174a4133c149c3d;hpb=b946a283391c836663b4238c681c1a6f62f75394;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm index a25c431..db9b8a1 100644 --- a/lib/DBIx/Class/PK.pm +++ b/lib/DBIx/Class/PK.pm @@ -36,11 +36,15 @@ sub id { } sub _ident_values { - my ($self) = @_; + my ($self, $use_storage_state) = @_; + my (@ids, @missing); for ($self->_pri_cols) { - push @ids, $self->get_column($_); + push @ids, ($use_storage_state and exists $self->{_column_data_in_storage}{$_}) + ? $self->{_column_data_in_storage}{$_} + : $self->get_column($_) + ; push @missing, $_ if (! defined $ids[-1] and ! $self->has_column_loaded ($_) ); } @@ -99,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.'.' : '';