X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=63534908ccc48e235680efb1a313c912dd217170;hb=a7a125f7b84eb0620905e1bd1f3ab571ef112452;hp=35a971d1b0776edac17f33105302de07567864aa;hpb=bd00b85c552ca9b51d06de615a669725dd3e69af;p=dbsrgits%2FSQL-Abstract.git

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 35a971d..6353490 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -208,6 +208,7 @@ sub new {
     (map +($_ => '_expand_op_is'), ('is', 'is_not')),
     ident => '_expand_ident',
     value => '_expand_value',
+    func => '_expand_func',
   };
 
   $opt{expand_op} = {
@@ -269,17 +270,14 @@ sub insert {
   my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
 
   my @parts = ([ $self->_sqlcase('insert into').' '.$table ]);
-  push @parts, [ $self->render_aqt($f_aqt) ] if $f_aqt;
-  push @parts, [ $self->render_aqt($v_aqt) ];
-  $parts[-1][0] =~ s/^/VALUES /;
+  push @parts, $self->render_aqt($f_aqt) if $f_aqt;
+  push @parts, [ $self->_sqlcase('values') ], $self->render_aqt($v_aqt);
 
   if ($options->{returning}) {
     push @parts, [ $self->_insert_returning($options) ];
   }
 
-  my ($sql, @bind) = $self->_join_parts(' ', @parts);
-
-  return wantarray ? ($sql, @bind) : $sql;
+  return $self->join_query_parts(' ', @parts);
 }
 
 sub _expand_insert_values {
@@ -321,12 +319,10 @@ sub _returning {
 
   my $f = $options->{returning};
 
-  my ($sql, @bind) = $self->render_aqt(
+  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 {
@@ -394,13 +390,13 @@ sub update {
 sub _update_set_values {
   my ($self, $data) = @_;
 
-  return $self->render_aqt(
-    $self->_expand_update_set_values($data),
-  );
+  return @{ $self->render_aqt(
+    $self->_expand_update_set_values(undef, $data),
+  ) };
 }
 
 sub _expand_update_set_values {
-  my ($self, $data) = @_;
+  my ($self, undef, $data) = @_;
   $self->_expand_maybe_list_expr( [
     map {
       my ($k, $set) = @$_;
@@ -456,9 +452,9 @@ sub select {
 sub _select_fields {
   my ($self, $fields) = @_;
   return $fields unless ref($fields);
-  return $self->render_aqt(
+  return @{ $self->render_aqt(
     $self->_expand_maybe_list_expr($fields, '-ident')
-  );
+  ) };
 }
 
 #======================================================================
@@ -532,14 +528,16 @@ sub render_aqt {
   die "No" if @rest;
   die "Not a node type: $k" unless $k =~ s/^-//;
   if (my $meth = $self->{render}{$k}) {
-    return $self->$meth($v);
+    return [ $self->$meth($k, $v) ];
   }
   die "notreached: $k";
 }
 
 sub render_expr {
   my ($self, $expr, $default_scalar_to) = @_;
-  $self->render_aqt($self->expand_expr($expr, $default_scalar_to));
+  return @{ $self->render_aqt(
+    $self->expand_expr($expr, $default_scalar_to)
+  ) };
 }
 
 sub _normalize_op {
@@ -587,6 +585,11 @@ sub _expand_hashpair {
   }
   if ($k =~ /^-/) {
     return $self->_expand_hashpair_op($k, $v);
+  } elsif ($k =~ /^[^\w]/i) {
+    my ($lhs, @rhs) = @$v;
+    return $self->_expand_op(
+      -op, [ $k, $self->expand_expr($lhs, -ident), @rhs ]
+    );
   }
   return $self->_expand_hashpair_ident($k, $v);
 }
@@ -718,29 +721,29 @@ sub _expand_hashpair_op {
     return { $k => $v };
   }
 
-  # hashref RHS values get expanded and used as op/func args
+  my $type = $self->{unknown_unop_always_func} ? -func : -op;
 
-  if (
-    ref($v) eq 'HASH'
-    and keys %$v == 1
-    and (keys %$v)[0] =~ /^-/
-  ) {
-    my ($func) = $k =~ /^-(.*)$/;
-    { # Old SQLA compat
-      if (List::Util::first { $func =~ $_->{regex} } @{$self->{special_ops}}) {
-        return +{ -op => [ $func, $self->_expand_expr($v) ] };
-      }
-    }
-    return +{ -func => [ $func, $self->_expand_expr($v) ] };
-  }
-
-  # scalars and literals get simply expanded
+  { # Old SQLA compat
 
-  if (!ref($v) or is_literal_value($v)) {
-    return +{ -op => [ $op, $self->_expand_expr($v) ] };
+    if (
+      ref($v) eq 'HASH'
+      and keys %$v == 1
+      and (keys %$v)[0] =~ /^-/
+    ) {
+      $type = (
+        (List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}})
+          ? -op
+          : -func
+      )
+    }
   }
 
-  die "notreached";
+  return +{ $type => [
+    $op,
+    ($type eq -func and ref($v) eq 'ARRAY')
+      ? map $self->_expand_expr($_), @$v
+      : $self->_expand_expr($v)
+  ] };
 }
 
 sub _expand_hashpair_cmp {
@@ -844,6 +847,12 @@ sub _dwim_op_to_is {
   puke(sprintf $fail, $op);
 }
 
+sub _expand_func {
+  my ($self, undef, $args) = @_;
+  my ($func, @args) = @$args;
+  return { -func => [ $func, map $self->expand_expr($_), @args ] };
+}
+
 sub _expand_ident {
   my ($self, undef, $body, $k) = @_;
   return $self->_expand_hashpair_cmp(
@@ -1043,7 +1052,7 @@ sub _recurse_where {
 
   # dispatch expanded expression
 
-  my ($sql, @bind) = defined($where_exp) ? $self->render_aqt($where_exp) : (undef);
+  my ($sql, @bind) = defined($where_exp) ? @{ $self->render_aqt($where_exp) } : (undef);
   # DBIx::Class used to call _recurse_where in scalar context
   # something else might too...
   if (wantarray) {
@@ -1056,42 +1065,41 @@ sub _recurse_where {
 }
 
 sub _render_ident {
-  my ($self, $ident) = @_;
+  my ($self, undef, $ident) = @_;
 
   return $self->_convert($self->_quote($ident));
 }
 
 sub _render_row {
-  my ($self, $values) = @_;
-  my ($sql, @bind) = $self->_render_op([ ',', @$values ]);
-  return "($sql)", @bind;  
+  my ($self, undef, $values) = @_;
+  my ($sql, @bind) = $self->_render_op(undef, [ ',', @$values ]);
+  return $self->join_query_parts('', [ '(' ], [ $sql, @bind ], [ ')' ]);
 }
 
 sub _render_func {
-  my ($self, $rest) = @_;
+  my ($self, undef, $rest) = @_;
   my ($func, @args) = @$rest;
-  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 {
-  my ($self,  $bind) = @_;
+  my ($self, undef, $bind) = @_;
   return ($self->_convert('?'), $self->_bindtype(@$bind));
 }
 
 sub _render_literal {
-  my ($self, $literal) = @_;
+  my ($self, undef, $literal) = @_;
   $self->_assert_bindval_matches_bindtype(@{$literal}[1..$#$literal]);
   return @$literal;
 }
 
 sub _render_op {
-  my ($self, $v) = @_;
+  my ($self, undef, $v) = @_;
   my ($op, @args) = @$v;
   if (my $r = $self->{render_op}{$op}) {
     return $self->$r($op, \@args);
@@ -1128,94 +1136,86 @@ 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->format_keyword('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, ')',
   );
 }
 
 sub _render_op_in {
   my ($self, $op, $args) = @_;
   my ($lhs, @rhs) = @$args;
-  my @in_bind;
-  my @in_sql = map {
-    my ($sql, @bind) = $self->render_aqt($_);
-    push @in_bind, @bind;
-    $sql;
-  } @rhs;
-  my ($lhsql, @lbind) = $self->render_aqt($lhs);
-  return (
-    $lhsql.' '.$self->_sqlcase(join ' ', split '_', $op).' ( '
-    .join(', ', @in_sql)
-    .' )',
-    @lbind, @in_bind
+
+  return $self->join_query_parts(' ',
+    $lhs,
+    $self->format_keyword($op),
+    '(',
+    [ $self->join_query_parts(', ', @rhs) ],
+    ')'
   );
 }
 
 sub _render_op_andor {
   my ($self, $op, $args) = @_;
-  my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
-  return '' unless @parts;
-  return @{$parts[0]} if @parts == 1;
-  my ($sql, @bind) = $self->_join_parts(' '.$self->_sqlcase($op).' ', @parts);
-  return '( '.$sql.' )', @bind;
+  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 = grep length($_->[0]), 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_parts($join, @parts);
+  return $self->join_query_parts($join, @parts);
 }
 
-sub _join_parts {
+sub join_query_parts {
   my ($self, $join, @parts) = @_;
+  my @final = map +(
+    ref($_) eq 'HASH'
+      ? $self->render_aqt($_)
+      : ref($_) eq 'ARRAY' ? $_ : [ $_ ]),
+         @parts;
   return (
-    join($join, map $_->[0], @parts),
-    map @{$_}[1..$#$_], @parts
+    join($join, map $_->[0], @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
@@ -1293,13 +1293,13 @@ sub _order_by {
 
   return '' unless defined(my $expanded = $self->_expand_order_by($arg));
 
-  my ($sql, @bind) = $self->render_aqt($expanded);
+  my ($sql, @bind) = @{ $self->render_aqt($expanded) };
 
   return '' unless length($sql);
 
   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.
@@ -1315,7 +1315,7 @@ sub _order_by_chunks {
 sub _chunkify_order_by {
   my ($self, $expanded) = @_;
 
-  return grep length, $self->render_aqt($expanded)
+  return grep length, @{ $self->render_aqt($expanded) }
     if $expanded->{-ident} or @{$expanded->{-literal}||[]} == 1;
 
   for ($expanded) {
@@ -1323,7 +1323,7 @@ sub _chunkify_order_by {
       my ($comma, @list) = @{$_->{-op}};
       return map $self->_chunkify_order_by($_), @list;
     }
-    return [ $self->render_aqt($_) ];
+    return $self->render_aqt($_);
   }
 }
 
@@ -1336,7 +1336,7 @@ sub _table  {
   my $from = shift;
   ($self->render_aqt(
     $self->_expand_maybe_list_expr($from, -ident)
-  ))[0];
+  ))->[0];
 }
 
 
@@ -1458,6 +1458,7 @@ sub _sqlcase {
   return $_[0]->{case} ? $_[1] : uc($_[1]);
 }
 
+sub format_keyword { $_[0]->_sqlcase(join ' ', split '_', $_[1]) }
 
 #======================================================================
 # DISPATCHING FROM REFKIND
@@ -1641,6 +1642,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, @_);
 }