ORDER BY never generates ASC

[dbsrgits/Data-Query.git] / lib / Data / Query / Renderer / SQL / Naive.pm

diff --git a/lib/Data/Query/Renderer/SQL/Naive.pm b/lib/Data/Query/Renderer/SQL/Naive.pm
index 3d264e7..42ee8b4 100644 (file)
--- a/lib/Data/Query/Renderer/SQL/Naive.pm
+++ b/lib/Data/Query/Renderer/SQL/Naive.pm
@@ -7,7 +7,7 @@ sub intersperse { my $i = shift; my @i = map +($_, $i), @_; pop @i; @i }
 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_GROUP DQ_SELECT DQ_SLICE
 );
 
 use Moo;
@@ -287,7 +287,7 @@ sub _render_select {
     ($dq->{from}
        ? ($self->_format_keyword('FROM'), @{$self->_render($dq->{from})})
        : ()
-    )
+    ),
   ];
 }
 
@@ -302,8 +302,11 @@ sub _render_alias {
       }
     }
   }
-  return [
-    $self->_render($dq->{from}),
+  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->{to} ] })
   ];
@@ -337,8 +340,10 @@ sub _render_join {
       ','
     }
   };
+  my $rhs = $self->_render($right);
   [
-    $self->_render($left), $join, $self->_render($right),
+    $self->_render($left), $join,
+    ($right->{type} eq DQ_JOIN ? ('(', $rhs, ')') : $rhs),
     ($dq->{on}
       ? ($self->_format_keyword('ON'), $self->_render($dq->{on}))
       : ())
@@ -361,7 +366,9 @@ sub _render_order {
   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}) {
@@ -370,7 +377,9 @@ sub _render_order {
     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;
@@ -383,8 +392,12 @@ sub _render_group {
   # move somewhere else just yet.
   my @ret = (
     ($dq->{from} ? $self->_render($dq->{from}) : ()),
-    $self->_format_keyword('GROUP BY'),
-    intersperse(',', map $self->_render($_), @{$dq->{by}})
+    (@{$dq->{by}}
+      ? (
+          $self->_format_keyword('GROUP BY'),
+          intersperse(',', map $self->_render($_), @{$dq->{by}})
+         )
+      : ())
   );
   \@ret;
 }