X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FClauses.pm;h=3683f451f832c41aeea3d6643097975c421007d6;hb=ee706e89c8703b720f970a16163d36de9a30e7d4;hp=07d126451994712ba73eb08c5be90217c83e6867;hpb=345700930861933507c595d05a5a0995a7356b0b;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index 07d1264..3683f45 100644
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -279,18 +279,32 @@ sub _ext_rw {
   return $self;
 }
 
-sub expander { shift->_ext_rw(expand => @_) }
-sub op_expander { shift->_ext_rw(expand_op => @_) }
-sub renderer { shift->_ext_rw(render => @_) }
-sub op_renderer { shift->_ext_rw(expand_op => @_) }
-sub clause_expander { shift->_ext_rw(expand_cluse => @_) }
-sub clause_renderer { shift->_ext_rw(render_clause => @_) }
+BEGIN {
+  foreach my $type (qw(
+    expand op_expand render op_renderer clause_expand clause_render
+  )) {
+    my $key = join '_', reverse split '_', $type;
+    my $singular = "${type}er";
+    eval qq{sub ${singular} { shift->_ext_rw($key => \@_) }; 1 }
+      or die "Method builder failed for ${type}er: $@";
+    eval qq{sub ${singular}s {
+      my (\$self, \@args) = \@_;
+      while (my (\$this_key, \$this_value) = splice(\@args, 0, 2)) {
+        \$self->{${key}}{\$this_key} = \$this_value;
+      }
+      return \$self;
+    }; 1 } or die "Method builder failed for ${singular}s: $@";
+  }
+}
 
 sub clauses_of {
   my ($self, $of, @clauses) = @_;
   unless (@clauses) {
     return @{$self->{clauses_of}{$of}||[]};
   }
+  if (ref($clauses[0]) eq 'CODE') {
+    @clauses = $self->${\($clauses[0])}(@{$self->{clauses_of}{$of}||[]});
+  }
   $self->{clauses_of}{$of} = \@clauses;
   return $self;
 }