X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=4cc2c3ab8ca7724e4e4beb4bc36bbd0b036155d4;hb=771e7f6967f9026010eb24d8721facbe9473cb09;hp=e7a0827f71ce2c28b8fda1c9b8cdbedc17134533;hpb=720ca4f7d6072746ae5de5d8544172e5a2c51f0f;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index e7a0827..4cc2c3a 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -155,10 +155,18 @@ sub new {
   $opt{sqlfalse} ||= '0=1';
 
   # special operators
-  $opt{user_special_ops} = [ @{$opt{special_ops} ||= []} ];
+  $opt{special_ops} ||= [];
+
   # regexes are applied in order, thus push after user-defines
   push @{$opt{special_ops}}, @BUILTIN_SPECIAL_OPS;
 
+  if ($class->isa('DBIx::Class::SQLMaker')) {
+    push @{$opt{special_ops}}, our $DBIC_Compat_Op ||= {
+      regex => qr/^(?:ident|value)$/i, handler => sub { die "NOPE" }
+    };
+    $opt{is_dbic_sqlmaker} = 1;
+  }
+
   # unary operators
   $opt{unary_ops} ||= [];
 
@@ -176,6 +184,50 @@ sub new {
     ^ \s* go \s
   /xmi;
 
+  $opt{expand_unary} = {};
+
+  $opt{expand} = {
+    -not => '_expand_not',
+    -bool => '_expand_bool',
+    -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',
+    'nest' => '_expand_nest',
+    (map +($_ => '_expand_op_andor'),
+      qw(and or)),
+  };
+
+  # 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;
+
   return bless \%opt, $class;
 }
 
@@ -224,7 +276,7 @@ sub _returning {
 
   my $f = $options->{returning};
 
-  my ($sql, @bind) = $self->_render_expr(
+  my ($sql, @bind) = $self->render_aqt(
     $self->_expand_maybe_list_expr($f, undef, -ident)
   );
   return wantarray
@@ -295,7 +347,7 @@ sub _insert_values {
 sub _insert_value {
   my ($self, $column, $v) = @_;
 
-  return $self->_render_expr(
+  return $self->render_aqt(
     $self->_expand_insert_value($column, $v)
   );
 }
@@ -321,7 +373,7 @@ sub _expand_insert_value {
     return +{ -bind => [ $column, undef ] };
   }
   local our $Cur_Col_Meta = $column;
-  return $self->_expand_expr($v);
+  return $self->expand_expr($v);
 }
 
 
@@ -364,59 +416,33 @@ sub update {
 sub _update_set_values {
   my ($self, $data) = @_;
 
-  my (@set, @all_bind);
-  for my $k (sort keys %$data) {
-    my $v = $data->{$k};
-    my $r = ref $v;
-    my $label = $self->_quote($k);
-
-    $self->_SWITCH_refkind($v, {
-      ARRAYREF => sub {
-        if ($self->{array_datatypes}) { # array datatype
-          push @set, "$label = ?";
-          push @all_bind, $self->_bindtype($k, $v);
-        }
-        else {                          # literal SQL with bind
-          my ($sql, @bind) = @$v;
-          $self->_assert_bindval_matches_bindtype(@bind);
-          push @set, "$label = $sql";
-          push @all_bind, @bind;
-        }
-      },
-      ARRAYREFREF => sub { # literal SQL with bind
-        my ($sql, @bind) = @${$v};
-        $self->_assert_bindval_matches_bindtype(@bind);
-        push @set, "$label = $sql";
-        push @all_bind, @bind;
-      },
-      SCALARREF => sub {  # literal SQL without bind
-        push @set, "$label = $$v";
-      },
-      HASHREF => sub {
-        my ($op, $arg, @rest) = %$v;
-
-        puke 'Operator calls in update must be in the form { -op => $arg }'
-          if (@rest or not $op =~ /^\-(.+)/);
-
-        local our $Cur_Col_Meta = $k;
-        my ($sql, @bind) = $self->_render_expr(
-          $self->_expand_expr_hashpair($op, $arg)
-        );
-
-        push @set, "$label = $sql";
-        push @all_bind, @bind;
-      },
-      SCALAR_or_UNDEF => sub {
-        push @set, "$label = ?";
-        push @all_bind, $self->_bindtype($k, $v);
-      },
-    });
-  }
-
-  # generate sql
-  my $sql = join ', ', @set;
+  return $self->render_aqt(
+    $self->_expand_update_set_values($data),
+  );
+}
 
-  return ($sql, @all_bind);
+sub _expand_update_set_values {
+  my ($self, $data) = @_;
+  $self->_expand_maybe_list_expr( [
+    map {
+      my ($k, $set) = @$_;
+      $set = { -bind => $_ } unless defined $set;
+      +{ -op => [ '=', $self->_expand_ident(-ident => $k), $set ] };
+    }
+    map {
+      my $k = $_;
+      my $v = $data->{$k};
+      (ref($v) eq 'ARRAY'
+        ? ($self->{array_datatypes}
+            ? [ $k, +{ -bind => [ $k, $v ] } ]
+            : [ $k, +{ -literal => $v } ])
+        : do {
+            local our $Cur_Col_Meta = $k;
+            [ $k, $self->_expand_expr($v) ]
+          }
+      );
+    } sort keys %$data
+  ] );
 }
 
 # So that subclasses can override UPDATE ... RETURNING separately from
@@ -451,7 +477,8 @@ sub select {
 
 sub _select_fields {
   my ($self, $fields) = @_;
-  return $self->_render_expr(
+  return $fields unless ref($fields);
+  return $self->render_aqt(
     $self->_expand_maybe_list_expr($fields, undef, '-ident')
   );
 }
@@ -513,65 +540,64 @@ sub where {
   return wantarray ? ($sql, @bind) : $sql;
 }
 
-sub _expand_expr {
-  my ($self, $expr, $logic, $default_scalar_to) = @_;
+sub expand_expr {
+  my ($self, $expr, $default_scalar_to) = @_;
   local our $Default_Scalar_To = $default_scalar_to if $default_scalar_to;
+  $self->_expand_expr($expr);
+}
+
+sub render_aqt {
+  my ($self, $aqt) = @_;
+  my ($k, $v, @rest) = %$aqt;
+  die "No" if @rest;
+  if (my $meth = $self->{render}{$k}) {
+    return $self->$meth($v);
+  }
+  die "notreached: $k";
+}
+
+sub render_expr {
+  my ($self, $expr) = @_;
+  $self->render_aqt($self->expand_expr($expr));
+}
+
+sub _expand_expr {
+  my ($self, $expr) = @_;
+  our $Expand_Depth ||= 0; local $Expand_Depth = $Expand_Depth + 1;
   return undef unless defined($expr);
   if (ref($expr) eq 'HASH') {
-    if (keys %$expr > 1) {
-      $logic ||= 'and';
-      return +{ -op => [
-        $logic,
-        map $self->_expand_expr_hashpair($_ => $expr->{$_}, $logic),
-          sort keys %$expr
-      ] };
+    return undef unless my $kc = keys %$expr;
+    if ($kc > 1) {
+      return $self->_expand_op_andor(-and => $expr);
+    }
+    my ($key, $value) = %$expr;
+    if ($key =~ /^-/ and $key =~ 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 => [ $key => COND1, $key => COND2 ... ]";
     }
-    return unless %$expr;
-    return $self->_expand_expr_hashpair(%$expr, $logic);
+    if (my $exp = $self->{expand}{$key}) {
+      return $self->$exp($key, $value);
+    }
+    return $self->_expand_expr_hashpair($key, $value);
   }
   if (ref($expr) eq 'ARRAY') {
-    my $logic = lc($logic || $self->{logic});
-    $logic eq 'and' or $logic eq 'or' or puke "unknown logic: $logic";
-
-    my @expr = @$expr;
-
-    my @res;
-
-    while (my ($el) = splice @expr, 0, 1) {
-      puke "Supplying an empty left hand side argument is not supported in array-pairs"
-        unless defined($el) and length($el);
-      my $elref = ref($el);
-      if (!$elref) {
-        push(@res, $self->_expand_expr({ $el, shift(@expr) }));
-      } elsif ($elref eq 'ARRAY') {
-        push(@res, $self->_expand_expr($el)) if @$el;
-      } elsif (my $l = is_literal_value($el)) {
-        push @res, { -literal => $l };
-      } elsif ($elref eq 'HASH') {
-        push @res, $self->_expand_expr($el);
-      } else {
-        die "notreached";
-      }
-    }
-    return { -op => [ $logic, @res ] };
+    my $logic = '-'.lc($self->{logic});
+    return $self->_expand_op_andor($logic, $expr);
   }
   if (my $literal = is_literal_value($expr)) {
     return +{ -literal => $literal };
   }
   if (!ref($expr) or Scalar::Util::blessed($expr)) {
-    if (my $d = $Default_Scalar_To) {
-      return +{ $d => $expr };
-    }
-    if (my $m = our $Cur_Col_Meta) {
-      return +{ -bind => [ $m, $expr ] };
+    if (my $d = our $Default_Scalar_To) {
+      return $self->_expand_expr({ $d => $expr });
     }
-    return +{ -value => $expr };
+    return $self->_expand_value(-value => $expr);
   }
   die "notreached";
 }
 
 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';
@@ -579,62 +605,44 @@ 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 =~ 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 => [ $k => COND1, $k => COND2 ... ]";
-    }
-    if ($k eq '-nest') {
-      return $self->_expand_expr($v);
-    }
-    if ($k eq '-bool') {
-      if (ref($v)) {
-        return $self->_expand_expr($v);
-      }
-      puke "-bool => undef not supported" unless defined($v);
-      return { -ident => $v };
-    }
-    if ($k eq '-not') {
-      return { -op => [ 'not', $self->_expand_expr($v) ] };
-    }
     if (my ($rest) = $k =~/^-not[_ ](.*)$/) {
       return +{ -op => [
         'not',
-        $self->_expand_expr_hashpair("-${rest}", $v, $logic)
+        $self->_expand_expr({ "-${rest}", $v })
       ] };
     }
-    if (my ($logic) = $k =~ /^-(and|or)$/i) {
-      if (ref($v) eq 'HASH') {
-        return $self->_expand_expr($v, $logic);
-      }
-      if (ref($v) eq 'ARRAY') {
-        return $self->_expand_expr($v, $logic);
-      }
-    }
     {
       my $op = $k;
       $op =~ s/^-// if length($op) > 1;
-    
+
       # top level special ops are illegal in general
-      puke "Illegal use of top-level '-$op'"
-        if List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}};
-    }
-    if ($k eq '-value' and my $m = our $Cur_Col_Meta) {
-      return +{ -bind => [ $m, $v ] };
+      # 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 ($k eq '-op' or $k eq '-ident' or $k eq '-value' or $k eq '-bind' or $k eq '-literal' or $k eq '-func') {
+    if ($self->{render}{$k}) {
       return { $k => $v };
     }
-    if (my $custom = $self->{custom_expansions}{($k =~ /^-(.*)$/)[0]}) {
-      return $self->$custom($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)) {
@@ -649,119 +657,62 @@ sub _expand_expr_hashpair {
       and not defined $v->{-value}
     )
   ) {
-    return $self->_expand_expr_hashpair($k => { $self->{cmp} => undef });
+    return $self->_expand_expr({ $k => { $self->{cmp} => undef } });
   }
   if (!ref($v) or Scalar::Util::blessed($v)) {
+    my $d = our $Default_Scalar_To;
     return +{
       -op => [
         $self->{cmp},
-        { -ident => $k },
-        { -bind => [ $k, $v ] }
+        $self->_expand_ident(-ident => $k),
+        ($d
+          ? $self->_expand_expr($d => $v)
+          : { -bind => [ $k, $v ] }
+        )
       ]
     };
   }
   if (ref($v) eq 'HASH') {
     if (keys %$v > 1) {
-      return { -op => [
-        'and',
-        map $self->_expand_expr_hashpair($k => { $_ => $v->{$_} }),
+      return $self->_expand_op_andor(-and => [
+        map +{ $k => { $_ => $v->{$_} } },
           sort keys %$v
-      ] };
+      ]);
     }
+    return undef unless keys %$v;
     my ($vk, $vv) = %$v;
-    $vk =~ s/^-//;
-    $vk = lc($vk);
-    $self->_assert_pass_injection_guard($vk);
-    if ($vk =~ s/ [_\s]? \d+ $//x ) {
+    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 => [ -$vk => COND1, -$vk => COND2 ... ]";
+          . "You probably wanted ...-and => [ -$op => COND1, -$op => COND2 ... ]";
     }
-    if ($vk =~ /^(?: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($vk)}' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref";
-      }
-      return +{ -op => [
-        join(' ', split '_', $vk),
-        { -ident => $k },
-        @rhs
-      ] }
-    }
-    if ($vk =~ /^(?:not[ _])?in$/) {
-      if (my $literal = is_literal_value($vv)) {
-        my ($sql, @bind) = @$literal;
-        my $opened_sql = $self->_open_outer_paren($sql);
-        return +{ -op => [
-          $vk, { -ident => $k },
-          [ { -literal => [ $opened_sql, @bind ] } ]
-        ] };
-      }
-      my $undef_err =
-        'SQL::Abstract before v1.75 used to generate incorrect SQL when the '
-      . "-${\uc($vk)} 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($vk)}' 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->${\($vk =~ /^not/ ? 'sqltrue' : 'sqlfalse')} unless @rhs;
-
-      return +{ -op => [
-        join(' ', split '_', $vk),
-        { -ident => $k },
-        \@rhs
-      ] };
+      return $self->$x($op, $vv, $k);
     }
-    if ($vk eq 'ident') {
-      if (! defined $vv or ref $vv) {
-        puke "-$vk requires a single plain scalar argument (a quotable identifier)";
-      }
-      return +{ -op => [
-        $self->{cmp},
-        { -ident => $k },
-        { -ident => $vv }
-      ] };
+    if ($op eq 'value' and not defined($vv)) {
+      return $self->_expand_expr({ $k, undef }) unless defined($vv);
     }
-    if ($vk eq 'value') {
-      return $self->_expand_expr_hashpair($k, undef) unless defined($vv);
-      return +{ -op => [
-        $self->{cmp},
-        { -ident => $k },
-        { -bind => [ $k, $vv ] }
-      ] };
-    }
-    if ($vk =~ /^is(?:[ _]not)?$/) {
-      puke "$vk can only take undef as argument"
+    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})
            );
-      $vk =~ s/_/ /g;
-      return +{ -op => [ $vk.' null', { -ident => $k } ] };
+      return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] };
     }
-    if ($vk =~ /^(and|or)$/) {
-      if (ref($vv) eq 'HASH') {
-        return +{ -op => [
-          $vk,
-          map $self->_expand_expr_hashpair($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 { $vk =~ $_->{regex} } @{$self->{user_special_ops}}) {
-      return { -op => [ $vk, { -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) = (
@@ -770,12 +721,11 @@ sub _expand_expr_hashpair {
           : (-or => @$vv)
       );
       if (
-        $vk =~ $self->{inequality_op}
-        or join(' ', split '_', $vk) =~ $self->{not_like_op}
+        $op =~ $self->{inequality_op}
+        or $op =~ $self->{not_like_op}
       ) {
         if (lc($logic) eq '-or' and @values > 1) {
-          my $op = uc join ' ', split '_', $vk;
-          belch "A multi-element arrayref as an argument to the inequality op '$op' "
+          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)"
           ;
@@ -783,7 +733,6 @@ sub _expand_expr_hashpair {
       }
       unless (@values) {
         # try to DWIM on equality operators
-        my $op = join ' ', split '_', $vk;
         return
           $op =~ $self->{equality_op}   ? $self->sqlfalse
         : $op =~ $self->{like_op}       ? belch("Supplying an empty arrayref to '@{[ uc $op]}' is deprecated") && $self->sqlfalse
@@ -791,11 +740,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_hashpair($k => { $vk => $_ }),
+      return $self->_expand_op_andor($logic => [
+        map +{ $k => { $vk => $_ } },
           @values
-      ] };
+      ]);
     }
     if (
       !defined($vv)
@@ -805,7 +753,6 @@ sub _expand_expr_hashpair {
         and not defined $vv->{-value}
       )
     ) {
-      my $op = join ' ', split '_', $vk;
       my $is =
         $op =~ /^not$/i               ? 'is not'  # legacy
       : $op =~ $self->{equality_op}   ? 'is'
@@ -813,27 +760,26 @@ sub _expand_expr_hashpair {
       : $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', { -ident => $k } ] };
+      return +{ -op => [ $is.' null', $self->_expand_ident(-ident => $k) ] };
     }
     local our $Cur_Col_Meta = $k;
     return +{ -op => [
-      $vk,
-     { -ident => $k },
-     $self->_expand_expr($vv)
+      $op,
+      $self->_expand_ident(-ident => $k),
+      $self->_expand_expr($vv)
     ] };
   }
   if (ref($v) eq 'ARRAY') {
     return $self->sqlfalse unless @$v;
     $self->_debug("ARRAY($k) means distribute over elements");
-    my $this_logic = (
-      $v->[0] =~ /^-((?:and|or))$/i
-        ? ($v = [ @{$v}[1..$#$v] ], $1)
-        : ($self->{logic} || 'or')
+    my $logic = lc(
+      $v->[0] =~ /^-(and|or)$/i
+        ? shift(@{$v = [ @$v ]})
+        : '-'.lc($self->{logic} || 'OR')
+    );
+    return $self->_expand_op_andor(
+      $logic => [ map +{ $k => $_ }, @$v ]
     );
-    return +{ -op => [
-      $this_logic,
-      map $self->_expand_expr({ $k => $_ }, $this_logic), @$v
-    ] };
   }
   if (my $literal = is_literal_value($v)) {
     unless (length $k) {
@@ -843,9 +789,7 @@ sub _expand_expr_hashpair {
     my ($sql, @bind) = @$literal;
     if ($self->{bindtype} eq 'columns') {
       for (@bind) {
-        if (!defined $_ || ref($_) ne 'ARRAY' || @$_ != 2) {
-          puke "bindtype 'columns' selected, you need to pass: [column_name => bind_value]"
-        }
+        $self->_assert_bindval_matches_bindtype($_);
       }
     }
     return +{ -literal => [ $self->_quote($k).' '.$sql, @bind ] };
@@ -853,34 +797,165 @@ sub _expand_expr_hashpair {
   die "notreached";
 }
 
-sub _render_expr {
-  my ($self, $expr) = @_;
-  my ($k, $v, @rest) = %$expr;
-  die "No" if @rest;
-  my %op = map +("-$_" => '_render_'.$_),
-    qw(op func value bind ident literal);
-  if (my $meth = $op{$k}) {
-    return $self->$meth($v);
+sub _expand_ident {
+  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";
   }
-  die "notreached: $k";
+  my @parts = map split(/\Q${\($self->{name_sep}||'.')}\E/, $_),
+                ref($body) ? @$body : $body;
+  return { -ident => $parts[-1] } if $self->{_dequalify_idents};
+  unless ($self->{quote_char}) {
+    $self->_assert_pass_injection_guard($_) for @parts;
+  }
+  return +{ -ident => \@parts };
 }
 
-sub _recurse_where {
-  my ($self, $where, $logic) = @_;
+sub _expand_value {
+  +{ -bind => [ our $Cur_Col_Meta, $_[2] ] };
+}
 
-#print STDERR Data::Dumper::Concise::Dumper([ $where, $logic ]);
+sub _expand_not {
+  +{ -op => [ 'not', $_[0]->_expand_expr($_[2]) ] };
+}
 
-  my $where_exp = $self->_expand_expr($where, $logic);
+sub _expand_bool {
+  my ($self, undef, $v) = @_;
+  if (ref($v)) {
+    return $self->_expand_expr($v);
+  }
+  puke "-bool => undef not supported" unless defined($v);
+  return $self->_expand_ident(-ident => $v);
+}
+
+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 => [
+      $logop,
+      map $self->_expand_expr({ $_ => $v->{$_} }),
+        sort keys %$v
+    ] };
+  }
+  if (ref($v) eq 'ARRAY') {
+    $logop eq 'and' or $logop eq 'or' or puke "unknown logic: $logop";
+
+    my @expr = grep {
+      (ref($_) eq 'ARRAY' and @$_)
+      or (ref($_) eq 'HASH' and %$_)
+      or 1
+    } @$v;
+
+    my @res;
+
+    while (my ($el) = splice @expr, 0, 1) {
+      puke "Supplying an empty left hand side argument is not supported in array-pairs"
+        unless defined($el) and length($el);
+      my $elref = ref($el);
+      if (!$elref) {
+        local our $Expand_Depth = 0;
+        push(@res, grep defined, $self->_expand_expr({ $el, shift(@expr) }));
+      } elsif ($elref eq 'ARRAY') {
+        push(@res, grep defined, $self->_expand_expr($el)) if @$el;
+      } elsif (my $l = is_literal_value($el)) {
+        push @res, { -literal => $l };
+      } elsif ($elref eq 'HASH') {
+        local our $Expand_Depth = 0;
+        push @res, grep defined, $self->_expand_expr($el) if %$el;
+      } else {
+        die "notreached";
+      }
+    }
+    # ???
+    # return $res[0] if @res == 1;
+    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
+  ] }
+}
 
-#print STDERR Data::Dumper::Concise::Dumper([ EXP => $where_exp ]);
+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
+  ] };
+}
 
-  # dispatch on appropriate method according to refkind of $where
-#  my $method = $self->_METHOD_FOR_refkind("_where", $where_exp);
+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) = @_;
 
-#  my ($sql, @bind) =  $self->$method($where_exp, $logic);
+  # Special case: top level simple string treated as literal
 
-  my ($sql, @bind) = defined($where_exp) ? $self->_render_expr($where_exp) : (undef);
+  my $where_exp = (ref($where)
+                    ? $self->_expand_expr($where, $logic)
+                    : { -literal => [ $where ] });
 
+  # dispatch expanded expression
+
+  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) {
@@ -898,90 +973,117 @@ sub _render_ident {
   return $self->_convert($self->_quote($ident));
 }
 
-sub _render_value {
-  my ($self, $value) = @_;
+sub _render_list {
+  my ($self, $list) = @_;
+  my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$list;
+  return join(', ', map $_->[0], @parts), map @{$_}[1..$#$_], @parts;
+}
 
-  return ($self->_convert('?'), $self->_bindtype(undef, $value));
+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);
 }
 
-my %unop_postfix = map +($_ => 1),
-  'is null', 'is not null',
-  'asc', 'desc',
-;
+sub _render_bind {
+  my ($self,  $bind) = @_;
+  return ($self->_convert('?'), $self->_bindtype(@$bind));
+}
 
-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_expr($_) ], $low, $high;
-          (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
-           @{$l}[1..$#$l], @{$h}[1..$#$h])
-        }
-      };
-      my ($lhsql, @lhbind) = $self->_render_expr($left);
-      return (
-        join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'),
-        @lhbind, @rhbind
-      );
-    }
+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_expr($_);
-        push @in_bind, @bind;
-        $sql;
-      } @$rhs;
-      my ($lhsql, @lbind) = $self->_render_expr($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);
   }
-  if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{user_special_ops}}) {
+  my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}};
+  if ($us and @args > 1) {
     puke "Special op '${op}' requires first value to be identifier"
-      unless my ($k) = map $_->{-ident}, grep ref($_) eq 'HASH', $args[0];
+      unless my ($ident) = map $_->{-ident}, grep ref($_) eq 'HASH', $args[0];
+    my $k = join(($self->{name_sep}||'.'), @$ident);
+    local our $Expand_Depth = 1;
     return $self->${\($us->{handler})}($k, $op, $args[1]);
   }
-  my $final_op = $op =~ /^(?:is|not)_/ ? join(' ', split '_', $op) : $op;
-  if (@args == 1 and $op !~ /^(and|or)$/) {
-    my ($expr_sql, @bind) = $self->_render_expr($args[0]);
-    my $op_sql = $self->_sqlcase($final_op);
-    my $final_sql = (
-      $unop_postfix{lc($final_op)}
-        ? "${expr_sql} ${op_sql}"
-        : "${op_sql} ${expr_sql}"
-    );
-    return (($op eq 'not' ? '('.$final_sql.')' : $final_sql), @bind);
+  if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
+    return $self->${\($us->{handler})}($op, $args[0]);
+  }
+  if (@args == 1) {
+    return $self->_render_unop_prefix($op, \@args);
   } else {
-     my @parts = map [ $self->_render_expr($_) ], @args;
-     my ($final_sql) = map +($op =~ /^(and|or)$/ ? "(${_})" : $_), join(
-       ($final_op eq ',' ? '' : ' ').$self->_sqlcase($final_op).' ',
+     my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @args;
+     return '' unless @parts;
+     my ($final_sql) = join(
+       ' '.$self->_sqlcase($op).' ',
        map $_->[0], @parts
      );
      return (
@@ -992,27 +1094,24 @@ sub _render_op {
   die "unhandled";
 }
 
-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_expr($_) ], @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
@@ -1050,33 +1149,74 @@ sub _open_outer_paren {
 # ORDER BY
 #======================================================================
 
-sub _order_by {
+sub _expand_order_by {
   my ($self, $arg) = @_;
 
-  return '' unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg);
+  return unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg);
 
   my $expander = sub {
     my ($self, $dir, $expr) = @_;
-    my @exp = map +(defined($dir) ? { -op => [ $dir => $_ ] } : $_),
-                map $self->_expand_expr($_, undef, -ident),
-                  ref($expr) eq 'ARRAY' ? @$expr : $expr;
-    return (@exp > 1 ? { -op => [ ',', @exp ] } : $exp[0]);
+    my @to_expand = ref($expr) eq 'ARRAY' ? @$expr : $expr;
+    foreach my $arg (@to_expand) {
+      if (
+        ref($arg) eq 'HASH'
+        and keys %$arg > 1
+        and grep /^-(asc|desc)$/, keys %$arg
+      ) {
+        puke "ordering direction hash passed to order by must have exactly one key (-asc or -desc)";
+      }
+    }
+    my @exp = map +(
+                defined($dir) ? { -op => [ $dir =~ /^-?(.*)$/ ,=> $_ ] } : $_
+              ),
+                map $self->expand_expr($_, -ident),
+                map ref($_) eq 'ARRAY' ? @$_ : $_, @to_expand;
+    return (@exp > 1 ? { -list => \@exp } : $exp[0]);
   };
 
-  local $self->{custom_expansions} = {
-    asc => sub { shift->$expander(asc => @_) },
-    desc => sub { shift->$expander(desc => @_) },
-  };
+  local @{$self->{expand}}{qw(-asc -desc)} = (($expander) x 2);
 
-  my $expanded = $self->$expander(undef, $arg);
+  return $self->$expander(undef, $arg);
+}
+
+sub _order_by {
+  my ($self, $arg) = @_;
 
-  my ($sql, @bind) = $self->_render_expr($expanded);
+  return '' unless defined(my $expanded = $self->_expand_order_by($arg));
+
+  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;
 }
 
+# _order_by no longer needs to call this so doesn't but DBIC uses it.
+
+sub _order_by_chunks {
+  my ($self, $arg) = @_;
+
+  return () unless defined(my $expanded = $self->_expand_order_by($arg));
+
+  return $self->_chunkify_order_by($expanded);
+}
+
+sub _chunkify_order_by {
+  my ($self, $expanded) = @_;
+
+  return grep length, $self->render_aqt($expanded)
+    if $expanded->{-ident} or @{$expanded->{-literal}||[]} == 1;
+
+  for ($expanded) {
+    if (ref() eq 'HASH' and my $l = $_->{-list}) {
+      return map $self->_chunkify_order_by($_), @$l;
+    }
+    return [ $self->render_aqt($_) ];
+  }
+}
+
 #======================================================================
 # DATASOURCE (FOR NOW, JUST PLAIN TABLE OR LIST OF TABLES)
 #======================================================================
@@ -1084,7 +1224,7 @@ sub _order_by {
 sub _table  {
   my $self = shift;
   my $from = shift;
-  ($self->_render_expr(
+  ($self->render_aqt(
     $self->_expand_maybe_list_expr($from, undef, -ident)
   ))[0];
 }
@@ -1098,15 +1238,15 @@ sub _expand_maybe_list_expr {
   my ($self, $expr, $logic, $default) = @_;
   my $e = do {
     if (ref($expr) eq 'ARRAY') {
-      return { -op => [
-        ',', map $self->_expand_expr($_, $logic, $default), @$expr
+      return { -list => [
+        map $self->expand_expr($_, $default), @$expr
       ] } if @$expr > 1;
       $expr->[0]
     } else {
       $expr
     }
   };
-  return $self->_expand_expr($e, $logic, $default);
+  return $self->expand_expr($e, $default);
 }
 
 # highly optimized, as it's called way too often
@@ -1115,9 +1255,16 @@ sub _quote {
 
   return '' unless defined $_[1];
   return ${$_[1]} if ref($_[1]) eq 'SCALAR';
+  puke 'Identifier cannot be hashref' if ref($_[1]) eq 'HASH';
 
-  $_[0]->{quote_char} or
-    ($_[0]->_assert_pass_injection_guard($_[1]), return $_[1]);
+  unless ($_[0]->{quote_char}) {
+    if (ref($_[1]) eq 'ARRAY') {
+      return join($_[0]->{name_sep}||'.', @{$_[1]});
+    } else {
+      $_[0]->_assert_pass_injection_guard($_[1]);
+      return $_[1];
+    }
+  }
 
   my $qref = ref $_[0]->{quote_char};
   my ($l, $r) =
@@ -1128,9 +1275,21 @@ sub _quote {
   my $esc = $_[0]->{escape_char} || $r;
 
   # parts containing * are naturally unquoted
-  return join($_[0]->{name_sep}||'', map
-    +( $_ eq '*' ? $_ : do { (my $n = $_) =~ s/(\Q$esc\E|\Q$r\E)/$esc$1/g; $l . $n . $r } ),
-    ( $_[0]->{name_sep} ? split (/\Q$_[0]->{name_sep}\E/, $_[1] ) : $_[1] )
+  return join(
+    $_[0]->{name_sep}||'',
+    map +(
+      $_ eq '*'
+        ? $_
+        : do { (my $n = $_) =~ s/(\Q$esc\E|\Q$r\E)/$esc$1/g; $l . $n . $r }
+    ),
+    (ref($_[1]) eq 'ARRAY'
+      ? @{$_[1]}
+      : (
+          $_[0]->{name_sep}
+            ? split (/\Q$_[0]->{name_sep}\E/, $_[1] )
+            : $_[1]
+        )
+    )
   );
 }