X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=354179868664e04a9b28c0df488fc8f92040bbb7;hb=01dfea6020aaf688cd17beee03120b2969baa160;hp=d1f97bd7b8ffc5e39d71d61b4d7ee32c31ea5baf;hpb=ea5fe7e6832bcfd7c1cb5c547bd9d48e52208656;p=dbsrgits%2FSQL-Abstract.git

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index d1f97bd..3541798 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} = {
@@ -264,45 +265,49 @@ sub insert {
   my $data    = shift || return;
   my $options = shift;
 
-  my ($sql, @bind) = do {
-    if (is_literal_value($data)) {
-      $self->render_expr($data);
-    } else {
-      my ($fields, $values) = (
-        ref($data) eq 'HASH' ?
-          ([ sort keys %$data ], [ @{$data}{sort keys %$data} ])
-          : (undef, $data)
-      );
-
-      # no names (arrayref) means can't generate bindtype
-      !($fields) && $self->{bindtype} eq 'columns'
-        && belch "can't do 'columns' bindtype when called with arrayref";
+  my $fields;
 
-      my $fields_sql = ($fields
-        ? ' '.($self->render_expr({ -row => $fields }, '-ident'))[0]
-        : ''
-      );
-      my ($values_sql, @bind) = $self->render_aqt(
-        { -row => [
-            map {
-              local our $Cur_Col_Meta = $fields->[$_];
-              $self->_expand_insert_value($values->[$_])
-            } 0..$#$values
-        ] }
-      );
-      ($fields_sql.' '.$self->_sqlcase('values').' '.$values_sql, @bind);
-    }
-  };
+  my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
 
-  $sql = (join " ", $self->_sqlcase('insert into'), $table).$sql;
+  my @parts = ([ $self->_sqlcase('insert into').' '.$table ]);
+  push @parts, [ $self->render_aqt($f_aqt) ] if $f_aqt;
+  push @parts, [ $self->_sqlcase('values') ], [ $self->render_aqt($v_aqt) ];
 
   if ($options->{returning}) {
-    my ($s, @b) = $self->_insert_returning($options);
-    $sql .= $s;
-    push @bind, @b;
+    push @parts, [ $self->_insert_returning($options) ];
   }
 
-  return wantarray ? ($sql, @bind) : $sql;
+  return $self->_join_parts(' ', @parts);
+}
+
+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
@@ -532,7 +537,10 @@ sub render_aqt {
 
 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 {
@@ -580,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);
 }
@@ -711,29 +724,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 {
@@ -837,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(
@@ -873,6 +892,9 @@ sub _expand_row {
 sub _expand_op {
   my ($self, undef, $args) = @_;
   my ($op, @opargs) = @$args;
+  if (my $exp = $self->{expand_op}{$op}) {
+    return $self->$exp($op, \@opargs);
+  }
   +{ -op => [ $op, map $self->expand_expr($_), @opargs ] };
 }
 
@@ -978,7 +1000,7 @@ sub _expand_in {
     my $opened_sql = $self->_open_outer_paren($sql);
     return +{ -op => [
       $op, $self->expand_expr($k, -ident),
-      [ { -literal => [ $opened_sql, @bind ] } ]
+      { -literal => [ $opened_sql, @bind ] }
     ] };
   }
   my $undef_err =
@@ -997,7 +1019,7 @@ sub _expand_in {
   return +{ -op => [
     $op,
     $self->expand_expr($k, -ident),
-    \@rhs
+    @rhs
   ] };
 }
 
@@ -1060,6 +1082,9 @@ sub _render_row {
 sub _render_func {
   my ($self, $rest) = @_;
   my ($func, @args) = @$rest;
+  if (ref($func) eq 'HASH') {
+    $func = $self->render_aqt($func);
+  }
   my @arg_sql;
   my @bind = map {
     my @x = @$_;
@@ -1142,13 +1167,13 @@ sub _render_op_between {
 
 sub _render_op_in {
   my ($self, $op, $args) = @_;
-  my ($lhs, $rhs) = @$args;
+  my ($lhs, @rhs) = @$args;
   my @in_bind;
   my @in_sql = map {
     my ($sql, @bind) = $self->render_aqt($_);
     push @in_bind, @bind;
     $sql;
-  } @$rhs;
+  } @rhs;
   my ($lhsql, @lbind) = $self->render_aqt($lhs);
   return (
     $lhsql.' '.$self->_sqlcase(join ' ', split '_', $op).' ( '
@@ -1183,7 +1208,7 @@ sub _join_parts {
   my ($self, $join, @parts) = @_;
   return (
     join($join, map $_->[0], @parts),
-    map @{$_}[1..$#$_], @parts
+    (wantarray ? (map @{$_}[1..$#$_], @parts) : ()),
   );
 }
 
@@ -1248,6 +1273,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;
@@ -1333,6 +1361,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