X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FExtraClauses.pm;h=e668de8f41c74704662ff1b2c96bfe3df401a4f0;hb=93253a11f1f3e0ad2479e38f50963593394c9afc;hp=9e5ddff4b9fd7479af4f6b47ee3e8c31fcd3e734;hpb=1ff9018cf680b289394dbf93c0ec533bfaead7a7;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 9e5ddff..e668de8 100644
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -18,9 +18,144 @@ sub new {
     $_[0]->_expand_maybe_list_expr($_[1], -ident)
   };
   $new->{expand_clause}{'select.having'} = sub {
-    $_[0]->expand_expr($_[1], -ident)
+    $_[0]->expand_expr($_[1])
+  };
+  $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';
+  splice(@{$new->{clauses_of}{update}}, 2, 0, 'from');
+  splice(@{$new->{clauses_of}{delete}}, 1, 0, 'using');
+  $new->{expand_clause}{'update.from'} = '_expand_select_clause_from';
+  $new->{expand_clause}{'delete.using'} = sub {
+    +(using => $_[0]->_expand_from_list(undef, $_[1]));
+  };
+  $new->{expand_clause}{'insert.rowvalues'} = sub {
+    (from => $_[0]->expand_expr({ -values => $_[1] }));
+  };
+  $new->{expand_clause}{'insert.select'} = sub {
+    (from => $_[0]->expand_expr({ -select => $_[1] }));
   };
   return $new;
 }
 
+sub _expand_select_clause_from {
+  my ($self, $from) = @_;
+  +(from => $self->_expand_from_list(undef, $from));
+}
+
+sub _expand_from_list {
+  my ($self, undef, $args) = @_;
+  if (ref($args) eq 'HASH') {
+    return { -from_list => [ $self->expand_expr($args) ] };
+  }
+  my @list;
+  my @args = ref($args) ? @$args : ($args);
+  while (my $entry = shift @args) {
+    if (!ref($entry) and $entry =~ /^-(.*)/) {
+      if ($1 eq 'as') {
+        $list[-1] = $self->expand_expr({ -as => [
+          $list[-1], map +(ref($_) eq 'ARRAY' ? @$_ : $_), shift(@args)
+        ]});
+        next;
+      }
+      $entry = { $entry => shift @args };
+    }
+    my $aqt = $self->expand_expr($entry, -ident);
+    if ($aqt->{-join} and not $aqt->{-join}{from}) {
+      $aqt->{-join}{from} = pop @list;
+    }
+    push @list, $aqt;
+  }
+  return { -from_list => \@list };
+}
+
+sub _expand_join {
+  my ($self, undef, $args) = @_;
+  my %proto = (
+    ref($args) eq 'HASH'
+      ? %$args
+      : (to => $args->[0], @{$args}[1..$#$args])
+  );
+  if (my $as = delete $proto{as}) {
+    $proto{to} = { -as => [ $proto{to}, ref($as) eq 'ARRAY' ? @$as : $as ] };
+  }
+  if (defined($proto{using}) and ref(my $using = $proto{using}) ne 'HASH') {
+    $proto{using} = { -row => [
+      map [ $self->expand_expr($_, -ident) ],
+        ref($using) eq 'ARRAY' ? @$using: $using
+    ] };
+  }
+  my %ret = map +($_ => $self->expand_expr($proto{$_}, -ident)),
+              sort keys %proto;
+  return +{ -join => \%ret };
+}
+
+sub _render_from_list {
+  my ($self, $list) = @_;
+  return $self->_join_parts(', ', map [ $self->render_aqt($_) ], @$list);
+}
+
+sub _render_join {
+  my ($self, $args) = @_;
+
+  my @parts = (
+    [ $self->render_aqt($args->{from}) ],
+    [ $self->_sqlcase(
+        ($args->{type}
+          ? join(' ', split '_', $args->{type}).' '
+          : ''
+        )
+        .'join'
+      )
+    ],
+    [ $self->render_aqt(
+        map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}
+    ) ],
+    ($args->{on} ? (
+      [ $self->_sqlcase('on') ],
+      [ $self->render_aqt($args->{on}) ],
+    ) : ()),
+    ($args->{using} ? (
+      [ $self->_sqlcase('using') ],
+      [ $self->render_aqt($args->{using}) ],
+    ) : ()),
+  );
+  return $self->_join_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 };
+}
+
+sub _render_as {
+  my ($self, $args) = @_;
+  my ($thing, $as, @cols) = @$args;
+  return $self->_join_parts(
+    ' ',
+    [ $self->render_aqt(
+        map +($_->{-ident} ? $_ : { -row => [ $_ ] }), $thing
+    ) ],
+    [ $self->_sqlcase('as') ],
+    (@cols
+      ? [ $self->_join_parts('',
+            [ $self->render_aqt($as) ],
+            [ '(' ],
+            [ $self->_join_parts(
+                ', ',
+                map [ $self->render_aqt($_) ], @cols
+            ) ],
+            [ ')' ],
+        ) ]
+      : [ $self->render_aqt($as) ]
+    ),
+  );
+}
+
 1;