push @parts, [ $self->_insert_returning($options) ];
}
- return $self->join_clauses(' ', @parts);
+ return $self->join_query_parts(' ', @parts);
}
sub _expand_insert_values {
sub _render_op_andor {
my ($self, $op, $args) = @_;
- my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+ my @parts = map [ $self->render_aqt($_) ], @$args;
return '' unless @parts;
return @{$parts[0]} if @parts == 1;
- my ($sql, @bind) = $self->join_clauses(' '.$self->_sqlcase($op).' ', @parts);
+ my ($sql, @bind) = $self->join_query_parts(' '.$self->_sqlcase($op).' ', @parts);
return '( '.$sql.' )', @bind;
}
sub _render_op_multop {
my ($self, $op, $args) = @_;
- my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+ my @parts = map [ $self->render_aqt($_) ], @$args;
return '' unless @parts;
return @{$parts[0]} if @parts == 1;
my $join = ($op eq ','
? ', '
: ' '.$self->_sqlcase(join ' ', split '_', $op).' '
);
- return $self->join_clauses($join, @parts);
+ return $self->join_query_parts($join, @parts);
}
-sub join_clauses {
+sub join_query_parts {
my ($self, $join, @parts) = @_;
+ my @final = map +(ref($_) eq 'HASH' ? [ $self->render_aqt($_) ] : $_),
+ @parts;
return (
- join($join, map $_->[0], @parts),
- (wantarray ? (map @{$_}[1..$#$_], @parts) : ()),
+ join($join, map $_->[0], @final),
+ (wantarray ? (map @{$_}[1..$#$_], @final) : ()),
);
}