}
sub _ident_values {
- my ($self) = @_;
+ my ($self, $use_storage_state) = @_;
+
my (@ids, @missing);
- for ($self->_pri_cols) {
- push @ids, $self->get_column($_);
+ for ($self->result_source->_pri_cols_or_die) {
+ 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 ($_) );
}
if (@missing && $self->in_storage) {
$self->throw_exception (
- 'Unable to uniquely identify row object with missing PK columns: '
+ 'Unable to uniquely identify result object with missing PK columns: '
. join (', ', @missing )
);
}
=head2 ID
-Returns a unique id string identifying a row object by primary key.
+Returns a unique id string identifying a result object by primary key.
Used by L<DBIx::Class::CDBICompat::LiveObjectIndex> and
L<DBIx::Class::ObjectCache>.
sub _create_ID {
my ($self, %vals) = @_;
- return undef unless 0 == grep { !defined } values %vals;
+ return undef if grep { !defined } values %vals;
return join '|', ref $self || $self, $self->result_source->name,
map { $_ . '=' . $vals{$_} } sort keys %vals;
}
=cut
sub ident_condition {
- my ($self, $alias) = @_;
+ shift->_mk_ident_cond(@_);
+}
+
+sub _storage_ident_condition {
+ shift->_mk_ident_cond(shift, 1);
+}
- my @pks = $self->_pri_cols;
- my @vals = $self->_ident_values;
+sub _mk_ident_cond {
+ my ($self, $alias, $use_storage_state) = @_;
+
+ my @pks = $self->result_source->_pri_cols_or_die;
+ my @vals = $self->_ident_values($use_storage_state);
my (%cond, @undef);
my $prefix = defined $alias ? $alias.'.' : '';
if (@undef && $self->in_storage) {
$self->throw_exception (
- 'Unable to construct row object identity condition due to NULL PK columns: '
+ 'Unable to construct result object identity condition due to NULL PK columns: '
. join (', ', @undef)
);
}
return \%cond;
}
-1;
-
-=head1 AUTHORS
+=head1 FURTHER QUESTIONS?
-Matt S. Trout <mst@shadowcatsystems.co.uk>
+Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.
-=head1 LICENSE
+=head1 COPYRIGHT AND LICENSE
-You may distribute this code under the same terms as Perl itself.
+This module is free software L<copyright|DBIx::Class/COPYRIGHT AND LICENSE>
+by the L<DBIx::Class (DBIC) authors|DBIx::Class/AUTHORS>. You can
+redistribute it and/or modify it under the same terms as the
+L<DBIx::Class library|DBIx::Class/COPYRIGHT AND LICENSE>.
=cut
+1;