X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=fc5ed6b1c86d93e4985783a24a02239494bcdd5e;hb=0b2789b31d12797db61a238ab219a80feb8709d1;hp=8d92a67fa00cb0604157a0f21b297858724bf53a;hpb=124b41cadd64cfff3defc0c2c8fac1b75b3c1647;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 8d92a67..fc5ed6b 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -187,12 +187,10 @@ sub new {
   $opt{expand_unary} = {};
 
   $opt{expand} = {
-    -ident => '_expand_ident',
-    -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',
   };
 
@@ -201,23 +199,42 @@ sub new {
     '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'), ('and', 'or')),
+    (map +($_ => '_expand_op_is'), ('is', 'is not')),
   };
 
+  # placeholder for _expand_unop system
+  {
+    my %unops = (-ident => '_expand_ident', -value => '_expand_value');
+    foreach my $name (keys %unops) {
+      $opt{expand}{$name} = $unops{$name};
+      my ($op) = $name =~ /^-(.*)$/;
+      $opt{expand_op}{$op} = sub {
+        my ($self, $op, $arg, $k) = @_;
+        return +{ -op => [
+          $self->{cmp},
+          $self->_expand_ident(-ident => $k),
+          $self->_expand_expr({ '-'.$op => $arg }),
+        ] };
+      };
+    }
+  }
+
   $opt{render} = {
     (map +("-$_", "_render_$_"), qw(op func bind ident literal list)),
     %{$opt{render}||{}}
   };
 
-  $opt{render_op} = our $RENDER_OP;
+  $opt{render_op} = {
+    (map +($_ => '_render_op_between'), 'between', 'not between'),
+    (map +($_ => '_render_op_in'), 'in', 'not in'),
+    (map +($_ => '_render_unop_postfix'),
+      'is null', 'is not null', 'asc', 'desc',
+    ),
+    (not => '_render_op_not'),
+    (map +($_ => '_render_op_andor'), qw(and or)),
+  };
 
   return bless \%opt, $class;
 }
