move multop rendering to join_query_parts

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

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 91aee75..327ddfd 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -322,9 +322,7 @@ sub _returning {
   my ($sql, @bind) = $self->render_aqt(
     $self->_expand_maybe_list_expr($f, -ident)
   );
-  return wantarray
-    ? $self->_sqlcase(' returning ') . $sql
-    : ($self->_sqlcase(' returning ').$sql, @bind);
+  return ($self->_sqlcase(' returning ').$sql, @bind);
 }
 
 sub _expand_insert_value {
@@ -540,7 +538,7 @@ sub render_expr {
   my ($sql, @bind) = $self->render_aqt(
     $self->expand_expr($expr, $default_scalar_to)
   );
-  return (wantarray ? ($sql, @bind) : $sql);
+  return ($sql, @bind);
 }
 
 sub _normalize_op {
@@ -1168,24 +1166,21 @@ sub _render_op_in {
 
 sub _render_op_andor {
   my ($self, $op, $args) = @_;
-  my @parts = map [ $self->render_aqt($_) ], @$args;
-  return '' unless @parts;
-  return @{$parts[0]} if @parts == 1;
-  my ($sql, @bind) = $self->join_query_parts(' ',
-    '(', [ $self->join_query_parts(
-           ' '.$self->format_keyword($op).' ',
-           @parts) ],
-    ')');
+  return '' unless @$args;
+  return $self->join_query_parts('', $args->[0]) if @$args == 1;
+  return $self->join_query_parts(
+    ' ' => '(',[  $self->_render_op_multop($op, $args) ], ')'
+  );
 }
 
 sub _render_op_multop {
   my ($self, $op, $args) = @_;
-  my @parts = map [ $self->render_aqt($_) ], @$args;
+  my @parts = @$args;
   return '' unless @parts;
-  return @{$parts[0]} if @parts == 1;
+  return @{[ $self->render_aqt($parts[0])]} if @parts == 1;
   my $join = ($op eq ','
                 ? ', '
-                :  ' '.$self->_sqlcase(join ' ', split '_', $op).' '
+                :  ' '.$self->format_keyword($op).' '
              );
   return $self->join_query_parts($join, @parts);
 }
@@ -1199,29 +1194,29 @@ sub join_query_parts {
          @parts;
   return (
     join($join, map $_->[0], @final),
-    (wantarray ? (map @{$_}[1..$#$_], @final) : ()),
+    (map @{$_}[1..$#$_], @final),
   );
 }
 
 sub _render_unop_paren {
   my ($self, $op, $v) = @_;
-  my ($sql, @bind) = $self->_render_unop_prefix($op, $v);
-  return "(${sql})", @bind;
+  return $self->join_query_parts('',
+    '(', [ $self->_render_unop_prefix($op, $v) ], ')'
+  );
 }
 
 sub _render_unop_prefix {
   my ($self, $op, $v) = @_;
-  my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
-
-  my $op_sql = $self->_sqlcase($op); # join ' ', split '_', $op);
-  return ("${op_sql} ${expr_sql}", @bind);
+  return $self->join_query_parts(' ',
+    $self->_sqlcase($op), $v->[0]
+  );
 }
 
 sub _render_unop_postfix {
   my ($self, $op, $v) = @_;
-  my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
-  my $op_sql = $self->_sqlcase(join ' ', split '_', $op);
-  return ($expr_sql.' '.$op_sql, @bind);
+  return $self->join_query_parts(' ',
+    $v->[0], $self->format_keyword($op),
+  );
 }
 
 # Some databases (SQLite) treat col IN (1, 2) different from
@@ -1305,7 +1300,7 @@ sub _order_by {
 
   my $final_sql = $self->_sqlcase(' order by ').$sql;
 
-  return wantarray ? ($final_sql, @bind) : $final_sql;
+  return ($final_sql, @bind);
 }
 
 # _order_by no longer needs to call this so doesn't but DBIC uses it.
@@ -1648,6 +1643,7 @@ sub AUTOLOAD {
     # This allows us to check for a local, then _form, attr
     my $self = shift;
     my($name) = $AUTOLOAD =~ /.*::(.+)/;
+    puke "AUTOLOAD invoked for method name ${name} and allow_autoload option not set" unless $self->{allow_autoload};
     return $self->generate($name, @_);
 }