switch ident/value to proposed unop style

[scpubgit/Q-Branch.git] / lib / SQL / Abstract.pm

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index a8ccbb5..4cc2c3a 100644 (file)
--- 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,19 +199,28 @@ 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_andor'),
+    (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}||{}}
@@ -561,7 +568,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 ) {
@@ -575,7 +582,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 };
@@ -667,7 +674,7 @@ sub _expand_expr_hashpair {
   }
   if (ref($v) eq 'HASH') {
     if (keys %$v > 1) {
-      return $self->_expand_andor(-and => [
+      return $self->_expand_op_andor(-and => [
         map +{ $k => { $_ => $v->{$_} } },
           sort keys %$v
       ]);
@@ -733,7 +740,7 @@ 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 $self->_expand_andor($logic => [
+      return $self->_expand_op_andor($logic => [
         map +{ $k => { $vk => $_ } },
           @values
       ]);
@@ -770,7 +777,7 @@ sub _expand_expr_hashpair {
         ? shift(@{$v = [ @$v ]})
         : '-'.lc($self->{logic} || 'OR')
     );
-    return $self->_expand_andor(
+    return $self->_expand_op_andor(
       $logic => [ map +{ $k => $_ }, @$v ]
     );
   }
@@ -821,7 +828,7 @@ sub _expand_bool {
   return $self->_expand_ident(-ident => $v);
 }
 
-sub _expand_andor {
+sub _expand_op_andor {
   my ($self, $logic, $v, $k) = @_;
   if (defined $k) {
     $v = [ map +{ $k, { $_ => $v->{$_} } },
@@ -831,7 +838,7 @@ sub _expand_andor {
   if (ref($v) eq 'HASH') {
     return +{ -op => [
       $logop,
-      map $self->_expand_expr({ $_ => $v->{$_} }, $logop),
+      map $self->_expand_expr({ $_ => $v->{$_} }),
         sort keys %$v
     ] };
   }