add notreached barf to and/or processing

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 0ac8fdd..8584e19 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -642,6 +642,7 @@ sub _expand_expr_hashpair {
       if (ref($v) eq 'ARRAY') {
         return $self->_expand_expr($v, $logic);
       }
+      die "notreached";
     }
     {
       my $op = $k;
@@ -661,9 +662,6 @@ sub _expand_expr_hashpair {
         return { -op => [ $op, $v ] };
       }
     }
-    if (my $custom = $self->{expand_unary}{$k}) {
-      return $self->$custom($v);
-    }
     if ($self->{render}{$k}) {
       return { $k => $v };
     }
@@ -1134,16 +1132,15 @@ sub _expand_order_by {
         puke "ordering direction hash passed to order by must have exactly one key (-asc or -desc)";
       }
     }
-    my @exp = map +(defined($dir) ? { -op => [ $dir => $_ ] } : $_),
+    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->{expand_unary}}{qw(-asc -desc)} = (
-    sub { shift->$expander(asc => @_) },
-    sub { shift->$expander(desc => @_) },
-  );
+  local @{$self->{expand}}{qw(-asc -desc)} = (($expander) x 2);
 
   return $self->$expander(undef, $arg);
 }