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

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index 605424f..7b4cc7e 100644
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -168,7 +168,7 @@ sub _render_statement {
     next unless defined($sql) and length($sql);
     push @parts, \@part;
   }
-  my ($sql, @bind) = $self->join_clauses(' ', @parts);
+  my ($sql, @bind) = $self->join_query_parts(' ', @parts);
   return (
     (our $Render_Top_Level ? $sql : '('.$sql.')'),
     @bind
@@ -264,7 +264,7 @@ sub _expand_values {
 
 sub _render_values {
   my ($self, undef, $values) = @_;
-  my ($v_sql, @bind) = $self->join_clauses(
+  my ($v_sql, @bind) = $self->join_query_parts(
     ', ',
     map [ $self->render_aqt($_) ],
       ref($values) eq 'ARRAY' ? @$values : $values
@@ -287,20 +287,32 @@ BEGIN {
   foreach my $type (qw(
     expand op_expand render op_render clause_expand clause_render
   )) {
-    my $key = join '_', reverse split '_', $type;
+    my $name = 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} { shift->_ext_rw($name => \@_) }; 1 }
+      or die "Method builder failed for ${singular}: $@";
+    eval qq{sub wrap_${singular} {
+      my (\$self, \$key, \$builder) = \@_;
+      my \$orig = \$self->_ext_rw('${name}', \$key);
+      \$self->_ext_rw(
+        '${name}', \$key,
+        \$builder->(\$orig, '${name}', \$key)
+      );
+    }; 1 } or die "Method builder failed for wrap_${singular}: $@";
     eval qq{sub ${singular}s {
       my (\$self, \@args) = \@_;
       while (my (\$this_key, \$this_value) = splice(\@args, 0, 2)) {
-        \$self->{${key}}{\$this_key} = \$this_value;
+        \$self->{${name}}{\$this_key} = \$this_value;
       }
       return \$self;
     }; 1 } or die "Method builder failed for ${singular}s: $@";
+    eval qq{sub ${singular}_list { sort keys %{\$_[0]->{\$name}} }; 1; }
+     or die "Method builder failed for ${singular}_list: $@";
   }
 }
 
+sub statement_list { sort keys %{$_[0]->{clauses_of}} }
+
 sub clauses_of {
   my ($self, $of, @clauses) = @_;
   unless (@clauses) {