unop expander wrapper conversion

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

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 27f88f9..7a70118 100644 (file)
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -10,11 +10,12 @@ has sqla => (
   ) ],
 );
 
-BEGIN { *puke = \&SQL::Abstract::puke }
-
 sub cb {
-  my ($self, $method) = @_;
-  return sub { local $self->{sqla} = shift; $self->$method(@_) };
+  my ($self, $method, @args) = @_;
+  return sub {
+    local $self->{sqla} = shift;
+    $self->$method(@args, @_)
+  };
 }
 
 sub apply_to {
@@ -60,10 +61,8 @@ sub apply_to {
   });
 
   $sqla->clause_expanders(
-    'update.from' => $self->cb('_expand_select_clause_from'),
-    'delete.using' => $self->cb(sub {
-      +(using => $_[0]->_expand_from_list(undef, $_[2]));
-    }),
+    'update.from' => $self->cb('_expand_from_list'),
+    'delete.using' => $self->cb('_expand_from_list'),
     'insert.rowvalues' => $self->cb(sub {
       +(from => $_[0]->expand_expr({ -values => $_[2] }));
     }),
@@ -74,24 +73,12 @@ sub apply_to {
 
   # set ops
   $sqla->wrap_expander(select => sub {
-    my $orig = shift;
-    $self->cb(sub {
-      my $self = shift;
-      my $exp = $self->sqla->$orig(@_);
-      return $exp unless my $setop = (my $sel = $exp->{-select})->{setop};
-      if (my @keys = grep $sel->{$_}, @before_setop) {
-        my %inner; @inner{@keys} = delete @{$sel}{@keys};
-        unshift @{(values(%$setop))[0]{queries}},
-          { -select => \%inner };
-      }
-      return $exp;
-    });
+    $self->cb('_expand_select', $_[0], \@before_setop);
   });
 
-  $sqla->clause_renderer('select.setop' => $self->cb(sub {
-    my ($self, undef, $setop) = @_;
-    $self->render_aqt($setop);
-  }));
+  $sqla->clause_renderer(
+    'select.setop' => $self->cb(sub { $_[0]->render_aqt($_[2]); })
+  );
 
   foreach my $setop (qw(union intersect except)) {
     $sqla->expander($setop => $self->cb('_expand_setop'));
@@ -123,7 +110,7 @@ sub apply_to {
   $sqla->expander(cast => $self->cb('_expand_cast'));
 
   $sqla->clause_expanders(
-    "select.from", $self->cb('_expand_select_clause_from'),
+    "select.from", $self->cb('_expand_from_list'),
     "update.target", $self->cb('_expand_update_clause_target'),
     "update.update", $self->cb('_expand_update_clause_target'),
   );
@@ -131,9 +118,16 @@ sub apply_to {
   return $sqla;
 }
 
-sub _expand_select_clause_from {
-  my ($self, undef, $from) = @_;
-  +(from => $self->_expand_from_list(undef, $from));
+sub _expand_select {
+  my ($self, $orig, $before_setop, @args) = @_;
+  my $exp = $self->sqla->$orig(@args);
+  return $exp unless my $setop = (my $sel = $exp->{-select})->{setop};
+  if (my @keys = grep $sel->{$_}, @$before_setop) {
+    my %inner; @inner{@keys} = delete @{$sel}{@keys};
+    unshift @{(values(%$setop))[0]{queries}},
+      { -select => \%inner };
+  }
+  return $exp;
 }
 
 sub _expand_from_list {