next unless exists $attrs->{$key};
$our_attrs->{$key} = $self->_merge_attr($our_attrs->{$key}, delete $attrs->{$key});
}
-
+
my $new_attrs = { %{$our_attrs}, %{$attrs} };
my $where = (@_
? (
$attrs->{columns} = [ $self->{result_source}->columns ];
}
- my $select_alias = $self->{attrs}{alias};
$attrs->{select} ||= [
- map { m/\./ ? $_ : "${select_alias}.$_" } @{delete $attrs->{columns}}
+ map { m/\./ ? $_ : "${alias}.$_" } @{delete $attrs->{columns}}
];
$attrs->{as} ||= [
map { m/^\Q${alias}.\E(.+)$/ ? $1 : $_ } @{$attrs->{select}}
push(@{$attrs->{as}}, @$adds);
}
- $attrs->{from} ||= [ { $alias => $source->from } ];
+ $attrs->{from} ||= [ { 'me' => $source->from } ];
+ if ($attrs->{_parent_from}) {
+ push @{$attrs->{from}}, @{$attrs->{_parent_from}};
+ }
if (exists $attrs->{join} || exists $attrs->{prefetch}) {
foreach my $p (ref $prefetch eq 'ARRAY' ? @$prefetch : ($prefetch)) {
# bring joins back to level of current class
my @prefetch = $source->resolve_prefetch(
- $p, $alias, { %{$self->{_parent_seen_join}||{}} }, \@pre_order, $collapse
+ $p, $alias, { %{$attrs->{_parent_seen_join}||{}} }, \@pre_order, $collapse
);
push(@{$attrs->{select}}, map { $_->[0] } @prefetch);
push(@{$attrs->{as}}, map { $_->[1] } @prefetch);
my $source = $self->result_source;
my $attrs = $self->{attrs};
- my $from = $self->{_parent_from}
- || [ { $attrs->{alias} => $source->from } ];
+ my $from = $attrs->{_parent_from} || [];
+# || [ { $attrs->{alias} => $source->from } ];
- my $seen = { %{$self->{_parent_seen_join}||{}} };
+ my $seen = { %{$attrs->{_parent_seen_join}||{}} };
if ($attrs->{join}) {
- push(@$from,
+ push(@{$from},
$source->resolve_join($attrs->{join}, $attrs->{alias}, $seen)
);
}
- return ($seen,$from);
+ return ($from,$seen);
}
sub _merge_attr {
"' has no such relationship $rel")
unless $rel_obj;
- my ($seen,$from) = $self->_resolve_from;
-
- my $join_count = $self->{_parent_seen_join}{$rel};
+ my $join_count = $self->{attrs}{_parent_seen_join}{$rel};
my $alias = $join_count ? join('_', $rel, $join_count+1) : $rel;
-
- my $rs = $self->result_source->schema->resultset($rel_obj->{class})->search(
+
+ my $rs = $self->search(undef, { join => $rel });
+ my ($from,$seen) = $rs->_resolve_from;
+
+ $self->result_source->schema->resultset($rel_obj->{class})->search_rs(
undef, {
- %{$self->{attrs}},
select => undef,
as => undef,
alias => $alias,
+ where => $self->{cond},
+ _parent_from => $from,
+ _parent_seen_join => $seen,
});
- $rs->{_parent_from} = $from;
- $rs->{_parent_seen_join} = $seen;
-
- $rs;
};
}