X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FExtraClauses.pm;h=73e7073a3476a623be22496929b02f84674b7295;hb=a3040091c492c3fca3e8d22b4192572858f7ccf8;hp=b6f83f291fe1a44604f2c8af07b0042592f2e9fa;hpb=b99e9a14bd411a193042455b2474a8f41701a4cc;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index b6f83f2..73e7073 100644
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -4,44 +4,202 @@ use strict;
 use warnings;
 use if $] < '5.010', 'MRO::Compat';
 use mro 'c3';
-use base qw(SQL::Abstract::Clauses);
+use base qw(SQL::Abstract);
 
 BEGIN { *puke = \&SQL::Abstract::puke }
 
 sub new {
-  my ($proto, @args) = @_;
-  my $new = $proto->next::method(@args);
-  $new->{clauses_of}{select} = [
-    @{$new->{clauses_of}{select}}, qw(group_by having)
-  ];
-  $new->{expand_clause}{'select.group_by'} = sub {
-    $_[0]->_expand_maybe_list_expr($_[1], -ident)
+  my $self = shift->next::method(@_);
+  my @clauses = $self->clauses_of('select');
+  my @before_setop;
+  CLAUSE: foreach my $idx (0..$#clauses) {
+    if ($clauses[$idx] eq 'order_by') {
+      @before_setop = @clauses[0..$idx-1];
+      splice(@clauses, $idx, 0, qw(setop group_by having));
+      last CLAUSE;
+    }
+  }
+  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]) },
+  );
+  foreach my $thing (qw(join from_list)) {
+    $self->expander($thing => "_expand_${thing}")
+         ->renderer($thing => "_render_${thing}")
+  }
+  $self->op_expander(as => '_expand_op_as');
+  $self->expander(as => '_expand_op_as');
+  $self->renderer(as => '_render_as');
+  $self->expander(alias => sub {
+    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
+      ]
+    }
+  });
+  $self->renderer(alias => '_render_alias');
+
+  $self->clauses_of(update => sub {
+    my ($self, @clauses) = @_;
+    splice(@clauses, 2, 0, 'from');
+    @clauses;
+  });
+
+  $self->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 {
+      +(using => $_[0]->_expand_from_list(undef, $_[2]));
+    },
+    'insert.rowvalues' => sub {
+      +(from => $_[0]->expand_expr({ -values => $_[2] }));
+    },
+    'insert.select' => sub {
+      +(from => $_[0]->expand_expr({ -select => $_[2] }));
+    },
+  );
+
+  # set ops
+  $self->wrap_expander(select => sub {
+    my $orig = shift;
+    sub {
+      my $self = shift;
+      my $exp = $self->$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 = sub {
+    my ($self, $setop, $args) = @_;
+    +{ "-${setop}" => {
+         %$args,
+         queries => [ map $self->expand_expr($_), @{$args->{queries}} ],
+    } };
   };
-  $new->{expand_clause}{'select.having'} = sub {
-    $_[0]->expand_expr($_[1])
+  $self->expanders(map +($_ => $expand_setop), qw(union intersect except));
+
+  $self->clause_renderer('select.setop' => sub {
+    my ($self, undef, $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);
+
+  my $setop_expander = 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 ])
+      }
+    }));
   };
