sub _render_row {
my ($self, undef, $values) = @_;
my ($sql, @bind) = $self->_render_op(undef, [ ',', @$values ]);
- return "($sql)", @bind;
+ return $self->join_query_parts('', [ '(' ], [ $sql, @bind ], [ ')' ]);
}
sub _render_func {
sub _render_op_between {
my ($self, $op, $args) = @_;
my ($left, $low, $high) = @$args;
- my ($rhsql, @rhbind) = do {
+ my @rh = do {
if (@$args == 2) {
puke "Single arg to between must be a literal"
unless $low->{-literal};
- @{$low->{-literal}}
+ $low;
} else {
- my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high;
- (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
- @{$l}[1..$#$l], @{$h}[1..$#$h])
+ +($low, $self->format_keyword('and'), $high);
}
};
- my ($lhsql, @lhbind) = $self->render_aqt($left);
- return (
- join(' ',
- '(', $lhsql,
- $self->_sqlcase(join ' ', split '_', $op),
- $rhsql, ')'
- ),
- @lhbind, @rhbind
+ return $self->join_query_parts(' ',
+ '(', $left, $self->format_keyword($op), @rh, ')',
);
}
sub _render_op_in {
my ($self, $op, $args) = @_;
my ($lhs, @rhs) = @$args;
- my @in_bind;
- my @in_sql = map {
- my ($sql, @bind) = $self->render_aqt($_);
- push @in_bind, @bind;
- $sql;
- } @rhs;
- my ($lhsql, @lbind) = $self->render_aqt($lhs);
- return (
- $lhsql.' '.$self->_sqlcase(join ' ', split '_', $op).' ( '
- .join(', ', @in_sql)
- .' )',
- @lbind, @in_bind
+
+ return $self->join_query_parts(' ',
+ $lhs,
+ $self->format_keyword($op),
+ '(',
+ [ $self->join_query_parts(', ', @rhs) ],
+ ')'
);
}
sub join_query_parts {
my ($self, $join, @parts) = @_;
- my @final = map +(ref($_) eq 'HASH' ? [ $self->render_aqt($_) ] : $_),
- @parts;
+ my @final = map +(
+ ref($_) eq 'HASH'
+ ? [ $self->render_aqt($_) ]
+ : ref($_) eq 'ARRAY' ? $_ : [ $_ ]),
+ @parts;
return (
join($join, map $_->[0], @final),
(wantarray ? (map @{$_}[1..$#$_], @final) : ()),
return $_[0]->{case} ? $_[1] : uc($_[1]);
}
+sub format_keyword { $_[0]->_sqlcase(join ' ', split '_', $_[1]) }
#======================================================================
# DISPATCHING FROM REFKIND