X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FClauses.pm;h=605424f85bb2db92901c39eec8f330589d4c74a6;hb=fe8b493f5d24be683bf3e3ddf2fb933ae8d193e6;hp=fd98e731a33a9b8afdffa20b836c92bfb0dcb408;hpb=2b0b3d43c5d042c60b97b0d84bfc85cfec9d82ac;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index fd98e73..605424f 100644
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -16,28 +16,28 @@ sub register_defaults {
   my ($self) = @_;
   $self->{clauses_of}{select} = [ qw(select from where order_by) ];
   $self->{expand}{select} = sub { shift->_expand_statement(@_) };
-  $self->{render}{select} = sub { shift->_render_statement(select => @_) };
+  $self->{render}{select} = sub { shift->_render_statement(@_) };
   $self->{expand_clause}{"select.$_"} = "_expand_select_clause_$_"
     for @{$self->{clauses_of}{select}};
   $self->{clauses_of}{update} = [ qw(target set where returning) ];
   $self->{expand}{update} = sub { shift->_expand_statement(@_) };
-  $self->{render}{update} = sub { shift->_render_statement(update => @_) };
+  $self->{render}{update} = sub { shift->_render_statement(@_) };
   $self->{expand_clause}{"update.$_"} = "_expand_update_clause_$_"
     for @{$self->{clauses_of}{update}};
   $self->{expand_clause}{'update.update'} = '_expand_update_clause_target';
   $self->{render_clause}{'update.target'} = sub {
-    my ($self, $target) = @_;
+    my ($self, undef, $target) = @_;
     my ($sql, @bind) = $self->render_aqt($target);
     ($self->_sqlcase('update ').$sql, @bind);
   };
   $self->{clauses_of}{delete} = [ qw(target where returning) ];
   $self->{expand}{delete} = sub { shift->_expand_statement(@_) };
-  $self->{render}{delete} = sub { shift->_render_statement(delete => @_) };
+  $self->{render}{delete} = sub { shift->_render_statement(@_) };
   $self->{expand_clause}{"delete.$_"} = "_expand_delete_clause_$_"
     for @{$self->{clauses_of}{delete}};
   $self->{expand_clause}{"delete.from"} = '_expand_delete_clause_target';
   $self->{render_clause}{'delete.target'} = sub {
-    my ($self, $from) = @_;
+    my ($self, undef, $from) = @_;
     my ($sql, @bind) = $self->render_aqt($from);
     ($self->_sqlcase('delete from ').$sql, @bind);
   };
@@ -45,29 +45,29 @@ sub register_defaults {
     'target', 'fields', 'from', 'returning'
   ];
   $self->{expand}{insert} = sub { shift->_expand_statement(@_) };
-  $self->{render}{insert} = sub { shift->_render_statement(insert => @_) };
+  $self->{render}{insert} = sub { shift->_render_statement(@_) };
   $self->{expand_clause}{'insert.into'} = '_expand_insert_clause_target';
   $self->{expand_clause}{'insert.target'} = '_expand_insert_clause_target';
   $self->{expand_clause}{'insert.fields'} = sub {
     return +{ -row => [
-      shift->_expand_maybe_list_expr(@_, -ident)
-    ] } if ref($_[1]) eq 'ARRAY';
-    return $_[1]; # should maybe still expand somewhat?
+      shift->_expand_maybe_list_expr($_[2], -ident)
+    ] } if ref($_[2]) eq 'ARRAY';
+    return $_[2]; # should maybe still expand somewhat?
   };
   $self->{expand_clause}{'insert.values'} = '_expand_insert_clause_values';
   $self->{expand_clause}{'insert.returning'} = sub {
     shift->_expand_maybe_list_expr(@_, -ident);
   };
   $self->{render_clause}{'insert.fields'} = sub {
-    return $_[0]->render_aqt($_[1]);
+    return $_[0]->render_aqt($_[2]);
   };
   $self->{render_clause}{'insert.target'} = sub {
-    my ($self, $from) = @_;
+    my ($self, undef, $from) = @_;
     my ($sql, @bind) = $self->render_aqt($from);
     ($self->_sqlcase('insert into ').$sql, @bind);
   };
   $self->{render_clause}{'insert.from'} = sub {
-    return $_[0]->render_aqt($_[1], 1);
+    return $_[0]->render_aqt($_[2], 1);
   };
   $self->{expand}{values} = '_expand_values';
   $self->{render}{values} = '_render_values';
