use strictures 1;
-sub intersperse { my $i = shift; my @i = map +($_, $i), @_; pop @i; @i }
-
use SQL::ReservedWords;
use Data::Query::ExprHelpers;
use Moo;
+use namespace::clean;
has reserved_ident_parts => (
is => 'ro', default => sub {
if (@args == 3) {
my ($lhs, $rhs1, $rhs2) = (map $self->_maybe_parenthesise($_), @args);
[ '(', $lhs, $op_name, $rhs1, 'AND', $rhs2, ')' ];
- } elsif (@args == 2 and is_Literal $args[1]->{type}) {
+ } elsif (@args == 2 and is_Literal $args[1]) {
my ($lhs, $rhs) = (map $self->_render($_), @args);
[ '(', $lhs, $op_name, $rhs, ')' ];
} else {
sub _render_join {
my ($self, $dq) = @_;
my ($left, $right) = @{$dq}{qw(left right)};
- my $join = do {
- if ($dq->{outer}) {
- $self->_format_keyword(uc($dq->{outer}).' JOIN');
- } elsif ($dq->{on}) {
- $self->_format_keyword('JOIN');
- } else {
- ','
- }
- };
my $rhs = $self->_render($right);
[
- $self->_render($left), $join,
+ $self->_render($left), $self->_format_join_keyword($dq),
(is_Join($right) ? ('(', $rhs, ')') : $rhs),
($dq->{on}
? ($self->_format_keyword('ON'), $self->_render($dq->{on}))
];
}
+sub _format_join_keyword {
+ my ($self, $dq) = @_;
+ if ($dq->{outer}) {
+ $self->_format_keyword(uc($dq->{outer}).' JOIN');
+ } elsif ($dq->{on}) {
+ $self->_format_keyword('JOIN');
+ } else {
+ ','
+ }
+}
+
sub _render_where {
my ($self, $dq) = @_;
my ($from, $where) = @{$dq}{qw(from where)};
+ while (is_Where $from) {
+ $where = Operator({ 'SQL.Naive' => 'AND' }, [ $from->{where}, $where ]);
+ $from = $from->{from};
+ }
my $keyword = (is_Group($from) ? 'HAVING' : 'WHERE');
[
($from ? $self->_render($from) : ()),
]
}
-sub _render_order {
+sub _order_chunk {
my ($self, $dq) = @_;
- my @ret = (
- $self->_format_keyword('ORDER BY'),
+ return +(
$self->_render($dq->{by}),
($dq->{reverse}
? $self->_format_keyword('DESC')
- : ())
+ : ()),
+ ($dq->{nulls} && $dq->{nulls} =~ /^(first|last)$/i
+ ? $self->_format_keyword('NULLS '.$dq->{nulls})
+ : ()),
+ );
+}
+
+sub _render_order {
+ my ($self, $dq) = @_;
+ my @ret = (
+ $self->_format_keyword('ORDER BY'),
+ $self->_order_chunk($dq),
);
my $from;
while ($from = $dq->{from}) {
$dq = $from;
push @ret, (
',',
- $self->_render($dq->{by}),
- ($dq->{reverse}
- ? $self->_format_keyword('DESC')
- : ())
+ $self->_order_chunk($dq),
);
}
unshift @ret, $self->_render($from) if $from;
($names
? ('(', intersperse(',', map $self->_render($_), @$names), ')')
: ()),
- $self->_format_keyword('VALUES'),
- intersperse(',',
- map [ '(', intersperse(',', map $self->_render($_), @$_), ')' ],
- @$values
- ),
+ (@$values && @{$values->[0]}
+ ? ($self->_format_keyword('VALUES'),
+ intersperse(',',
+ map [ '(', intersperse(',', map $self->_render($_), @$_), ')' ],
+ @$values
+ ))
+ : ($self->_insert_default_values)),
($returning
? ($self->_format_keyword('RETURNING'),
intersperse(',', map $self->_render($_), @$returning))
];
}
+sub _insert_default_values {
+ my ($self) = @_;
+ $self->_format_keyword('DEFAULT VALUES'),
+}
+
1;