my $left=$self->left();
my $right=$self->right();
return ("", @outjoins) unless($left || $right);
+
my ($leftstr, @leftjoins) = $left->to_sql($hasvals, $not, @joins) if($left);
push(@joins, @leftjoins);
push(@outjoins, @leftjoins);
+
my $op=$self->name();
- print "op: $op type: ", $self->type(), " not: $not\n";
if(defined($op))
{
+ my $left_is_not =($left && $left->name() && $left->name() eq "NOT");
+ my $right_is_not=($right && $right->name() && $right->name() eq "NOT");
+ my $join=undef;
# if we are ANDing, add an inner join
# also if we are NOTing, but we are looking for a tag *value*
if($op eq "AND")
{
- print "AND\n";
- # hack - if right child is a NOT, we don't need extra join/brackets
+ # if right child is a NOT, we don't need extra join/brackets
# NOT will do the same and we will end up with an extra one
- unless($right && $right->name() && $right->name() eq "NOT")
- {
- push(@joins, "INNER");
- push(@outjoins, "INNER");
- }
+ $join= "INNER" unless($right_is_not);
}
elsif($op eq "NOT")
{
- print "NOT (was $not)\n";
$not=1;
# as above - if right child is a NOT, we don't need extra join/brackets
# NOT will do the same and we will end up with an extra one
- unless($right && $right->name() && $right->name() eq "NOT")
- {
- if($hasvals)
- {
- push(@joins, "INNER");
- push(@outjoins, "INNER");
- }
- else
- {
- push(@joins, "LEFT");
- push(@outjoins, "LEFT");
- }
- }
+ $join = ($hasvals ? "INNER" : "LEFT") unless($right_is_not);
}
elsif($op eq "OR")
{
- print "OR\n";
# if left child is a NOT, we need an extra (inner) join
# unless right child is also a NOT
- if(($left && $left->name() && $left->name() eq "NOT") &&
- !($right && $right->name() && $right->name() eq "NOT"))
- {
- push(@joins, "INNER");
- push(@outjoins, "INNER");
- }
+ $join="INNER" if($left_is_not && ! $right_is_not)
+ }
+ if($join)
+ {
+ push(@joins, $join);
+ push(@outjoins, $join);
}
}
my ($rightstr, @rightjoins) = $right->to_sql($hasvals, $not, @joins) if($right);
push(@outjoins, @rightjoins);
-# print "LEFT (", scalar(@leftjoins), "): $leftstr\n";
-# print "RIGHT (", scalar(@rightjoins), "): $rightstr\n";
- $str=$leftstr;
+ $str = $leftstr;
$str .= " $op " if($op && !$not);
$str .= $rightstr;
- if($op && $left && $right)
- {
- $str="(" . $str . ")";
- }
-# print "STR: $str\n";
-# my @all=(@joins, @rightjoins);
-# print "JOINS: RETURN ", scalar(@outjoins), " ALL ", scalar(@all), "\n";
+ $str=("(" . $str . ")") if($op && $left && $right);
return($str, @outjoins);
}