From: Matt S Trout <mst@shadowcat.co.uk>
Date: Mon, 23 Sep 2019 02:29:25 +0000 (+0000)
Subject: clean up EC _expand_select
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=093442c84c0bb4cabff6d1f224c17384ec9e88d0;p=scpubgit%2FQ-Branch.git

clean up EC _expand_select
---

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 7bafdba..e3d1dd6 100644
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -122,8 +122,8 @@ sub apply_to {
 }
 
 sub _expand_select {
-  my ($self, $orig, $before_setop) = (shift, shift, shift);
-  my $exp = $self->sqla->$orig(@_);
+  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};