X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FClauses.pm;h=fc36e742f41f5fcbbd818e43799802d4e468d3b6;hb=a01911a20b326afd1a45f97f14aca68206708eba;hp=1b9bfd52bab1aa11bc145da36e898ea8df5f0fe3;hpb=7250aa13440fae80201e48286f4a5939abc97ee7;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index 1b9bfd5..fc36e74 100644
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -16,12 +16,12 @@ sub register_defaults {
   my ($self) = @_;
   $self->{clauses_of}{select} = [ qw(select from where order_by) ];
   $self->{expand}{select} = sub { shift->_expand_statement(@_) };
-  $self->{render}{select} = sub { shift->_render_statement(select => @_) };
+  $self->{render}{select} = sub { shift->_render_statement(@_) };
   $self->{expand_clause}{"select.$_"} = "_expand_select_clause_$_"
     for @{$self->{clauses_of}{select}};
   $self->{clauses_of}{update} = [ qw(target set where returning) ];
   $self->{expand}{update} = sub { shift->_expand_statement(@_) };
-  $self->{render}{update} = sub { shift->_render_statement(update => @_) };
+  $self->{render}{update} = sub { shift->_render_statement(@_) };
   $self->{expand_clause}{"update.$_"} = "_expand_update_clause_$_"
     for @{$self->{clauses_of}{update}};
   $self->{expand_clause}{'update.update'} = '_expand_update_clause_target';
@@ -32,7 +32,7 @@ sub register_defaults {
   };
   $self->{clauses_of}{delete} = [ qw(target where returning) ];
   $self->{expand}{delete} = sub { shift->_expand_statement(@_) };
-  $self->{render}{delete} = sub { shift->_render_statement(delete => @_) };
+  $self->{render}{delete} = sub { shift->_render_statement(@_) };
   $self->{expand_clause}{"delete.$_"} = "_expand_delete_clause_$_"
     for @{$self->{clauses_of}{delete}};
   $self->{expand_clause}{"delete.from"} = '_expand_delete_clause_target';
@@ -45,7 +45,7 @@ sub register_defaults {
     'target', 'fields', 'from', 'returning'
   ];
   $self->{expand}{insert} = sub { shift->_expand_statement(@_) };
-  $self->{render}{insert} = sub { shift->_render_statement(insert => @_) };
+  $self->{render}{insert} = sub { shift->_render_statement(@_) };
   $self->{expand_clause}{'insert.into'} = '_expand_insert_clause_target';
   $self->{expand_clause}{'insert.target'} = '_expand_insert_clause_target';
   $self->{expand_clause}{'insert.fields'} = sub {
@@ -128,6 +128,10 @@ sub _expand_delete_clause_returning {
 sub _expand_statement {
   my ($self, $type, $args) = @_;
   my $ec = $self->{expand_clause};
+  if ($args->{_}) {
+    $args = { %$args };
+    $args->{$type} = delete $args->{_}
+  }
   return +{ "-${type}" => +{
     map {
       my $val = $args->{$_};
@@ -164,7 +168,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
@@ -259,8 +263,8 @@ sub _expand_values {
 }
 
 sub _render_values {
-  my ($self, $values) = @_;
-  my ($v_sql, @bind) = $self->_join_parts(
+  my ($self, undef, $values) = @_;
+  my ($v_sql, @bind) = $self->join_clauses(
     ', ',
     map [ $self->render_aqt($_) ],
       ref($values) eq 'ARRAY' ? @$values : $values
@@ -272,5 +276,56 @@ sub _render_values {
   );
 }
 
+sub _ext_rw {
+  my ($self, $name, $key, $value) = @_;
+  return $self->{$name}{$key} unless @_ > 3;
+  $self->{$name}{$key} = $value;
+  return $self;
+}
+
+BEGIN {
+  foreach my $type (qw(
+    expand op_expand render op_render 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;
+}
+
+sub clone {
+  my ($self) = @_;
+  bless(
+    {
+      (map +($_ => (
+        ref($self->{$_}) eq 'HASH'
+          ? { %{$self->{$_}} }
+          : $self->{$_}
+      )), keys %$self),
+    },
+    ref($self)
+  );
+}
+
 
 1;