X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FClauses.pm;h=0ae82ac9c1f85e9f181dc4e325056d3c5111fe0e;hb=44296b4e3bbf31fcbd88bedacfb4bdb989eeb607;hp=d769abd401541d7782330ee2a5e563b64640c92d;hpb=df0f5af9acf9eb0d408dfbbd59382850a1cbf1e6;p=dbsrgits%2FSQL-Abstract.git

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index d769abd..0ae82ac 100644
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -21,24 +21,13 @@ sub register_defaults {
   $self->{clauses_of}{update} = [ qw(update set where returning) ];
   $self->{expand}{update} = sub { shift->_expand_statement(@_) };
   $self->{render}{update} = sub { shift->_render_statement(update => @_) };
-  $self->{expand_clause}{'update.update'} = sub {
-    $_[0]->expand_expr($_[1], -ident)
-  };
-  $self->{expand_clause}{'update.set'} = '_expand_update_set_values';
-  $self->{expand_clause}{'update.where'} = 'expand_expr';
-  $self->{expand_clause}{'update.returning'} = sub {
-    shift->_expand_maybe_list_expr(@_, -ident);
-  };
+  $self->{expand_clause}{"update.$_"} = "_expand_update_clause_$_"
+    for @{$self->{clauses_of}{update}};
   $self->{clauses_of}{delete} = [ qw(delete_from where returning) ];
   $self->{expand}{delete} = sub { shift->_expand_statement(@_) };
   $self->{render}{delete} = sub { shift->_render_statement(delete => @_) };
-  $self->{expand_clause}{'delete.delete_from'} = sub {
-    $_[0]->_expand_maybe_list_expr($_[1], -ident)
-  };
-  $self->{expand_clause}{'delete.where'} = 'expand_expr';
-  $self->{expand_clause}{'delete.returning'} = sub {
-    shift->_expand_maybe_list_expr(@_, -ident);
-  };
+  $self->{expand_clause}{"delete.$_"} = "_expand_delete_clause_$_"
+    for @{$self->{clauses_of}{delete}};
   $self->{clauses_of}{insert} = [
     'insert_into', 'fields', 'values', 'returning'
   ];
@@ -76,6 +65,33 @@ sub _expand_select_clause_order_by {
   +(order_by => $self->_expand_order_by($order_by));
 }
 
+sub _expand_update_clause_update {
+  my ($self, $target) = @_;
+  +(update => $self->expand_expr($target, -ident));
+}
+
+sub _expand_update_clause_set {
+  +(set => shift->_expand_update_set_values(@_));
+}
+
+sub _expand_update_clause_where {
+  +(where => shift->expand_expr(@_));
+}
+
+sub _expand_update_clause_returning {
+  +(returning => shift->_expand_maybe_list_expr(@_, -ident));
+}
+
+sub _expand_delete_clause_delete_from {
+  +(delete_from => shift->_expand_maybe_list_expr(@_, -ident));
+}
+
+sub _expand_delete_clause_where { +(where => shift->expand_expr(@_)); }
+
+sub _expand_delete_clause_returning {
+  +(returning => shift->_expand_maybe_list_expr(@_, -ident));
+}
+
 sub _expand_statement {
   my ($self, $type, $args) = @_;
   my $ec = $self->{expand_clause};