further conversion to expand system

[dbsrgits/SQL-Abstract.git] / lib / SQL / Abstract.pm

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 45114e6..d900050 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -192,8 +192,8 @@ sub new {
   $opt{expand_unary} = {};
 
   $opt{expand} = {
-    '-ident' => '_expand_ident',
-    '-fffvalue' => sub { +{ -bind => [ our $Cur_Col_Meta, $_[2] ] } },
+    -ident => '_expand_ident',
+    -value => sub { +{ -bind => [ our $Cur_Col_Meta, $_[2] ] } },
   };
 
   return bless \%opt, $class;
@@ -545,7 +545,7 @@ sub _expand_expr {
     }
     my ($key, $value) = %$expr;
     if (my $exp = $self->{expand}{$key}) {
-      $self->$exp($key, $value);
+      return $self->$exp($key, $value);
     }
     return $self->_expand_expr_hashpair($key, $value, $logic);
   }
@@ -669,12 +669,6 @@ sub _expand_expr_hashpair {
         return { -op => [ $op, $v ] };
       }
     }
-    if ($k eq '-value') {
-      return +{ -bind => [ our $Cur_Col_Meta, $v ] };
-    }
-#    if ($k eq '-ident') {
-#      return $self->_expand_ident(-ident => $v);
-#    }
     if (my $custom = $self->{expand_unary}{$k}) {
       return $self->$custom($v);
     }
@@ -723,7 +717,7 @@ sub _expand_expr_hashpair {
     if (keys %$v > 1) {
       return { -op => [
         'and',
-        map $self->_expand_expr_hashpair($k => { $_ => $v->{$_} }),
+        map $self->_expand_expr({ $k => { $_ => $v->{$_} } }),
           sort keys %$v
       ] };
     }
@@ -813,7 +807,7 @@ sub _expand_expr_hashpair {
       if (ref($vv) eq 'HASH') {
         return +{ -op => [
           $op,
-          map $self->_expand_expr_hashpair($k, { $_ => $vv->{$_} }),
+          map $self->_expand_expr({ $k, { $_ => $vv->{$_} } }),
             sort keys %$vv
         ] };
       }
@@ -856,7 +850,7 @@ sub _expand_expr_hashpair {
       }
       return +{ -op => [
         $logic =~ /^-(.*)$/,
-        map $self->_expand_expr_hashpair($k => { $vk => $_ }),
+        map $self->_expand_expr({ $k => { $vk => $_ } }),
           @values
       ] };
     }