tidy up as/alias expansion

[scpubgit/Q-Branch.git] / lib / SQL / Abstract / ExtraClauses.pm

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index adb9f10..9c27845 100644 (file)
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -167,6 +167,7 @@ sub _expand_from_list {
     }
     push @list, $aqt;
   }
+  return $list[0] if @list == 1;
   return { -from_list => \@list };
 }
 
@@ -191,7 +192,6 @@ sub _expand_join {
   my %ret = (
     type => delete $proto{type},
     to => $self->expand_expr({ -from_list => delete $proto{to} }, -ident)
-               ->{-from_list}[0]
   );
   %ret = (%ret,
     map +($_ => $self->expand_expr($proto{$_}, -ident)),
@@ -214,7 +214,8 @@ sub _render_join {
     (map +($_->{-ident} || $_->{-as}
       ? $_
       : ('(', $self->render_aqt($_, 1), ')')),
-        $args->{to}
+        map +(@{$_->{-from_list}||[]} == 1 ? $_->{-from_list}[0] : $_),
+          $args->{to}
     ),
     ($args->{on} ? (
       { -keyword => 'on' },
@@ -232,11 +233,11 @@ sub _expand_op_as {
   my ($self, undef, $vv, $k) = @_;
   my @vv = (ref($vv) eq 'ARRAY' ? @$vv : $vv);
   my $ik = $self->expand_expr($k, -ident);
-  return +{ -as => [ $ik, $self->expand_expr($vv[0], -alias) ] }
+  return +{ -as => [ $ik, $self->expand_expr($vv[0], -ident) ] }
     if @vv == 1 and ref($vv[0]) eq 'HASH';
 
   my @as = map $self->expand_expr($_, -ident), @vv;
-  return { -as => [ $ik, { -alias => \@as } ] };
+  return { -as => [ $ik, $self->expand_expr({ -alias => \@as }) ] };
 }
 
 sub _render_as {
@@ -287,11 +288,10 @@ sub _expand_alias {
   if (ref($args) eq 'HASH' and my $alias = $args->{-alias}) {
     $args = $alias;
   }
-  +{ -alias => [
-      map $self->expand_expr($_, -ident),
-      ref($args) eq 'ARRAY' ? @{$args} : $args
-    ]
-  }
+  my @parts = map $self->expand_expr($_, -ident),
+                ref($args) eq 'ARRAY' ? @{$args} : $args;
+  return $parts[0] if @parts == 1;
+  return { -alias => \@parts };
 }
 
 sub _expand_with {
@@ -428,12 +428,7 @@ as a list of arguments for the alias node.
   { foo => { -as => 'bar' } }
 
   # aqt
-  { -as =>
-      [
-        { -ident => [ 'foo' ] },
-        { -alias => [ { -ident => [ 'bar' ] } ] },
-      ]
-  }
+  { -as => [ { -ident => [ 'foo' ] }, { -ident => [ 'bar' ] } ] }
 
   # query
   foo AS bar
@@ -517,18 +512,18 @@ with the next element; this is easiest if I show you:
   ] }
 
   # aqt
-  { -from_list => [ { -join => {
-          from => { -as => [
-              { -ident => [ 't1' ] },
-              { -alias => [ { -ident => [ 'table_one' ] } ] },
-          ] },
-          on => { -op => [
-              '=', { -ident => [ 'table_one', 'x' ] },
-              { -ident => [ 't2', 'x' ] },
-          ] },
-          to => { -ident => [ 't2' ] },
-          type => undef,
-  } } ] }
+  { -join => {
+      from =>
+        {
+          -as => [ { -ident => [ 't1' ] }, { -ident => [ 'table_one' ] } ]
+        },
+      on => { -op => [
+          '=', { -ident => [ 'table_one', 'x' ] },
+          { -ident => [ 't2', 'x' ] },
+      ] },
+      to => { -ident => [ 't2' ] },
+      type => undef,
+  } }
 
   # query
   t1 AS table_one JOIN t2 ON table_one.x = t2.x
@@ -542,18 +537,16 @@ Or with using:
   }
 
   # aqt
-  { -from_list => [ { -join => {
-          from => { -as => [
-              { -ident => [ 't1' ] },
-              { -alias => [ { -ident => [ 'table_one' ] } ] },
-          ] },
-          to => { -ident => [ 't2' ] },
-          type => undef,
-          using =>
-            {
-              -op => [ 'or', { -op => [ 'or', { -ident => [ 'x' ] } ] } ]
-            },
-  } } ] }
+  { -join => {
+      from =>
+        {
+          -as => [ { -ident => [ 't1' ] }, { -ident => [ 'table_one' ] } ]
+        },
+      to => { -ident => [ 't2' ] },
+      type => undef,
+      using =>
+        { -op => [ 'or', { -op => [ 'or', { -ident => [ 'x' ] } ] } ] },
+  } }
 
   # query
   t1 AS table_one JOIN t2 USING ( x )
@@ -568,15 +561,15 @@ With oddities:
   ] }
 
   # aqt
-  { -from_list => [ { -join => {
-          from => { -ident => [ 'x' ] },
-          to => { -join => {
-              from => { -ident => [ 'y' ] },
-              to => { -ident => [ 'z' ] },
-              type => 'left',
-          } },
+  { -join => {
+      from => { -ident => [ 'x' ] },
+      to => { -join => {
+          from => { -ident => [ 'y' ] },
+          to => { -ident => [ 'z' ] },
           type => 'left',
-  } } ] }
+      } },
+      type => 'left',
+  } }
 
   # query
   x LEFT JOIN ( y LEFT JOIN z )