X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FExtraClauses.pm;h=7bafdbad7546c05f7750e1567ffdb6dcf222dab2;hb=c671eba6c2751d65437e394d7061038826a912e0;hp=341d9da8775206d17d1419cda4f7ea3c33d3bca7;hpb=b5f4a8690d2fdce1eb714c6551d9fb421605b354;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 341d9da..7bafdba 100644
--- 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 {
@@ -74,46 +75,20 @@ 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;
-    });
-  });
-  my $expand_setop = $self->cb(sub {
-    my ($self, $setop, $args) = @_;
-    +{ "-${setop}" => {
-         %$args,
-         queries => [ map $self->expand_expr($_), @{$args->{queries}} ],
-    } };
+    $self->cb('_expand_select', $_[0], \@before_setop);
   });
-  $sqla->expanders(map +($_ => $expand_setop), qw(union intersect except));
 
   $sqla->clause_renderer('select.setop' => $self->cb(sub {
     my ($self, undef, $setop) = @_;
     $self->render_aqt($setop);
   }));
 
-  $sqla->renderer($_ => $self->cb('_render_setop'))
-    for qw(union intersect except);
+  foreach my $setop (qw(union intersect except)) {
+    $sqla->expander($setop => $self->cb('_expand_setop'));
+    $sqla->renderer($setop => $self->cb('_render_setop'));
+  }
 
-  my $setop_expander = $self->cb(sub {
-    my ($self, $setop, $args) = @_;
-    my ($op, $type) = split '_', $setop;
-    +(setop => $self->expand_expr({
-      "-${op}" => {
-        ($type ? (type => $type) : ()),
-        queries => (ref($args) eq 'ARRAY' ? $args : [ $args ])
-      }
-    }));
-  });
+  my $setop_expander = $self->cb('_expand_clause_setop');
 
   $sqla->clause_expanders(
     map +($_ => $setop_expander),
@@ -146,6 +121,18 @@ sub apply_to {
   return $sqla;
 }
 
+sub _expand_select {
+  my ($self, $orig, $before_setop) = (shift, shift, 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;
+}
+
 sub _expand_select_clause_from {
   my ($self, undef, $from) = @_;
   +(from => $self->_expand_from_list(undef, $from));
@@ -333,6 +320,14 @@ sub _render_with {
   );
 }
 
+sub _expand_setop {
+  my ($self, $setop, $args) = @_;
+  +{ "-${setop}" => {
+       %$args,
+       queries => [ map $self->expand_expr($_), @{$args->{queries}} ],
+  } };
+}
+
 sub _render_setop {
   my ($self, $setop, $args) = @_;
   $self->join_query_parts(
@@ -341,4 +336,15 @@ sub _render_setop {
   );
 }
 
+sub _expand_clause_setop {
+  my ($self, $setop, $args) = @_;
+  my ($op, $type) = split '_', $setop;
+  +(setop => $self->expand_expr({
+    "-${op}" => {
+      ($type ? (type => $type) : ()),
+      queries => (ref($args) eq 'ARRAY' ? $args : [ $args ])
+    }
+  }));
+}
+
 1;