X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=fb62c50a23133d6d3fbb92a03d0de0375fa73fe1;hb=eb01327ff51e2fe087f0571f0ba54c7173bbfbe1;hp=26148055288bf34fc4b9224698bf88dfbdca8936;hpb=232bece6850e4524d1b4356641f57ad53eee9f8b;p=dbsrgits%2FSQL-Abstract.git

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 2614805..fb62c50 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -184,11 +184,6 @@ sub new {
     ^ \s* go \s
   /xmi;
 
-  $opt{render} = {
-    (map +("-$_", "_render_$_"), qw(op func bind ident literal list)),
-    %{$opt{render}||{}}
-  };
-
   $opt{expand_unary} = {};
 
   $opt{expand} = {
@@ -196,10 +191,36 @@ sub new {
     -value => '_expand_value',
     -not => '_expand_not',
     -bool => '_expand_bool',
-    -and => '_expand_andor',
-    -or => '_expand_andor',
+    -and => '_expand_op_andor',
+    -or => '_expand_op_andor',
+    -nest => '_expand_nest',
+  };
+
+  $opt{expand_op} = {
+    'between' => '_expand_between',
+    'not between' => '_expand_between',
+    'in' => '_expand_in',
+    'not in' => '_expand_in',
+    (map +($_ => sub {
+      my ($self, $op, $arg, $k) = @_;
+      return +{ -op => [
+        $self->{cmp},
+        $self->_expand_ident(-ident => $k),
+        $self->_expand_expr({ '-'.$op => $arg }),
+      ] };
+    }), qw(ident value)),
+    'nest' => '_expand_nest',
+    (map +($_ => '_expand_op_andor'),
+      qw(and or)),
   };
 
+  $opt{render} = {
+    (map +("-$_", "_render_$_"), qw(op func bind ident literal list)),
+    %{$opt{render}||{}}
+  };
+
+  $opt{render_op} = our $RENDER_OP;
+
   return bless \%opt, $class;
 }
 
@@ -534,14 +555,13 @@ sub render_expr {
 }
 
 sub _expand_expr {
-  my ($self, $expr, $logic) = @_;
+  my ($self, $expr) = @_;
   our $Expand_Depth ||= 0; local $Expand_Depth = $Expand_Depth + 1;
   return undef unless defined($expr);
   if (ref($expr) eq 'HASH') {
     return undef unless my $kc = keys %$expr;
     if ($kc > 1) {
-      $logic ||= 'and';
-      return $self->_expand_andor("-${logic}", $expr);
+      return $self->_expand_op_andor(-and => $expr);
     }
     my ($key, $value) = %$expr;
     if ($key =~ /^-/ and $key =~ s/ [_\s]? \d+ $//x ) {
@@ -551,11 +571,11 @@ sub _expand_expr {
     if (my $exp = $self->{expand}{$key}) {
       return $self->$exp($key, $value);
     }
-    return $self->_expand_expr_hashpair($key, $value, $logic);
+    return $self->_expand_expr_hashpair($key, $value);
   }
   if (ref($expr) eq 'ARRAY') {
-    my $logic = lc($logic || $self->{logic});
-    return $self->_expand_andor("-${logic}", $expr);
+    my $logic = '-'.lc($self->{logic});
+    return $self->_expand_op_andor($logic, $expr);
   }
   if (my $literal = is_literal_value($expr)) {
     return +{ -literal => $literal };
@@ -570,7 +590,7 @@ sub _expand_expr {
 }
 
 sub _expand_expr_hashpair {
-  my ($self, $k, $v, $logic) = @_;
+  my ($self, $k, $v) = @_;
   unless (defined($k) and length($k)) {
     if (defined($k) and my $literal = is_literal_value($v)) {
       belch 'Hash-pairs consisting of an empty string with a literal are deprecated, and will be removed in 2.0: use -and => [ $literal ] instead';
@@ -578,26 +598,12 @@ sub _expand_expr_hashpair {
     }
     puke "Supplying an empty left hand side argument is not supported";
   }
+  $self->_assert_pass_injection_guard($k =~ /^-(.*)$/s) if $k =~ /^-/;
   if ($k =~ /^-/) {
-    $self->_assert_pass_injection_guard($k =~ /^-(.*)$/s);
-    if ($k eq '-nest') {
-      # DBIx::Class requires a nest warning to be emitted once but the private
-      # method it overrode to do so no longer exists
-      if ($self->{is_dbic_sqlmaker}) {
-        unless (our $Nest_Warned) {
-          belch(
-            "-nest in search conditions is deprecated, you most probably wanted:\n"
-            .q|{..., -and => [ \%cond0, \@cond1, \'cond2', \[ 'cond3', [ col => bind ] ], etc. ], ... }|
-          );
-          $Nest_Warned = 1;
-        }
-      }
-      return $self->_expand_expr($v);
-    }
     if (my ($rest) = $k =~/^-not[_ ](.*)$/) {
       return +{ -op => [
         'not',
-        $self->_expand_expr({ "-${rest}", $v }, $logic)
+        $self->_expand_expr({ "-${rest}", $v })
       ] };
     }
     {
@@ -661,11 +667,10 @@ sub _expand_expr_hashpair {
   }
   if (ref($v) eq 'HASH') {
     if (keys %$v > 1) {
-      return { -op => [
-        'and',
-        map $self->_expand_expr({ $k => { $_ => $v->{$_} } }),
+      return $self->_expand_op_andor(-and => [
+        map +{ $k => { $_ => $v->{$_} } },
           sort keys %$v
-      ] };
+      ]);
     }
     return undef unless keys %$v;
     my ($vk, $vv) = %$v;
@@ -675,69 +680,12 @@ sub _expand_expr_hashpair {
       belch 'Use of [and|or|nest]_N modifiers is deprecated and will be removed in SQLA v2.0. '
           . "You probably wanted ...-and => [ -$op => COND1, -$op => COND2 ... ]";
     }
-    if ($op =~ /^(?:not )?between$/) {
+    if (my $x = $self->{expand_op}{$op}) {
       local our $Cur_Col_Meta = $k;
-      my @rhs = map $self->_expand_expr($_),
-                  ref($vv) eq 'ARRAY' ? @$vv : $vv;
-      unless (
-        (@rhs == 1 and ref($rhs[0]) eq 'HASH' and $rhs[0]->{-literal})
-        or
-        (@rhs == 2 and defined($rhs[0]) and defined($rhs[1]))
-      ) {
-        puke "Operator '${\uc($op)}' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref";
-      }
-      return +{ -op => [
-        $op,
-        $self->_expand_ident(-ident => $k),
-        @rhs
-      ] }
-    }
-    if ($op =~ /^(?:not )?in$/) {
-      if (my $literal = is_literal_value($vv)) {
-        my ($sql, @bind) = @$literal;
-        my $opened_sql = $self->_open_outer_paren($sql);
-        return +{ -op => [
-          $op, $self->_expand_ident(-ident => $k),
-          [ { -literal => [ $opened_sql, @bind ] } ]
-        ] };
-      }
-      my $undef_err =
-        'SQL::Abstract before v1.75 used to generate incorrect SQL when the '
-      . "-${\uc($op)} operator was given an undef-containing list: !!!AUDIT YOUR CODE "
-      . 'AND DATA!!! (the upcoming Data::Query-based version of SQL::Abstract '
-      . 'will emit the logically correct SQL instead of raising this exception)'
-      ;
-      puke("Argument passed to the '${\uc($op)}' operator can not be undefined")
-        if !defined($vv);
-      my @rhs = map $self->_expand_expr($_),
-                  map { ref($_) ? $_ : { -bind => [ $k, $_ ] } }
-                  map { defined($_) ? $_: puke($undef_err) }
-                    (ref($vv) eq 'ARRAY' ? @$vv : $vv);
-      return $self->${\($op =~ /^not/ ? 'sqltrue' : 'sqlfalse')} unless @rhs;
-
-      return +{ -op => [
-        $op,
-        $self->_expand_ident(-ident => $k),
-        \@rhs
-      ] };
+      return $self->$x($op, $vv, $k);
     }
-    if ($op eq 'ident') {
-      if (! defined $vv or (ref($vv) and ref($vv) eq 'ARRAY')) {
-        puke "-$op requires a single plain scalar argument (a quotable identifier) or an arrayref of identifier parts";
-      }
-      return +{ -op => [
-        $self->{cmp},
-        $self->_expand_ident(-ident => $k),
-        $self->_expand_ident(-ident => $vv),
-      ] };
-    }
-    if ($op eq 'value') {
+    if ($op eq 'value' and not defined($vv)) {
       return $self->_expand_expr({ $k, undef }) unless defined($vv);
-      return +{ -op => [
-        $self->{cmp},
-        $self->_expand_ident(-ident => $k),
-        { -bind => [ $k, $vv ] }
-      ] };
     }
     if ($op =~ /^is(?: not)?$/) {
       puke "$op can only take undef as argument"
@@ -749,15 +697,6 @@ sub _expand_expr_hashpair {
            );
       return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] };
     }
-    if ($op =~ /^(and|or)$/) {
-      if (ref($vv) eq 'HASH') {
-        return +{ -op => [
-          $op,
-          map $self->_expand_expr({ $k, { $_ => $vv->{$_} } }),
-            sort keys %$vv
-        ] };
-      }
-    }
     if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}) {
       return { -op => [ $op, $self->_expand_ident(-ident => $k), $vv ] };
     }
@@ -794,11 +733,10 @@ sub _expand_expr_hashpair {
         : $op =~ $self->{not_like_op}   ? belch("Supplying an empty arrayref to '@{[ uc $op]}' is deprecated") && $self->sqltrue
         : puke "operator '$op' applied on an empty array (field '$k')";
       }
-      return +{ -op => [
-        $logic =~ /^-(.*)$/,
-        map $self->_expand_expr({ $k => { $vk => $_ } }),
+      return $self->_expand_op_andor($logic => [
+        map +{ $k => { $vk => $_ } },
           @values
-      ] };
+      ]);
     }
     if (
       !defined($vv)
@@ -827,14 +765,14 @@ sub _expand_expr_hashpair {
   if (ref($v) eq 'ARRAY') {
     return $self->sqlfalse unless @$v;
     $self->_debug("ARRAY($k) means distribute over elements");
-    my $this_logic = lc(
+    my $logic = lc(
       $v->[0] =~ /^-(and|or)$/i
         ? shift(@{$v = [ @$v ]})
-        : '-'.($self->{logic} || 'or')
+        : '-'.lc($self->{logic} || 'OR')
+    );
+    return $self->_expand_op_andor(
+      $logic => [ map +{ $k => $_ }, @$v ]
     );
-    return $self->_expand_expr({
-      $this_logic => [ map +{ $k => $_ }, @$v ]
-    });
   }
   if (my $literal = is_literal_value($v)) {
     unless (length $k) {
@@ -853,7 +791,10 @@ sub _expand_expr_hashpair {
 }
 
 sub _expand_ident {
-  my ($self, undef, $body) = @_;
+  my ($self, $op, $body) = @_;
+  unless (defined($body) or (ref($body) and ref($body) eq 'ARRAY')) {
+    puke "$op requires a single plain scalar argument (a quotable identifier) or an arrayref of identifier parts";
+  }
   my @parts = map split(/\Q${\($self->{name_sep}||'.')}\E/, $_),
                 ref($body) ? @$body : $body;
   return { -ident => $parts[-1] } if $self->{_dequalify_idents};
@@ -880,18 +821,22 @@ sub _expand_bool {
   return $self->_expand_ident(-ident => $v);
 }
 
-sub _expand_andor {
-  my ($self, $k, $v) = @_;
-  my ($logic) = $k =~ /^-(.*)$/;
+sub _expand_op_andor {
+  my ($self, $logic, $v, $k) = @_;
+  if (defined $k) {
+    $v = [ map +{ $k, { $_ => $v->{$_} } },
+             sort keys %$v ];
+  }
+  my ($logop) = $logic =~ /^-?(.*)$/;
   if (ref($v) eq 'HASH') {
     return +{ -op => [
-      $logic,
-      map $self->_expand_expr({ $_ => $v->{$_} }, $logic),
+      $logop,
+      map $self->_expand_expr({ $_ => $v->{$_} }),
         sort keys %$v
     ] };
   }
   if (ref($v) eq 'ARRAY') {
-    $logic eq 'and' or $logic eq 'or' or puke "unknown logic: $logic";
+    $logop eq 'and' or $logop eq 'or' or puke "unknown logic: $logop";
 
     my @expr = grep {
       (ref($_) eq 'ARRAY' and @$_)
@@ -921,11 +866,77 @@ sub _expand_andor {
     }
     # ???
     # return $res[0] if @res == 1;
-    return { -op => [ $logic, @res ] };
+    return { -op => [ $logop, @res ] };
   }
   die "notreached";
 }
 
+sub _expand_between {
+  my ($self, $op, $vv, $k) = @_;
+  local our $Cur_Col_Meta = $k;
+  my @rhs = map $self->_expand_expr($_),
+              ref($vv) eq 'ARRAY' ? @$vv : $vv;
+  unless (
+    (@rhs == 1 and ref($rhs[0]) eq 'HASH' and $rhs[0]->{-literal})
+    or
+    (@rhs == 2 and defined($rhs[0]) and defined($rhs[1]))
+  ) {
+    puke "Operator '${\uc($op)}' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref";
+  }
+  return +{ -op => [
+    $op,
+    $self->_expand_ident(-ident => $k),
+    @rhs
+  ] }
+}
+
+sub _expand_in {
+  my ($self, $op, $vv, $k) = @_;
+  if (my $literal = is_literal_value($vv)) {
+    my ($sql, @bind) = @$literal;
+    my $opened_sql = $self->_open_outer_paren($sql);
+    return +{ -op => [
+      $op, $self->_expand_ident(-ident => $k),
+      [ { -literal => [ $opened_sql, @bind ] } ]
+    ] };
+  }
+  my $undef_err =
+    'SQL::Abstract before v1.75 used to generate incorrect SQL when the '
+  . "-${\uc($op)} operator was given an undef-containing list: !!!AUDIT YOUR CODE "
+  . 'AND DATA!!! (the upcoming Data::Query-based version of SQL::Abstract '
+  . 'will emit the logically correct SQL instead of raising this exception)'
+  ;
+  puke("Argument passed to the '${\uc($op)}' operator can not be undefined")
+    if !defined($vv);
+  my @rhs = map $self->_expand_expr($_),
+              map { ref($_) ? $_ : { -bind => [ $k, $_ ] } }
+              map { defined($_) ? $_: puke($undef_err) }
+                (ref($vv) eq 'ARRAY' ? @$vv : $vv);
+  return $self->${\($op =~ /^not/ ? 'sqltrue' : 'sqlfalse')} unless @rhs;
+
+  return +{ -op => [
+    $op,
+    $self->_expand_ident(-ident => $k),
+    \@rhs
+  ] };
+}
+
+sub _expand_nest {
+  my ($self, $op, $v) = @_;
+  # DBIx::Class requires a nest warning to be emitted once but the private
+  # method it overrode to do so no longer exists
+  if ($self->{is_dbic_sqlmaker}) {
+    unless (our $Nest_Warned) {
+      belch(
+        "-nest in search conditions is deprecated, you most probably wanted:\n"
+        .q|{..., -and => [ \%cond0, \@cond1, \'cond2', \[ 'cond3', [ col => bind ] ], etc. ], ... }|
+      );
+      $Nest_Warned = 1;
+    }
+  }
+  return $self->_expand_expr($v);
+}
+
 sub _recurse_where {
   my ($self, $where, $logic) = @_;
 
@@ -955,64 +966,98 @@ sub _render_ident {
   return $self->_convert($self->_quote($ident));
 }
 
-my %unop_postfix = map +($_ => 1),
-  'is null', 'is not null',
-  'asc', 'desc',
-;
-
-my %special = (
-  (map +($_ => do {
-    my $op = $_;
-    sub {
-      my ($self, $args) = @_;
-      my ($left, $low, $high) = @$args;
-      my ($rhsql, @rhbind) = do {
-        if (@$args == 2) {
-          puke "Single arg to between must be a literal"
-            unless $low->{-literal};
-          @{$low->{-literal}}
-        } else {
-          my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high;
-          (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
-           @{$l}[1..$#$l], @{$h}[1..$#$h])
-        }
-      };
-      my ($lhsql, @lhbind) = $self->render_aqt($left);
-      return (
-        join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'),
-        @lhbind, @rhbind
-      );
-    }
+sub _render_list {
+  my ($self, $list) = @_;
+  my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$list;
+  return join(', ', map $_->[0], @parts), map @{$_}[1..$#$_], @parts;
+}
+
+sub _render_func {
+  my ($self, $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);
+}
+
+sub _render_bind {
+  my ($self,  $bind) = @_;
+  return ($self->_convert('?'), $self->_bindtype(@$bind));
+}
+
+sub _render_literal {
+  my ($self, $literal) = @_;
+  $self->_assert_bindval_matches_bindtype(@{$literal}[1..$#$literal]);
+  return @$literal;
+}
+
+our $RENDER_OP = {
+  (map +($_ => sub {
+    my ($self, $op, $args) = @_;
+    my ($left, $low, $high) = @$args;
+    my ($rhsql, @rhbind) = do {
+      if (@$args == 2) {
+        puke "Single arg to between must be a literal"
+          unless $low->{-literal};
+        @{$low->{-literal}}
+      } else {
+        my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high;
+        (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
+         @{$l}[1..$#$l], @{$h}[1..$#$h])
+      }
+    };
+    my ($lhsql, @lhbind) = $self->render_aqt($left);
+    return (
+      join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'),
+      @lhbind, @rhbind
+    );
   }), 'between', 'not between'),
-  (map +($_ => do {
-    my $op = $_;
-    sub {
-      my ($self, $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($op).' ( '
-        .join(', ', @in_sql)
-        .' )',
-        @lbind, @in_bind
-      );
-    }
+  (map +($_ => sub {
+    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($op).' ( '
+      .join(', ', @in_sql)
+      .' )',
+      @lbind, @in_bind
+    );
   }), 'in', 'not in'),
-);
+  (map +($_ => '_render_unop_postfix'),
+    'is null', 'is not null', 'asc', 'desc',
+  ),
+  (not => '_render_op_not'),
+  (map +($_ => sub {
+    my ($self, $op, $args) = @_;
+    my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+    return '' unless @parts;
+    return @{$parts[0]} if @parts == 1;
+    my ($final_sql) = join(
+      ' '.$self->_sqlcase($op).' ',
+      map $_->[0], @parts
+    );
+    return (
+      '('.$final_sql.')',
+      map @{$_}[1..$#$_], @parts
+    );
+  }), qw(and or)),
+};
 
 sub _render_op {
   my ($self, $v) = @_;
   my ($op, @args) = @$v;
-  $op =~ s/^-// if length($op) > 1;
-  $op = lc($op);
-  if (my $h = $special{$op}) {
-    return $self->$h(\@args);
+  if (my $r = $self->{render_op}{$op}) {
+    return $self->$r($op, \@args);
   }
   my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}};
   if ($us and @args > 1) {
@@ -1025,21 +1070,12 @@ sub _render_op {
   if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
     return $self->${\($us->{handler})}($op, $args[0]);
   }
-  if (@args == 1 and $op !~ /^(and|or)$/) {
-    my ($expr_sql, @bind) = $self->render_aqt($args[0]);
-    my $op_sql = $self->_sqlcase($op);
-    my $final_sql = (
-      $unop_postfix{lc($op)}
-        ? "${expr_sql} ${op_sql}"
-        : "${op_sql} ${expr_sql}"
-    );
-    return (($op eq 'not' || $us ? '('.$final_sql.')' : $final_sql), @bind);
+  if (@args == 1) {
+    return $self->_render_unop_prefix($op, \@args);
   } else {
      my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @args;
      return '' unless @parts;
-     my $is_andor = !!($op =~ /^(and|or)$/);
-     return @{$parts[0]} if $is_andor and @parts == 1;
-     my ($final_sql) = map +($is_andor ? "( ${_} )" : $_), join(
+     my ($final_sql) = join(
        ' '.$self->_sqlcase($op).' ',
        map $_->[0], @parts
      );
@@ -1051,33 +1087,24 @@ sub _render_op {
   die "unhandled";
 }
 
-sub _render_list {
-  my ($self, $list) = @_;
-  my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$list;
-  return join(', ', map $_->[0], @parts), map @{$_}[1..$#$_], @parts;
-}
-
-sub _render_func {
-  my ($self, $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);
+sub _render_op_not {
+  my ($self, $op, $v) = @_;
+  my ($sql, @bind) = $self->_render_unop_prefix($op, $v);
+  return "(${sql})", @bind;
 }
 
-sub _render_bind {
-  my ($self,  $bind) = @_;
-  return ($self->_convert('?'), $self->_bindtype(@$bind));
+sub _render_unop_prefix {
+  my ($self, $op, $v) = @_;
+  my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
+  my $op_sql = $self->_sqlcase($op);
+  return ("${op_sql} ${expr_sql}", @bind);
 }
 
-sub _render_literal {
-  my ($self, $literal) = @_;
-  $self->_assert_bindval_matches_bindtype(@{$literal}[1..$#$literal]);
-  return @$literal;
+sub _render_unop_postfix {
+  my ($self, $op, $v) = @_;
+  my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
+  my $op_sql = $self->_sqlcase($op);
+  return ($expr_sql.' '.$op_sql, @bind);
 }
 
 # Some databases (SQLite) treat col IN (1, 2) different from