use SQL::ReservedWords;
use Data::Query::Constants qw(
DQ_IDENTIFIER DQ_OPERATOR DQ_VALUE DQ_JOIN DQ_ALIAS DQ_ORDER DQ_LITERAL
+ DQ_GROUP DQ_SELECT DQ_SLICE
);
use Moo;
has always_quote => (is => 'ro', default => sub { 0 });
+has collapse_aliases => (is => 'ro', default => sub { 1 });
+
sub _default_simple_ops {
+{
(map +($_ => 'binop'), qw(= > < >= <= != LIKE), 'NOT LIKE' ),
($dq->{from}
? ($self->_format_keyword('FROM'), @{$self->_render($dq->{from})})
: ()
- )
+ ),
];
}
my ($self, $dq, $as) = @_;
# FROM foo foo -> FROM foo
# FROM foo.bar bar -> FROM foo.bar
- if ($dq->{alias}{type} eq DQ_IDENTIFIER) {
- if ($dq->{alias}{elements}[-1] eq $dq->{as}) {
- return $self->_render($dq->{alias});
+ if ($self->collapse_aliases) {
+ if ($dq->{from}{type} eq DQ_IDENTIFIER) {
+ if ($dq->{from}{elements}[-1] eq $dq->{to}) {
+ return $self->_render($dq->{from});
+ }
}
}
- return [
- $self->_render($dq->{alias}),
+ my %parenthesise = map +($_ => 1), DQ_SELECT, DQ_SLICE;
+ return [ # XXX not sure this is the right place to detect this
+ ($parenthesise{$dq->{from}{type}}
+ ? [ '(', $self->_render($dq->{from}), ')' ]
+ : $self->_render($dq->{from})),
$as || ' ',
- $self->_render_identifier({ elements => [ $dq->{as} ] })
+ $self->_render_identifier({ elements => [ $dq->{to} ] })
];
}
unless ($dq->{subtype} eq 'SQL') {
die "Can't render non-SQL literal";
}
- if ($dq->{literal}) {
+ if (defined($dq->{literal})) {
return [
$dq->{literal}, @{$dq->{values}||[]}
];
sub _render_join {
my ($self, $dq) = @_;
- my ($left, $right) = @{$dq->{join}};
- die "No support for ON yet" if $dq->{on};
- die "No support for LEFT/RIGHT yet" if $dq->{outer};
- [ $self->_render($left), ',', $self->_render($right) ];
+ 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,
+ ($right->{type} eq DQ_JOIN ? ('(', $rhs, ')') : $rhs),
+ ($dq->{on}
+ ? ($self->_format_keyword('ON'), $self->_render($dq->{on}))
+ : ())
+ ];
}
sub _render_where {
my ($self, $dq) = @_;
my ($from, $where) = @{$dq}{qw(from where)};
+ my $keyword = ($from && $from->{type} eq DQ_GROUP) ? 'HAVING' : 'WHERE';
[
($from ? $self->_render($from) : ()),
- $self->_format_keyword('WHERE'),
+ $self->_format_keyword($keyword),
$self->_render($where)
]
}
my @ret = (
$self->_format_keyword('ORDER BY'),
$self->_render($dq->{by}),
- ($dq->{direction} ? $self->_format_keyword($dq->{direction}) : ())
+ ($dq->{reverse}
+ ? $self->_format_keyword('DESC')
+ : ())
);
my $from;
while ($from = $dq->{from}) {
push @ret, (
',',
$self->_render($dq->{by}),
- ($dq->{direction} ? $self->_format_keyword($dq->{direction}) : ())
+ ($dq->{reverse}
+ ? $self->_format_keyword('DESC')
+ : ())
);
}
unshift @ret, $self->_render($from) if $from;
\@ret;
}
+sub _render_group {
+ my ($self, $dq) = @_;
+ # this could also squash like order does. but I dunno whether that should
+ # move somewhere else just yet.
+ my @ret = (
+ ($dq->{from} ? $self->_render($dq->{from}) : ()),
+ (@{$dq->{by}}
+ ? (
+ $self->_format_keyword('GROUP BY'),
+ intersperse(',', map $self->_render($_), @{$dq->{by}})
+ )
+ : ())
+ );
+ \@ret;
+}
+
sub _render_delete {
my ($self, $dq) = @_;
my ($target, $where) = @{$dq}{qw(target where)};