push @parts, [ $self->_insert_returning($options) ];
}
- return $self->join_clauses(' ', @parts);
+ return $self->join_query_parts(' ', @parts);
}
sub _expand_insert_values {
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 {
my ($self, undef, $rest) = @_;
my ($func, @args) = @$rest;
- if (ref($func) eq 'HASH') {
- $func = $self->render_aqt($func);
- }
- my @arg_sql;
- my @bind = map {
- my @x = @$_;
- push @arg_sql, shift @x;
- @x
- } map [ $self->render_aqt($_) ], @args;
- return ($self->_sqlcase($func).'('.join(', ', @arg_sql).')', @bind);
+ return $self->join_query_parts('',
+ [ $self->_sqlcase($func) ],
+ [ '(' ],
+ [ $self->join_query_parts(', ', @args) ],
+ [ ')' ]
+ );
}
sub _render_bind {
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->_sqlcase('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->_sqlcase(join ' ', split '_', $op) ],
+ @rh,
+ [ ')' ],
);
}
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;
}
? ', '
: ' '.$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) : ()),
);
}
return $_[0]->{case} ? $_[1] : uc($_[1]);
}
+sub format_keyword { $_[0]->_sqlcase(join ' ', split '_', $_[1]) }
#======================================================================
# DISPATCHING FROM REFKIND