sub sequence {
my ($self,$seq) = @_;
- my $rsrc = $self->result_source;
- my @pks = $rsrc->primary_columns
+ my @pks = $self->primary_columns
or next;
$_->{sequence} = $seq
- for values %{ $rsrc->columns_info (\@pks) };
+ for values %{ $self->columns_info (\@pks) };
}
my @otherrels = $othertable->relationships();
my $otherrelationship;
foreach my $otherrel (@otherrels) {
- my $otherrel_info = $othertable->relationship_info($otherrel);
+ # this may be a partial schema with the related source not being
+ # available at all
+ my $back = try { $othertable->related_source($otherrel) } or next;
- my $back = $othertable->related_source($otherrel);
+ # did we get back to ourselves?
next unless $back->source_name eq $self->source_name;
+ my $otherrel_info = $othertable->relationship_info($otherrel);
my @othertestconds;
if (ref $otherrel_info->{cond} eq 'HASH') {
-alias => $as,
-relation_chain_depth => $seen->{-relation_chain_depth} || 0,
},
- $self->_resolve_condition($rel_info->{cond}, $as, $alias) ];
+ $self->_resolve_condition($rel_info->{cond}, $as, $alias, $join) ];
}
}
# Resolves the passed condition to a concrete query fragment. If given an alias,
# returns a join condition; if given an object, inverts that object to produce
# a related conditional from that object.
-our $UNRESOLVABLE_CONDITION = \'1 = 0';
+our $UNRESOLVABLE_CONDITION = \ '1 = 0';
sub _resolve_condition {
- my ($self, $cond, $as, $for) = @_;
- if (ref $cond eq 'HASH') {
+ my ($self, $cond, $as, $for, $rel) = @_;
+ if (ref $cond eq 'CODE') {
+
+ my $obj_rel = !!ref $for;
+
+ return $cond->({
+ self_alias => $obj_rel ? $as : $for,
+ foreign_alias => $obj_rel ? 'me' : $as,
+ self_resultsource => $self,
+ foreign_relname => $rel || ($obj_rel ? $as : $for),
+ self_rowobj => $obj_rel ? $for : undef
+ });
+
+ } elsif (ref $cond eq 'HASH') {
my %ret;
foreach my $k (keys %{$cond}) {
my $v = $cond->{$k};
} elsif (ref $cond eq 'ARRAY') {
return [ map { $self->_resolve_condition($_, $as, $for) } @$cond ];
} else {
- die("Can't handle condition $cond yet :(");
+ $self->throw_exception ("Can't handle condition $cond yet :(");
}
}
"Can't prefetch has_many ${pre} (join cond too complex)")
unless ref($rel_info->{cond}) eq 'HASH';
my $dots = @{[$as_prefix =~ m/\./g]} + 1; # +1 to match the ".${as_prefix}"
+
if (my ($fail) = grep { @{[$_ =~ m/\./g]} == $dots }
keys %{$collapse}) {
my ($last) = ($fail =~ /([^\.]+)$/);
. 'Use at your own risk.'
);
}
+
#my @col = map { (/^self\.(.+)$/ ? ("${as_prefix}.$1") : ()); }
# values %{$rel_info->{cond}};
$collapse->{".${as_prefix}${pre}"} = [ $rel_source->_pri_cols ];