make join_query_parts handle scalars

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

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 2ef8f4e..b658243 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -1076,22 +1076,18 @@ sub _render_ident {
 sub _render_row {
   my ($self, undef, $values) = @_;
   my ($sql, @bind) = $self->_render_op(undef, [ ',', @$values ]);
-  return "($sql)", @bind;  
+  return $self->join_query_parts('', [ '(' ], [ $sql, @bind ], [ ')' ]);
 }
 
 sub _render_func {
   my ($self, undef, $rest) = @_;
   my ($func, @args) = @$rest;
-  if (ref($func) eq 'HASH') {
-    $func = $self->render_aqt($func);
-  }
-  my @arg_sql;
-  my @bind = map {
-    my @x = @$_;
-    push @arg_sql, shift @x;
-    @x
-  } map [ $self->render_aqt($_) ], @args;
-  return ($self->_sqlcase($func).'('.join(', ', @arg_sql).')', @bind);
+  return $self->join_query_parts('',
+    [ $self->_sqlcase($func) ],
+    [ '(' ],
+    [ $self->join_query_parts(', ', @args) ],
+    [ ')' ]
+  );
 }
 
 sub _render_bind {
@@ -1143,25 +1139,22 @@ sub _render_op {
 sub _render_op_between {
   my ($self, $op, $args) = @_;
   my ($left, $low, $high) = @$args;
-  my ($rhsql, @rhbind) = do {
+  my @rh = do {
     if (@$args == 2) {
       puke "Single arg to between must be a literal"
         unless $low->{-literal};
-      @{$low->{-literal}}
+      $low;
     } else {
-      my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high;
-      (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
-       @{$l}[1..$#$l], @{$h}[1..$#$h])
+      +($low, [ $self->_sqlcase('and') ], $high);
     }
   };
   my ($lhsql, @lhbind) = $self->render_aqt($left);
-  return (
-    join(' ',
-      '(', $lhsql,
-       $self->_sqlcase(join ' ', split '_', $op),
-      $rhsql, ')'
-    ),
-    @lhbind, @rhbind
+  return $self->join_query_parts(' ',
+    [ '(' ],
+    $left,
+    [ $self->format_keyword($op) ],
+    @rh,
+    [ ')' ],
   );
 }
 
@@ -1206,8 +1199,11 @@ sub _render_op_multop {
 
 sub join_query_parts {
   my ($self, $join, @parts) = @_;
-  my @final = map +(ref($_) eq 'HASH' ? [ $self->render_aqt($_) ] : $_),
-                @parts;
+  my @final = map +(
+    ref($_) eq 'HASH'
+      ? [ $self->render_aqt($_) ]
+      : ref($_) eq 'ARRAY' ? $_ : [ $_ ]),
+         @parts;
   return (
     join($join, map $_->[0], @final),
     (wantarray ? (map @{$_}[1..$#$_], @final) : ()),
@@ -1475,6 +1471,7 @@ sub _sqlcase {
   return $_[0]->{case} ? $_[1] : uc($_[1]);
 }
 
+sub format_keyword { $_[0]->_sqlcase(join ' ', split '_', $_[1]) }
 
 #======================================================================
 # DISPATCHING FROM REFKIND