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

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 9eb04a8..341d9da 100644
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -1,17 +1,26 @@
 package SQL::Abstract::ExtraClauses;
 
-use strict;
-use warnings;
-use if $] < '5.010', 'MRO::Compat';
-use mro 'c3';
-use base qw(SQL::Abstract::Clauses);
+use Moo;
+
+has sqla => (
+  is => 'ro', init_arg => undef,
+  handles => [ qw(
+    expand_expr expand_maybe_list_expr render_aqt
+    format_keyword join_query_parts
+  ) ],
+);
 
 BEGIN { *puke = \&SQL::Abstract::puke }
 
-sub register_defaults {
-  my $self = shift;
-  $self->next::method(@_);
-  my @clauses = $self->clauses_of('select');
+sub cb {
+  my ($self, $method) = @_;
+  return sub { local $self->{sqla} = shift; $self->$method(@_) };
+}
+
+sub apply_to {
+  my ($self, $sqla) = @_;
+  $self = $self->new unless ref($self);
+  my @clauses = $sqla->clauses_of('select');
   my @before_setop;
   CLAUSE: foreach my $idx (0..$#clauses) {
     if ($clauses[$idx] eq 'order_by') {
@@ -21,52 +30,54 @@ sub register_defaults {
     }
   }
   die "Huh?" unless @before_setop;
-  $self->clauses_of(select => 'with', @clauses);
-  $self->clause_expanders(
-    'select.group_by', sub {
-      $_[0]->_expand_maybe_list_expr($_[2], -ident)
-    },
-    'select.having', sub { $_[0]->expand_expr($_[2]) },
+  $sqla->clauses_of(select => 'with', @clauses);
+  $sqla->clause_expanders(
+    'select.group_by', $self->cb(sub {
+      $_[0]->expand_maybe_list_expr($_[2], -ident)
+    }),
+    'select.having', $self->cb(sub { $_[0]->expand_expr($_[2]) }),
   );
   foreach my $thing (qw(join from_list)) {
-    $self->expander($thing => "_expand_${thing}")
-         ->renderer($thing => "_render_${thing}")
+    $sqla->expander($thing => $self->cb("_expand_${thing}"))
+         ->renderer($thing => $self->cb("_render_${thing}"))
   }
-  $self->op_expander(as => '_expand_op_as');
-  $self->expander(as => '_expand_op_as');
-  $self->renderer(as => '_render_as');
+  $sqla->op_expander(as => $self->cb('_expand_op_as'));
+  $sqla->expander(as => $self->cb('_expand_op_as'));
+  $sqla->renderer(as => $self->cb('_render_as'));
+  $sqla->expander(alias => $self->cb('_expand_alias'));
+  $sqla->renderer(alias => $self->cb('_render_alias'));
 
-  $self->clauses_of(update => sub {
+  $sqla->clauses_of(update => sub {
     my ($self, @clauses) = @_;
     splice(@clauses, 2, 0, 'from');
     @clauses;
   });
 
-  $self->clauses_of(delete => sub {
+  $sqla->clauses_of(delete => sub {
     my ($self, @clauses) = @_;
     splice(@clauses, 1, 0, 'using');
     @clauses;
   });
 
-  $self->clause_expanders(
-    'update.from' => '_expand_select_clause_from',
-    'delete.using' => sub {
+  $sqla->clause_expanders(
+    'update.from' => $self->cb('_expand_select_clause_from'),
+    'delete.using' => $self->cb(sub {
       +(using => $_[0]->_expand_from_list(undef, $_[2]));
-    },
-    'insert.rowvalues' => sub {
+    }),
+    'insert.rowvalues' => $self->cb(sub {
       +(from => $_[0]->expand_expr({ -values => $_[2] }));
-    },
-    'insert.select' => sub {
+    }),
+    'insert.select' => $self->cb(sub {
       +(from => $_[0]->expand_expr({ -select => $_[2] }));
-    },
+    }),
   );
 
   # set ops
-  $self->wrap_expander(select => sub {
+  $sqla->wrap_expander(select => sub {
     my $orig = shift;
-    sub {
+    $self->cb(sub {
       my $self = shift;
-      my $exp = $self->$orig(@_);
+      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};
@@ -74,31 +85,26 @@ sub register_defaults {
           { -select => \%inner };
       }
       return $exp;
-    }
+    });
   });
-  my $expand_setop = sub {
+  my $expand_setop = $self->cb(sub {
     my ($self, $setop, $args) = @_;
     +{ "-${setop}" => {
          %$args,
          queries => [ map $self->expand_expr($_), @{$args->{queries}} ],
     } };
-  };
-  $self->expanders(map +($_ => $expand_setop), qw(union intersect except));
+  });
+  $sqla->expanders(map +($_ => $expand_setop), qw(union intersect except));
 
-  $self->clause_renderer('select.setop' => sub {
+  $sqla->clause_renderer('select.setop' => $self->cb(sub {
     my ($self, undef, $setop) = @_;
-    @{ $self->render_aqt($setop) };
-  });
+    $self->render_aqt($setop);
+  }));
 
-  $self->renderer($_ => sub {
-    my ($self, $setop, $args) = @_;
-    $self->join_query_parts(
-      ' '.$self->format_keyword(join '_', $setop, ($args->{type}||())).' ',
-      @{$args->{queries}}
-    );
-  }) for qw(union intersect except);
+  $sqla->renderer($_ => $self->cb('_render_setop'))
+    for qw(union intersect except);
 
-  my $setop_expander = sub {
+  my $setop_expander = $self->cb(sub {
     my ($self, $setop, $args) = @_;
     my ($op, $type) = split '_', $setop;
     +(setop => $self->expand_expr({
@@ -107,56 +113,37 @@ sub register_defaults {
         queries => (ref($args) eq 'ARRAY' ? $args : [ $args ])
       }
     }));
-  };
+  });
 
-  $self->clause_expanders(
+  $sqla->clause_expanders(
     map +($_ => $setop_expander),
       map "select.${_}",
         map +($_, "${_}_all", "${_}_distinct"),
           qw(union intersect except)
   );
 
-  $self->clause_expander('select.with' => my $with_expander = sub {
-    my ($self, $name, $with) = @_;
-    my (undef, $type) = split '_', $name;
-    if (ref($with) eq 'HASH') {
-      return +{
-        %$with,
-        queries => [ map $self->expand_expr($_), @{$with->{queries}} ]
-      }
-    }
-    my @with = @$with;
-    my @exp;
-    while (my ($name, $query) = splice @with, 0, 2) {
-      my @n = map $self->expand_expr($_, -ident),
-                ref($name) eq 'ARRAY' ? @$name : $name;
-      push @exp, [
-        \@n,
-        $self->expand_expr($query)
-      ];
-    }
-    return +(with => { ($type ? (type => $type) : ()), queries => \@exp });
-  });
-  $self->clause_expander('select.with_recursive', $with_expander);
-  $self->clause_renderer('select.with' => sub {
-    my ($self, undef, $with) = @_;
-    my $q_part = [ $self->join_query_parts(', ',
-      map {
-        my ($alias, $query) = @$_;
-        [ $self->join_query_parts(' ',
-            $self->_render_alias($alias),
-            $self->format_keyword('as'),
-            $query,
-        ) ]
-      } @{$with->{queries}}
-    ) ];
-    return $self->join_query_parts(' ',
-      $self->format_keyword(join '_', 'with', ($with->{type}||'')),
-      $q_part,
-    );
-  });
+  my $w_exp = $self->cb('_expand_with');
+  my $w_rdr = $self->cb('_render_with');
+  $sqla->clause_expander('select.with' => $w_exp);
+  $sqla->clause_expander('select.with_recursive' => $w_exp);
+  $sqla->clause_renderer('select.with' => $w_rdr);
+
+  foreach my $stmt (qw(insert update delete)) {
+    $sqla->clauses_of($stmt => 'with', $sqla->clauses_of($stmt));
+    $sqla->clause_expander("${stmt}.$_" => $w_exp)
+      for qw(with with_recursive);
+    $sqla->clause_renderer("${stmt}.with" => $w_rdr);
+  }
 
-  return $self;
+  $sqla->expander(cast => $self->cb('_expand_cast'));
+
+  $sqla->clause_expanders(
+    "select.from", $self->cb('_expand_select_clause_from'),
+    "update.target", $self->cb('_expand_update_clause_target'),
+    "update.update", $self->cb('_expand_update_clause_target'),
+  );
+
+  return $sqla;
 }
 
 sub _expand_select_clause_from {
@@ -167,6 +154,7 @@ sub _expand_select_clause_from {
 sub _expand_from_list {
   my ($self, undef, $args) = @_;
   if (ref($args) eq 'HASH') {
+    return $args if $args->{-from_list};
     return { -from_list => [ $self->expand_expr($args) ] };
   }
   my @list;
@@ -198,13 +186,13 @@ sub _expand_join {
       : (to => $args->[0], @{$args}[1..$#$args])
   );
   if (my $as = delete $proto{as}) {
-    $proto{to} = { -as => [ $proto{to}, ref($as) eq 'ARRAY' ? @$as : $as ] };
+    $proto{to} = $self->expand_expr({ -as => [ $proto{to}, $as ] });
   }
   if (defined($proto{using}) and ref(my $using = $proto{using}) ne 'HASH') {
-    $proto{using} = { -row => [
+    $proto{using} = [
       map [ $self->expand_expr($_, -ident) ],
         ref($using) eq 'ARRAY' ? @$using: $using
-    ] };
+    ];
   }
   my %ret = map +($_ => $self->expand_expr($proto{$_}, -ident)),
               sort keys %proto;
@@ -222,14 +210,14 @@ sub _render_join {
   my @parts = (
     $args->{from},
     $self->format_keyword(join '_', ($args->{type}||()), 'join'),
-    (map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}),
+    (map +($_->{-ident} || $_->{-as} ? $_ : ('(', $_, ')')), $args->{to}),
     ($args->{on} ? (
       $self->format_keyword('on') ,
       $args->{on},
     ) : ()),
     ($args->{using} ? (
       $self->format_keyword('using'),
-      $args->{using},
+      '(', $args->{using}, ')',
     ) : ()),
   );
   return $self->join_query_parts(' ', @parts);
@@ -237,34 +225,39 @@ sub _render_join {
 
 sub _expand_op_as {
   my ($self, undef, $vv, $k) = @_;
-  my @as = map $self->expand_expr($_, -ident),
-             (defined($k) ? ($k) : ()), ref($vv) eq 'ARRAY' ? @$vv : $vv;
-  return { -as => \@as };
+  my @vv = (ref($vv) eq 'ARRAY' ? @$vv : $vv);
+  $k ||= shift @vv;
+  my $ik = $self->expand_expr($k, -ident);
+  return +{ -as => [ $ik, $self->expand_expr($vv[0], -alias) ] }
+    if @vv == 1 and ref($vv[0]) eq 'HASH';
+
+  my @as = map $self->expand_expr($_, -ident), @vv;
+  return { -as => [ $ik, { -alias => \@as } ] };
 }
 
 sub _render_as {
   my ($self, undef, $args) = @_;
-  my ($thing, @alias) = @$args;
+  my ($thing, $alias) = @$args;
   return $self->join_query_parts(
     ' ',
-    $self->render_aqt($thing),
+    $thing,
     $self->format_keyword('as'),
-    $self->_render_alias(\@alias),
+    $alias,
   );
 }
 
 sub _render_alias {
-  my ($self, $args) = @_;
+  my ($self, undef, $args) = @_;
   my ($as, @cols) = @$args;
   return (@cols
     ? $self->join_query_parts('',
          $as,
-         [ '(' ],
-         [ $self->join_query_parts(
-             ', ',
-             @cols
-         ) ],
-         [ ')' ],
+         '(',
+         $self->join_query_parts(
+           ', ',
+           @cols
+         ),
+         ')',
       )
     : $self->render_aqt($as)
   );
@@ -275,4 +268,77 @@ sub _expand_update_clause_target {
   +(target => $self->_expand_from_list(undef, $target));
 }
 
+sub _expand_cast {
+  my ($self, undef, $thing) = @_;
+  return { -func => [ cast => $thing ] } if ref($thing) eq 'HASH';
+  my ($cast, $to) = @{$thing};
+  +{ -func => [ cast => { -as => [
+    $self->expand_expr($cast),
+    $self->expand_expr($to, -ident),
+  ] } ] };
+}
+
+sub _expand_alias {
+  my ($self, undef, $args) = @_;
+  if (ref($args) eq 'HASH' and my $alias = $args->{-alias}) {
+    $args = $alias;
+  }
+  +{ -alias => [
+      map $self->expand_expr($_, -ident),
+      ref($args) eq 'ARRAY' ? @{$args} : $args
+    ]
+  }
+}
+
+sub _expand_with {
+  my ($self, $name, $with) = @_;
+  my (undef, $type) = split '_', $name;
+  if (ref($with) eq 'HASH') {
+    return +{
+      %$with,
+      queries => [
+        map +[
+          $self->expand_expr({ -alias => $_->[0] }, -ident),
+          $self->expand_expr($_->[1]),
+        ], @{$with->{queries}}
+      ]
+    }
+  }
+  my @with = @$with;
+  my @exp;
+  while (my ($alias, $query) = splice @with, 0, 2) {
+    push @exp, [
+      $self->expand_expr({ -alias => $alias }, -ident),
+      $self->expand_expr($query)
+    ];
+  }
+  return +(with => { ($type ? (type => $type) : ()), queries => \@exp });
+}
+
+sub _render_with {
+  my ($self, undef, $with) = @_;
+  my $q_part = $self->join_query_parts(', ',
+    map {
+      my ($alias, $query) = @$_;
+      $self->join_query_parts(' ',
+          $alias,
+          $self->format_keyword('as'),
+          $query,
+      )
+    } @{$with->{queries}}
+  );
+  return $self->join_query_parts(' ',
+    $self->format_keyword(join '_', 'with', ($with->{type}||'')),
+    $q_part,
+  );
+}
+
+sub _render_setop {
+  my ($self, $setop, $args) = @_;
+  $self->join_query_parts(
+    ' '.$self->format_keyword(join '_', $setop, ($args->{type}||())).' ',
+    @{$args->{queries}}
+  );
+}
+
 1;