X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FPK.pm;h=62792fba75235fcdf572cac57142a06dfca22a33;hb=0c11ad0ee5c8407f6b87d6e15c62a1b445076dc0;hp=722dcf6bd57671ac2342aec7d8f71d5980535ef6;hpb=5ef76b8b1094769245360ff8bf800fbde46119e6;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm index 722dcf6..62792fb 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.'.' : ''; @@ -128,9 +136,9 @@ sub ident_condition { 1; -=head1 AUTHORS +=head1 AUTHOR AND CONTRIBUTORS -Matt S. Trout +See L and L in DBIx::Class =head1 LICENSE