@@ -78,61 +78,65 @@ sub register_defaults {
 }
 
 sub _expand_select_clause_select {
-  my ($self, $select) = @_;
+  my ($self, undef, $select) = @_;
   +(select => $self->_expand_maybe_list_expr($select, -ident));
 }
 
 sub _expand_select_clause_from {
-  my ($self, $from) = @_;
+  my ($self, undef, $from) = @_;
   +(from => $self->_expand_maybe_list_expr($from, -ident));
 }
 
 sub _expand_select_clause_where {
-  my ($self, $where) = @_;
+  my ($self, undef, $where) = @_;
   +(where => $self->expand_expr($where));
 }
 
 sub _expand_select_clause_order_by {
-  my ($self, $order_by) = @_;
+  my ($self, undef, $order_by) = @_;
   +(order_by => $self->_expand_order_by($order_by));
 }
 
 sub _expand_update_clause_target {
-  my ($self, $target) = @_;
+  my ($self, undef, $target) = @_;
   +(target => $self->_expand_maybe_list_expr($target, -ident));
 }
 
 sub _expand_update_clause_set {
-  return $_[1] if ref($_[1]) eq 'HASH' and ($_[1]->{-op}||[''])->[0] eq ',';
-  +(set => shift->_expand_update_set_values(@_));
+  return $_[2] if ref($_[2]) eq 'HASH' and ($_[2]->{-op}||[''])->[0] eq ',';
+  +(set => $_[0]->_expand_update_set_values($_[1], $_[2]));
 }
 
 sub _expand_update_clause_where {
-  +(where => shift->expand_expr(@_));
+  +(where => $_[0]->expand_expr($_[2]));
 }
 
 sub _expand_update_clause_returning {
-  +(returning => shift->_expand_maybe_list_expr(@_, -ident));
+  +(returning => $_[0]->_expand_maybe_list_expr($_[2], -ident));
 }
 
 sub _expand_delete_clause_target {
-  +(target => shift->_expand_maybe_list_expr(@_, -ident));
+  +(target => $_[0]->_expand_maybe_list_expr($_[2], -ident));
 }
 
-sub _expand_delete_clause_where { +(where => shift->expand_expr(@_)); }
+sub _expand_delete_clause_where { +(where => $_[0]->expand_expr($_[2])); }
 
 sub _expand_delete_clause_returning {
-  +(returning => shift->_expand_maybe_list_expr(@_, -ident));
+  +(returning => $_[0]->_expand_maybe_list_expr($_[2], -ident));
 }
 
 sub _expand_statement {
   my ($self, $type, $args) = @_;
   my $ec = $self->{expand_clause};
+  if ($args->{_}) {
+    $args = { %$args };
+    $args->{$type} = delete $args->{_}
+  }
   return +{ "-${type}" => +{
     map {
       my $val = $args->{$_};
       if (defined($val) and my $exp = $ec->{"${type}.$_"}) {
-        if ((my (@exp) = $self->$exp($val)) == 1) {
+        if ((my (@exp) = $self->$exp($_ => $val)) == 1) {
           ($_ => $exp[0])
         } else {
           @exp
@@ -152,7 +156,7 @@ sub _render_statement {
     local $self->{convert_where} = $self->{convert} if $clause eq 'where';
     my ($sql) = my @part = do {
       if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
-        $self->$rdr($clause_expr);
+        $self->$rdr($clause, $clause_expr);
       } else {
         my ($clause_sql, @bind) = $self->render_aqt($clause_expr, 1);
         my $sql = join ' ',
@@ -234,11 +238,11 @@ sub insert {
 }
 
 sub _expand_insert_clause_target {
-  +(target => shift->_expand_maybe_list_expr(@_, -ident));
+  +(target => $_[0]->_expand_maybe_list_expr($_[2], -ident));
 }
 
 sub _expand_insert_clause_values {
-  my ($self, $data) = @_;
+  my ($self, undef, $data) = @_;
   if (ref($data) eq 'HASH' and (keys(%$data))[0] =~ /^-/) {
     return $self->expand_expr($data);
   }
@@ -259,7 +263,7 @@ sub _expand_values {
 }
 
 sub _render_values {
-  my ($self, $values) = @_;
+  my ($self, undef, $values) = @_;
   my ($v_sql, @bind) = $self->join_clauses(
     ', ',
     map [ $self->render_aqt($_) ],
@@ -323,5 +327,4 @@ sub clone {
   );
 }
 
-
 1;