@@ -559,7 +576,7 @@ sub _expand_expr {
   if (ref($expr) eq 'HASH') {
     return undef unless my $kc = keys %$expr;
     if ($kc > 1) {
-      return $self->_expand_andor(-and => $expr);
+      return $self->_expand_op_andor(-and => $expr);
     }
     my ($key, $value) = %$expr;
     if ($key =~ /^-/ and $key =~ s/ [_\s]? \d+ $//x ) {
@@ -573,7 +590,7 @@ sub _expand_expr {
   }
   if (ref($expr) eq 'ARRAY') {
     my $logic = '-'.lc($self->{logic});
-    return $self->_expand_andor($logic, $expr);
+    return $self->_expand_op_andor($logic, $expr);
   }
   if (my $literal = is_literal_value($expr)) {
     return +{ -literal => $literal };
@@ -596,50 +613,23 @@ 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 =~ /^-/) {
-    if (my ($rest) = $k =~/^-not[_ ](.*)$/) {
-      return +{ -op => [
-        'not',
-        $self->_expand_expr({ "-${rest}", $v })
-      ] };
-    }
-    {
-      my $op = $k;
-      $op =~ s/^-// if length($op) > 1;
-
-      # top level special ops are illegal in general
-      # note that, arguably, if it makes no sense at top level, it also
-      # makes no sense on the other side of an = sign or similar but DBIC
-      # gets disappointingly upset if I disallow it
-      if (
-        (our $Expand_Depth) == 1
-        and List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}
-      ) {
-        puke "Illegal use of top-level '-$op'"
-      }
-      if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
-        return { -op => [ $op, $v ] };
-      }
-    }
-    if ($self->{render}{$k}) {
-      return { $k => $v };
-    }
-    if (
-      ref($v) eq 'HASH'
-      and keys %$v == 1
-      and (keys %$v)[0] =~ /^-/
-    ) {
-      my ($func) = $k =~ /^-(.*)$/;
-      if (List::Util::first { $func =~ $_->{regex} } @{$self->{special_ops}}) {
-        return +{ -op => [ $func, $self->_expand_expr($v) ] };
-      }
-      return +{ -func => [ $func, $self->_expand_expr($v) ] };
-    }
-    if (!ref($v) or is_literal_value($v)) {
-      return +{ -op => [ $k =~ /^-(.*)$/, $self->_expand_expr($v) ] };
-    }
+    return $self->_expand_expr_hashpair_op($k, $v);
   }
+  return $self->_expand_expr_hashpair_ident($k, $v);
+}
+
+sub _expand_expr_hashpair_ident {
+  my ($self, $k, $v) = @_;
+
+  # hash with multiple or no elements is andor
+
+  if (ref($v) eq 'HASH' and keys %$v != 1) {
+    return $self->_expand_op_andor(-and => $v, $k);
+  }
+
+  # undef needs to be re-sent with cmp to achieve IS/IS NOT NULL
+
   if (
     !defined($v)
     or (
@@ -650,121 +640,22 @@ sub _expand_expr_hashpair {
   ) {
     return $self->_expand_expr({ $k => { $self->{cmp} => undef } });
   }
+
+  # scalars and objects get expanded as whatever requested or values
+
   if (!ref($v) or Scalar::Util::blessed($v)) {
     my $d = our $Default_Scalar_To;
-    return +{
-      -op => [
-        $self->{cmp},
-        $self->_expand_ident(-ident => $k),
-        ($d
-          ? $self->_expand_expr($d => $v)
-          : { -bind => [ $k, $v ] }
-        )
-      ]
-    };
+    local our $Cur_Col_Meta = $k;
+    return $self->_expand_expr_hashpair_ident(
+      $k,
+      ($d
+        ? $self->_expand_expr($d => $v)
+        : { -value => $v }
+      )
+    );
   }
   if (ref($v) eq 'HASH') {
-    if (keys %$v > 1) {
-      return $self->_expand_andor(-and => [
-        map +{ $k => { $_ => $v->{$_} } },
-          sort keys %$v
-      ]);
-    }
-    return undef unless keys %$v;
-    my ($vk, $vv) = %$v;
-    my $op = join ' ', split '_', (map lc, $vk =~ /^-?(.*)$/)[0];
-    $self->_assert_pass_injection_guard($op);
-    if ($op =~ s/ [_\s]? \d+ $//x ) {
-      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 (my $x = $self->{expand_op}{$op}) {
-      local our $Cur_Col_Meta = $k;
-      return $self->$x($op, $vv, $k);
-    }
-    if ($op eq 'value' and not defined($vv)) {
-      return $self->_expand_expr({ $k, undef }) unless defined($vv);
-    }
-    if ($op =~ /^is(?: not)?$/) {
-      puke "$op can only take undef as argument"
-        if defined($vv)
-           and not (
-             ref($vv) eq 'HASH'
-             and exists($vv->{-value})
-             and !defined($vv->{-value})
-           );
-      return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] };
-    }
-    if ($op =~ /^(and|or)$/) {
-      return $self->_expand_andor('-'.$op, [
-        map +{ $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 ] };
-    }
-    if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
-      return { -op => [
-        $self->{cmp},
-        $self->_expand_ident(-ident => $k),
-        { -op => [ $op, $vv ] }
-      ] };
-    }
-    if (ref($vv) eq 'ARRAY') {
-      my ($logic, @values) = (
-        (defined($vv->[0]) and $vv->[0] =~ /^-(and|or)$/i)
-          ? @$vv
-          : (-or => @$vv)
-      );
-      if (
-        $op =~ $self->{inequality_op}
-        or $op =~ $self->{not_like_op}
-      ) {
-        if (lc($logic) eq '-or' and @values > 1) {
-          belch "A multi-element arrayref as an argument to the inequality op '${\uc($op)}' "
-              . 'is technically equivalent to an always-true 1=1 (you probably wanted '
-              . "to say ...{ \$inequality_op => [ -and => \@values ] }... instead)"
-          ;
-        }
-      }
-      unless (@values) {
-        # try to DWIM on equality operators
-        return
-          $op =~ $self->{equality_op}   ? $self->sqlfalse
-        : $op =~ $self->{like_op}       ? belch("Supplying an empty arrayref to '@{[ uc $op]}' is deprecated") && $self->sqlfalse
-        : $op =~ $self->{inequality_op} ? $self->sqltrue
-        : $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 $self->_expand_andor($logic => [
-        map +{ $k => { $vk => $_ } },
-          @values
-      ]);
-    }
-    if (
-      !defined($vv)
-      or (
-        ref($vv) eq 'HASH'
-        and exists $vv->{-value}
-        and not defined $vv->{-value}
-      )
-    ) {
-      my $is =
-        $op =~ /^not$/i               ? 'is not'  # legacy
-      : $op =~ $self->{equality_op}   ? 'is'
-      : $op =~ $self->{like_op}       ? belch("Supplying an undefined argument to '@{[ uc $op]}' is deprecated") && 'is'
-      : $op =~ $self->{inequality_op} ? 'is not'
-      : $op =~ $self->{not_like_op}   ? belch("Supplying an undefined argument to '@{[ uc $op]}' is deprecated") && 'is not'
-      : puke "unexpected operator '$op' with undef operand";
-      return +{ -op => [ $is.' null', $self->_expand_ident(-ident => $k) ] };
-    }
-    local our $Cur_Col_Meta = $k;
-    return +{ -op => [
-      $op,
-      $self->_expand_ident(-ident => $k),
-      $self->_expand_expr($vv)
-    ] };
+    return $self->_expand_expr_hashtriple($k, %$v);
   }
   if (ref($v) eq 'ARRAY') {
     return $self->sqlfalse unless @$v;
@@ -774,8 +665,8 @@ sub _expand_expr_hashpair {
         ? shift(@{$v = [ @$v ]})
         : '-'.lc($self->{logic} || 'OR')
     );
-    return $self->_expand_andor(
-      $logic => [ map +{ $k => $_ }, @$v ]
+    return $self->_expand_op_andor(
+      $logic => $v, $k
     );
   }
   if (my $literal = is_literal_value($v)) {
@@ -794,6 +685,144 @@ sub _expand_expr_hashpair {
   die "notreached";
 }
 
+sub _expand_expr_hashpair_op {
+  my ($self, $k, $v) = @_;
+
+  my $op = $k;
+  $op =~ s/^-// if length($op) > 1;
+  $self->_assert_pass_injection_guard($op);
+
+  # Ops prefixed with -not_ get converted
+
+  if (my ($rest) = $op =~/^not[_ ](.*)$/) {
+    return +{ -op => [
+      'not',
+      $self->_expand_expr({ "-${rest}", $v })
+  ] };
+  }
+
+  # the old special op system requires illegality for top-level use
+
+  if (
+    (our $Expand_Depth) == 1
+    and List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}
+  ) {
+    puke "Illegal use of top-level '-$op'"
+  }
+
+  # the old unary op system means we should touch nothing and let it work
+
+  if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
+    return { -op => [ $op, $v ] };
+  }
+
+  # an explicit node type is currently assumed to be expanded (this is almost
+  # certainly wrong and there should be expansion anyway)
+
+  if ($self->{render}{$k}) {
+    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 =~ /^-(.*)$/;
+    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
+
+  if (!ref($v) or is_literal_value($v)) {
+    return +{ -op => [ $op, $self->_expand_expr($v) ] };
+  }
+
+  die "notreached";
+}
+
+sub _expand_expr_hashtriple {
+  my ($self, $k, $vk, $vv) = @_;
+
+  my $ik = $self->_expand_ident(-ident => $k);
+
+  my $op = join ' ', split '_', (map lc, $vk =~ /^-?(.*)$/)[0];
+  $self->_assert_pass_injection_guard($op);
+  if ($op =~ s/ [_\s]? \d+ $//x ) {
+    return $self->_expand_expr($k, { $vk, $vv });
+  }
+  if (my $x = $self->{expand_op}{$op}) {
+    local our $Cur_Col_Meta = $k;
+    return $self->$x($op, $vv, $k);
+  }
+  if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}) {
+    return { -op => [ $op, $ik, $vv ] };
+  }
+  if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
+    return { -op => [
+      $self->{cmp},
+      $ik,
+      { -op => [ $op, $vv ] }
+    ] };
+  }
+  if (ref($vv) eq 'ARRAY') {
+    my @raw = @$vv;
+    my $logic = (defined($raw[0]) and $raw[0] =~ /^-(and|or)$/i)
+      ? shift @raw : '-or';
+    my @values = map +{ $vk => $_ }, @raw;
+    if (
+      $op =~ $self->{inequality_op}
+      or $op =~ $self->{not_like_op}
+    ) {
+      if (lc($logic) eq '-or' and @values > 1) {
+        belch "A multi-element arrayref as an argument to the inequality op '${\uc($op)}' "
+            . 'is technically equivalent to an always-true 1=1 (you probably wanted '
+            . "to say ...{ \$inequality_op => [ -and => \@values ] }... instead)"
+        ;
+      }
+    }
+    unless (@values) {
+      # try to DWIM on equality operators
+      return
+        $op =~ $self->{equality_op}   ? $self->sqlfalse
+      : $op =~ $self->{like_op}       ? belch("Supplying an empty arrayref to '@{[ uc $op]}' is deprecated") && $self->sqlfalse
+      : $op =~ $self->{inequality_op} ? $self->sqltrue
+      : $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 $self->_expand_op_andor($logic => \@values, $k);
+  }
+  if (
+    !defined($vv)
+    or (
+      ref($vv) eq 'HASH'
+      and exists $vv->{-value}
+      and not defined $vv->{-value}
+    )
+  ) {
+    my $is =
+      $op =~ /^not$/i               ? 'is not'  # legacy
+    : $op =~ $self->{equality_op}   ? 'is'
+    : $op =~ $self->{like_op}       ? belch("Supplying an undefined argument to '@{[ uc $op]}' is deprecated") && 'is'
+    : $op =~ $self->{inequality_op} ? 'is not'
+    : $op =~ $self->{not_like_op}   ? belch("Supplying an undefined argument to '@{[ uc $op]}' is deprecated") && 'is not'
+    : puke "unexpected operator '$op' with undef operand";
+
+    return $self->_expand_expr_hashpair($k => { $is, undef });
+  }
+  local our $Cur_Col_Meta = $k;
+  return +{ -op => [
+    $op,
+    $ik,
+    $self->_expand_expr($vv)
+  ] };
+}
+
 sub _expand_ident {
   my ($self, $op, $body) = @_;
   unless (defined($body) or (ref($body) and ref($body) eq 'ARRAY')) {
@@ -825,13 +854,21 @@ sub _expand_bool {
   return $self->_expand_ident(-ident => $v);
 }
 
-sub _expand_andor {
-  my ($self, $k, $v) = @_;
-  my ($logop) = $k =~ /^-(.*)$/;
+sub _expand_op_andor {
+  my ($self, $logic, $v, $k) = @_;
+  if (defined $k) {
+    $v = [ map +{ $k, $_ },
+             (ref($v) eq 'HASH')
+              ? (map +{ $_ => $v->{$_} }, sort keys %$v)
+              : @$v,
+         ];
+  }
+  my ($logop) = $logic =~ /^-?(.*)$/;
   if (ref($v) eq 'HASH') {
+    return undef unless keys %$v;
     return +{ -op => [
       $logop,
-      map $self->_expand_expr({ $_ => $v->{$_} }, $logop),
+      map $self->_expand_expr({ $_ => $v->{$_} }),
         sort keys %$v
     ] };
   }
@@ -871,6 +908,18 @@ sub _expand_andor {
   die "notreached";
 }
 
+sub _expand_op_is {
+  my ($self, $op, $vv, $k) = @_;
+  puke "$op can only take undef as argument"
+    if defined($vv)
+       and not (
+         ref($vv) eq 'HASH'
+         and exists($vv->{-value})
+         and !defined($vv->{-value})
+       );
+  return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] };
+}
+
 sub _expand_between {
   my ($self, $op, $vv, $k) = @_;
   local our $Cur_Col_Meta = $k;
@@ -995,63 +1044,68 @@ sub _render_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 +($_ => 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_between {
+  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
+  );
+}
+
+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($op).' ( '
+    .join(', ', @in_sql)
+    .' )',
+    @lbind, @in_bind
+  );
+}
+
+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->_render_op_multop($op, $args);
+  return '( '.$sql.' )', @bind;
+}
+
+sub _render_op_multop {
+  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
+  );
+}
 
 sub _render_op {
   my ($self, $v) = @_;
@@ -1073,16 +1127,7 @@ sub _render_op {
   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 ($final_sql) = join(
-       ' '.$self->_sqlcase($op).' ',
-       map $_->[0], @parts
-     );
-     return (
-       $final_sql,
-       map @{$_}[1..$#$_], @parts
-     );
+    return $self->_render_op_multop($op, \@args);
   }
   die "unhandled";
 }