whitespace tests

[dbsrgits/SQL-Abstract.git] / lib / SQL / Abstract / Tree.pm

diff --git a/lib/SQL/Abstract/Tree.pm b/lib/SQL/Abstract/Tree.pm
index ce36f30..0110fc5 100644 (file)
--- a/lib/SQL/Abstract/Tree.pm
+++ b/lib/SQL/Abstract/Tree.pm
@@ -45,6 +45,7 @@ my @expression_terminator_sql_keywords = (
   'INTERSECT',
   'EXCEPT',
   'RETURNING',
+  'ROW_NUMBER \s* \( \s* \) \s+ OVER',
 );
 
 # These are binary operator keywords always a single LHS and RHS
@@ -78,9 +79,13 @@ my $tokenizer_re = qr/ \s* ( $tokenizer_re_str | \( | \) | \? ) \s* /xi;
 sub _binary_op_keywords { @binary_op_keywords }
 
 my %indents = (
-   select => 0,
-   where  => 1,
-   from   => 1,
+   select     => 0,
+   where      => 1,
+   from       => 1,
+   join       => 1,
+   on         => 2,
+   'group by' => 1,
+   'order by' => 1,
 );
 
 my %profiles = (
@@ -103,9 +108,12 @@ my %profiles = (
       indent_amount => 2,
       newline       => "<br />\n",
       colormap      => {
-         select => ['<span class="select">', '</span>'],
-         where  => ['<span class="where">', '</span>'],
-         from   => ['<span class="from">', '</span>'],
+         select     => ['<span class="select">'  , '</span>'],
+         where      => ['<span class="where">'   , '</span>'],
+         from       => ['<span class="from">'    , '</span>'],
+         join       => ['<span class="join">'    , '</span>'],
+         on         => ['<span class="on">'      , '</span>'],
+         'group by' => ['<span class="group-by">', '</span>'],
       },
       indentmap     => { %indents },
    },
@@ -118,9 +126,13 @@ my %profiles = (
 eval {
    require Term::ANSIColor;
    $profiles{console}->{colormap} = {
-      select => [Term::ANSIColor::color('red'), Term::ANSIColor::color('reset')],
-      where  => [Term::ANSIColor::color('green'), Term::ANSIColor::color('reset')],
-      from   => [Term::ANSIColor::color('cyan'), Term::ANSIColor::color('reset')],
+      select     => [Term::ANSIColor::color('red'), Term::ANSIColor::color('reset')],
+      where      => [Term::ANSIColor::color('green'), Term::ANSIColor::color('reset')],
+      from       => [Term::ANSIColor::color('cyan'), Term::ANSIColor::color('reset')],
+      join       => [Term::ANSIColor::color('magenta'), Term::ANSIColor::color('reset')],
+      on         => [Term::ANSIColor::color('blue'), Term::ANSIColor::color('reset')],
+      'group by' => [Term::ANSIColor::color('cyan'), Term::ANSIColor::color('reset')],
+      'order by' => [Term::ANSIColor::color('yellow'), Term::ANSIColor::color('reset')],
    };
 };
 
@@ -240,12 +252,11 @@ sub whitespace {
    my ($self, $keyword, $depth) = @_;
 
    my $before = '';
-   my $after  = ' ';
    if (defined $self->indentmap->{lc $keyword}) {
       $before = $self->newline . $self->indent($depth + $self->indentmap->{lc $keyword});
    }
    $before = '' if $depth == 0 and lc $keyword eq 'select';
-   return [$before, $after];
+   return [$before, ' '];
 }
 
 sub indent { ($_[0]->indent_string||'') x ( ( $_[0]->indent_amount || 0 ) * $_[1] ) }
@@ -279,7 +290,7 @@ sub unparse {
     return '(' .
       join(' ',
         map $self->unparse($_, $depth + 2), @{$cdr}) .
-    (_is_select($cdr)?( $self->newline||'' ).$self->indent($depth + 1):'') . ')';
+    (_is_select($cdr)?( $self->newline||'' ).$self->indent($depth + 1):'') . ') ';
   }
   elsif ($car eq 'OR' or $car eq 'AND' or (grep { $car =~ /^ $_ $/xi } @binary_op_keywords ) ) {
     return join (" $car ", map $self->unparse($_, $depth), @{$cdr});