introduce keyword concept to avoid private methods

[dbsrgits/SQL-Abstract.git] / lib / SQL / Abstract / Clauses.pm

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index 8fb800d..3683f45 100644 (file)
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -284,8 +284,16 @@ BEGIN {
     expand op_expand render op_renderer clause_expand clause_render
   )) {
     my $key = join '_', reverse split '_', $type;
-    eval qq{sub ${type}er { shift->_ext_rw($key => \@_) }; 1 }
-      or die "Method builder failed: $@";
+    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: $@";
   }
 }
 
@@ -294,6 +302,9 @@ sub clauses_of {
   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;
 }