use base qw/DBIx::Class/;
use DBIx::Class::Exception;
-use Scalar::Util ();
+use Scalar::Util 'blessed';
use Try::Tiny;
+use namespace::clean;
###
### Internal method
}
else {
my $us = $rsrc->source_name;
- $self->throw_exception ("'$us' neither depends nor is depended on by '$relname', something is wrong...");
+ $self->throw_exception (
+ "Unable to determine relationship '$relname' direction from '$us', "
+ . "possibly due to a missing reverse-relationship on '$relname' to '$us'."
+ );
}
}
my $acc_type = $info->{attrs}{accessor} || '';
if ($acc_type eq 'single') {
my $rel_obj = delete $attrs->{$key};
- if(!Scalar::Util::blessed($rel_obj)) {
+ if(!blessed $rel_obj) {
$rel_obj = $new->__new_related_find_or_new_helper($key, $rel_obj);
}
my @objects;
foreach my $idx (0 .. $#$others) {
my $rel_obj = $others->[$idx];
- if(!Scalar::Util::blessed($rel_obj)) {
+ if(!blessed $rel_obj) {
$rel_obj = $new->__new_related_find_or_new_helper($key, $rel_obj);
}
elsif ($acc_type eq 'filter') {
## 'filter' should disappear and get merged in with 'single' above!
my $rel_obj = delete $attrs->{$key};
- if(!Scalar::Util::blessed($rel_obj)) {
+ if(!blessed $rel_obj) {
$rel_obj = $new->__new_related_find_or_new_helper($key, $rel_obj);
}
if ($rel_obj->in_storage) {
my $rel_obj = $related_stuff{$relname};
if (! $self->{_rel_in_storage}{$relname}) {
- next unless (Scalar::Util::blessed($rel_obj)
- && $rel_obj->isa('DBIx::Class::Row'));
+ next unless (blessed $rel_obj && $rel_obj->isa('DBIx::Class::Row'));
next unless $source->_pk_depends_on(
$relname, { $rel_obj->get_columns }
my $updated_cols = $source->storage->insert(
$source,
{ $self->get_columns },
- (keys %auto_pri) && $source->storage->_supports_insert_returning
+ (keys %auto_pri) && $source->storage->_use_insert_returning
? { returning => [ sort { $auto_pri{$a} <=> $auto_pri{$b} } keys %auto_pri ] }
: ()
,
: $related_stuff{$relname}
;
- if (@cands
- && Scalar::Util::blessed($cands[0])
- && $cands[0]->isa('DBIx::Class::Row')
+ if (@cands && blessed $cands[0] && $cands[0]->isa('DBIx::Class::Row')
) {
my $reverse = $source->reverse_relationship_info($relname);
foreach my $obj (@cands) {
$obj->set_from_related($_, $self) for keys %$reverse;
- my $them = { %{$obj->{_relationship_data} || {} }, $obj->get_inflated_columns };
if ($self->__their_pk_needs_us($relname)) {
if (exists $self->{_ignore_at_insert}{$relname}) {
MULTICREATE_DEBUG and warn "MC $self skipping post-insert on $relname";
- } else {
- MULTICREATE_DEBUG and warn "MC $self re-creating $relname $obj";
- my $re = $self->result_source
- ->related_source($relname)
- ->resultset
- ->create($them);
- %{$obj} = %{$re};
- MULTICREATE_DEBUG and warn "MC $self new $relname $obj";
+ }
+ else {
+ MULTICREATE_DEBUG and warn "MC $self inserting $relname $obj";
+ $obj->insert;
}
} else {
MULTICREATE_DEBUG and warn "MC $self post-inserting $obj";
$self->in_storage(1);
delete $self->{_orig_ident};
+ delete $self->{_orig_ident_failreason};
delete $self->{_ignore_at_insert};
$rollback_guard->commit if $rollback_guard;
$self->throw_exception( "Not in database" ) unless $self->in_storage;
- $self->throw_exception('Unable to update a row with incomplete or no identity')
+ $self->throw_exception($self->{_orig_ident_failreason})
if ! keys %$ident_cond;
my $rows = $self->result_source->storage->update(
$self->throw_exception( "Not in database" ) unless $self->in_storage;
my $ident_cond = $self->{_orig_ident} || $self->ident_condition;
- $self->throw_exception('Unable to delete a row with incomplete or no identity')
+ $self->throw_exception($self->{_orig_ident_failreason})
if ! keys %$ident_cond;
$self->result_source->storage->delete(
$self->result_source, $ident_cond
);
- delete $self->{_orig_ident};
+ delete $self->{_orig_ident}; # no longer identifiable
$self->in_storage(undef);
}
else {
my ($self, $column, $new_value) = @_;
# if we can't get an ident condition on first try - mark the object as unidentifiable
- $self->{_orig_ident} ||= (try { $self->ident_condition }) || {};
+ # (by using an empty hashref) and store the error for further diag
+ unless ($self->{_orig_ident}) {
+ try {
+ $self->{_orig_ident} = $self->ident_condition
+ }
+ catch {
+ $self->{_orig_ident_failreason} = $_;
+ $self->{_orig_ident} = {};
+ };
+ }
my $old_value = $self->get_column($column);
$new_value = $self->store_column($column, $new_value);
if ($source->isa('DBIx::Class::ResultSourceHandle')) {
$source = $source_handle->resolve
- }
+ }
else {
$source_handle = $source->handle
}
my $ident_cond = $self->{_orig_ident} || $self->ident_condition;
- $self->throw_exception('Unable to requery a row with incomplete or no identity')
+ $self->throw_exception($self->{_orig_ident_failreason})
if ! keys %$ident_cond;
return $resultset->find($ident_cond);