refactor to add the rest of the setops

[scpubgit/Q-Branch.git] / lib / SQL / Abstract / Clauses.pm

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index 8fb800d..fd98e73 100644 (file)
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -164,7 +164,7 @@ sub _render_statement {
     next unless defined($sql) and length($sql);
     push @parts, \@part;
   }
-  my ($sql, @bind) = $self->_join_parts(' ', @parts);
+  my ($sql, @bind) = $self->join_clauses(' ', @parts);
   return (
     (our $Render_Top_Level ? $sql : '('.$sql.')'),
     @bind
@@ -260,7 +260,7 @@ sub _expand_values {
 
 sub _render_values {
   my ($self, $values) = @_;
-  my ($v_sql, @bind) = $self->_join_parts(
+  my ($v_sql, @bind) = $self->join_clauses(
     ', ',
     map [ $self->render_aqt($_) ],
       ref($values) eq 'ARRAY' ? @$values : $values
@@ -274,18 +274,26 @@ sub _render_values {
 
 sub _ext_rw {
   my ($self, $name, $key, $value) = @_;
-  return $self->{$name}{$key} unless @_ > 2;
+  return $self->{$name}{$key} unless @_ > 3;
   $self->{$name}{$key} = $value;
   return $self;
 }
 
 BEGIN {
   foreach my $type (qw(
-    expand op_expand render op_renderer clause_expand clause_render
+    expand op_expand render op_render 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;
 }