X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=2ef8f4e5e8a52a604c8190e17085bd7d6f9b246c;hb=a1f8b6efc03e9f71c39835fe9ae083fc3e386904;hp=094c25481142352f2c19498bbeb7489f6b597147;hpb=438b8c7ce54e8d97baca64ec3985696403894dec;p=dbsrgits%2FSQL-Abstract.git

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 094c254..2ef8f4e 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} = {
@@ -266,47 +267,47 @@ sub insert {
 
   my $fields;
 
-  my ($f_aqt, $v_aqt) = do {
-    if (is_literal_value($data)) {
-      (undef, $self->expand_expr($data));
-    } else {
-      my ($fields, $values) = (
-        ref($data) eq 'HASH' ?
-          ([ sort keys %$data ], [ @{$data}{sort keys %$data} ])
-          : ([], $data)
-      );
-
-      # no names (arrayref) means can't generate bindtype
-      !($fields) && $self->{bindtype} eq 'columns'
-        && belch "can't do 'columns' bindtype when called with arrayref";
-
-      +(
-        (@$fields
-          ? $self->expand_expr({ -row => $fields }, -ident)
-          : undef
-        ),
-        +{ -row => [
-          map {
-           local our $Cur_Col_Meta = $fields->[$_];
-           $self->_expand_insert_value($values->[$_])
-           } 0..$#$values
-        ] },
-      );
-    }
-  };
+  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->_sqlcase('values') ], [ $self->render_aqt($v_aqt) ];
 
   if ($options->{returning}) {
     push @parts, [ $self->_insert_returning($options) ];
   }
 
-  my ($sql, @bind) = $self->_join_parts(' ', @parts);
+  return $self->join_query_parts(' ', @parts);
+}
 
-  return wantarray ? ($sql, @bind) : $sql;
+sub _expand_insert_values {
+  my ($self, $data) = @_;
+  if (is_literal_value($data)) {
+    (undef, $self->expand_expr($data));
+  } else {
+    my ($fields, $values) = (
+      ref($data) eq 'HASH' ?
+        ([ sort keys %$data ], [ @{$data}{sort keys %$data} ])
+        : ([], $data)
+    );
+
+    # no names (arrayref) means can't generate bindtype
+    !($fields) && $self->{bindtype} eq 'columns'
+      && belch "can't do 'columns' bindtype when called with arrayref";
+
+    +(
+      (@$fields
+        ? $self->expand_expr({ -row => $fields }, -ident)
+        : undef
+      ),
+      +{ -row => [
+        map {
+         local our $Cur_Col_Meta = $fields->[$_];
+         $self->_expand_insert_value($values->[$_])
+         } 0..$#$values
+      ] },
+    );
+  }
 }
 
 # So that subclasses can override INSERT ... RETURNING separately from
@@ -392,12 +393,12 @@ sub _update_set_values {
   my ($self, $data) = @_;
 
   return $self->render_aqt(
-    $self->_expand_update_set_values($data),
+    $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) = @$_;
@@ -529,14 +530,17 @@ 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));
+  my ($sql, @bind) = $self->render_aqt(
+    $self->expand_expr($expr, $default_scalar_to)
+  );
+  return (wantarray ? ($sql, @bind) : $sql);
 }
 
 sub _normalize_op {
@@ -584,6 +588,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);
 }
@@ -715,29 +724,29 @@ sub _expand_hashpair_op {
     return { $k => $v };
   }
 
-  # hashref RHS values get expanded and used as op/func args
-
-  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) ] };
-  }
+  my $type = $self->{unknown_unop_always_func} ? -func : -op;
 
-  # 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 {
@@ -841,6 +850,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(
@@ -1053,20 +1068,23 @@ 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 ]);
+  my ($self, undef, $values) = @_;
+  my ($sql, @bind) = $self->_render_op(undef, [ ',', @$values ]);
   return "($sql)", @bind;  
 }
 
 sub _render_func {
-  my ($self, $rest) = @_;
+  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 = @$_;
@@ -1077,18 +1095,18 @@ sub _render_func {
 }
 
 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);
@@ -1167,30 +1185,32 @@ sub _render_op_in {
 
 sub _render_op_andor {
   my ($self, $op, $args) = @_;
-  my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+  my @parts = map [ $self->render_aqt($_) ], @$args;
   return '' unless @parts;
   return @{$parts[0]} if @parts == 1;
-  my ($sql, @bind) = $self->_join_parts(' '.$self->_sqlcase($op).' ', @parts);
+  my ($sql, @bind) = $self->join_query_parts(' '.$self->_sqlcase($op).' ', @parts);
   return '( '.$sql.' )', @bind;
 }
 
 sub _render_op_multop {
   my ($self, $op, $args) = @_;
-  my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+  my @parts = map [ $self->render_aqt($_) ], @$args;
   return '' unless @parts;
   return @{$parts[0]} if @parts == 1;
   my $join = ($op eq ','
                 ? ', '
                 :  ' '.$self->_sqlcase(join ' ', split '_', $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($_) ] : $_),
+                @parts;
   return (
-    join($join, map $_->[0], @parts),
-    map @{$_}[1..$#$_], @parts
+    join($join, map $_->[0], @final),
+    (wantarray ? (map @{$_}[1..$#$_], @final) : ()),
   );
 }
 
@@ -1255,6 +1275,9 @@ sub _expand_order_by {
 
   return unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg);
 
+  return $self->_expand_maybe_list_expr($arg)
+    if ref($arg) eq 'HASH' and ($arg->{-op}||[''])->[0] eq ',';
+
   my $expander = sub {
     my ($self, $dir, $expr) = @_;
     my @to_expand = ref($expr) eq 'ARRAY' ? @$expr : $expr;
@@ -1340,6 +1363,10 @@ sub _table  {
 
 sub _expand_maybe_list_expr {
   my ($self, $expr, $default) = @_;
+  return { -op => [
+    ',', map $self->expand_expr($_, $default), 
+          @{$expr->{-op}}[1..$#{$expr->{-op}}]
+  ] } if ref($expr) eq 'HASH' and ($expr->{-op}||[''])->[0] eq ',';
   return +{ -op => [ ',',
     map $self->expand_expr($_, $default),
       ref($expr) eq 'ARRAY' ? @$expr : $expr