-  $new->{expand}{from_list} = '_expand_from_list';
-  $new->{render}{from_list} = '_render_from_list';
-  $new->{expand}{join} = '_expand_join';
-  $new->{render}{join} = '_render_join';
-  $new->{expand_op}{as} = '_expand_op_as';
-  $new->{expand}{as} = '_expand_op_as';
-  $new->{render}{as} = '_render_as';
-  return $new;
+
+  $self->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({ -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 });
+  });
+  $self->clause_expander('select.with_recursive', $with_expander);
+  $self->clause_renderer('select.with' => my $with_renderer = sub {
+    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,
+    );
+  });
+  foreach my $stmt (qw(insert update delete)) {
+    $self->clauses_of($stmt => 'with', $self->clauses_of($stmt));
+    $self->clause_expander("${stmt}.$_", $with_expander)
+      for qw(with with_recursive);
+    $self->clause_renderer("${stmt}.with", $with_renderer);
+  }
+  $self->expander(cast => sub {
+    return { -func => [ cast => $_[2] ] } if ref($_[2]) eq 'HASH';
+    my ($cast, $to) = @{$_[2]};
+    +{ -func => [ cast => { -as => [
+      $self->expand_expr($cast),
+      $self->expand_expr($to, -ident),
+    ] } ] };
+  });
+
+  return $self;
 }
 
 sub _expand_select_clause_from {
-  my ($self, $from) = @_;
+  my ($self, undef, $from) = @_;
   +(from => $self->_expand_from_list(undef, $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;
-  my @args = ref($args) ? @$args : ($args);
+  my @args = ref($args) eq 'ARRAY' ? @$args : ($args);
   while (my $entry = shift @args) {
     if (!ref($entry) and $entry =~ /^-(.*)/) {
       if ($1 eq 'as') {
@@ -69,7 +227,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} = [
+      map [ $self->expand_expr($_, -ident) ],
+        ref($using) eq 'ARRAY' ? @$using: $using
+    ];
   }
   my %ret = map +($_ => $self->expand_expr($proto{$_}, -ident)),
               sort keys %proto;
@@ -77,55 +241,72 @@ sub _expand_join {
 }
 
 sub _render_from_list {
-  my ($self, $list) = @_;
-  return $self->_join_parts(', ', map [ $self->render_aqt($_) ], @$list);
+  my ($self, undef, $list) = @_;
+  return $self->join_query_parts(', ', @$list);
 }
 
 sub _render_join {
-  my ($self, $args) = @_;
+  my ($self, undef, $args) = @_;
 
   my @parts = (
-    [ $self->render_aqt($args->{from}) ],
-    [ $self->_sqlcase(
-        ($args->{type}
-          ? join(' ', split '_', $args->{type}).' '
-          : ''
-        )
-        .'join'
-      )
-    ],
-    [ $self->render_aqt($args->{to}) ],
+    $args->{from},
+    $self->format_keyword(join '_', ($args->{type}||()), 'join'),
+    (map +($_->{-ident} || $_->{-as} ? $_ : ('(', $_, ')')), $args->{to}),
     ($args->{on} ? (
-      [ $self->_sqlcase('on') ],
-      [ $self->render_aqt($args->{on}) ],
+      $self->format_keyword('on') ,
+      $args->{on},
     ) : ()),
     ($args->{using} ? (
-      [ $self->_sqlcase('using') ],
-      [ $self->render_aqt($args->{using}) ],
+      $self->format_keyword('using'),
+      '(', $args->{using}, ')',
     ) : ()),
   );
-  return $self->_join_parts(' ', @parts);
+  return $self->join_query_parts(' ', @parts);
 }
 
 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, $args) = @_;
-  my ($thing, $as, @cols) = @$args;
-  return $self->_join_parts(
+  my ($self, undef, $args) = @_;
+  my ($thing, $alias) = @$args;
+  return $self->join_query_parts(
     ' ',
-    [ $self->render_aqt($thing) ],
-    [ $self->_sqlcase('as') ],
-    [ @cols
-        ? $self->render_aqt({ -func => [ $as, @cols ] })
-        : $self->render_aqt($as)
-    ],
+    $thing,
+    $self->format_keyword('as'),
+    $alias,
   );
 }
 
+sub _render_alias {
+  my ($self, undef, $args) = @_;
+  my ($as, @cols) = @$args;
+  return (@cols
+    ? $self->join_query_parts('',
+         $as,
+         '(',
+         $self->join_query_parts(
+           ', ',
+           @cols
+         ),
+         ')',
+      )
+    : $self->render_aqt($as)
+  );
+}
+
+sub _expand_update_clause_target {
+  my ($self, undef, $target) = @_;
+  +(target => $self->_expand_from_list(undef, $target));
+}
+
 1;