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=86f74b9634dfd7bbb9186130e7109d83e3b172f6;hpb=93253a11f1f3e0ad2479e38f50963593394c9afc;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index 86f74b9..3683f45 100644
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -67,7 +67,12 @@ sub register_defaults {
     ($self->_sqlcase('insert into ').$sql, @bind);
   };
   $self->{render_clause}{'insert.from'} = sub {
-    return $_[0]->render_aqt($_[1]);
+    return $_[0]->render_aqt($_[1], 1);
+  };
+  $self->{expand}{values} = '_expand_values';
+  $self->{render}{values} = '_render_values';
+  $self->{expand}{exists} = sub {
+    $_[0]->_expand_op(undef, [ exists => $_[2] ]);
   };
   return $self;
 }
@@ -149,7 +154,7 @@ sub _render_statement {
       if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
         $self->$rdr($clause_expr);
       } else {
-        my ($clause_sql, @bind) = $self->render_aqt($clause_expr);
+        my ($clause_sql, @bind) = $self->render_aqt($clause_expr, 1);
         my $sql = join ' ',
           $self->_sqlcase(join ' ', split '_', $clause),
           $clause_sql;
@@ -159,13 +164,31 @@ sub _render_statement {
     next unless defined($sql) and length($sql);
     push @parts, \@part;
   }
-  return $self->_join_parts(' ', @parts);
+  my ($sql, @bind) = $self->_join_parts(' ', @parts);
+  return (
+    (our $Render_Top_Level ? $sql : '('.$sql.')'),
+    @bind
+  );
+}
+
+sub render_aqt {
+  my ($self, $aqt, $top_level) = @_;
+  local our $Render_Top_Level = $top_level;
+  return $self->next::method($aqt);
+}
+
+sub render_statement {
+  my ($self, $expr, $default_scalar_to) = @_;
+  my ($sql, @bind) = $self->render_aqt(
+    $self->expand_expr($expr, $default_scalar_to), 1
+  );
+  return (wantarray ? ($sql, @bind) : $sql);
 }
 
 sub select {
   my ($self, @args) = @_;
 
-  return $self->render_expr({ -select => $_[1] }) if ref($_[1]) eq 'HASH';
+  return $self->render_statement({ -select => $_[1] }) if ref($_[1]) eq 'HASH';
 
   my %clauses;
   @clauses{qw(from select where order_by)} = @args;
@@ -176,38 +199,38 @@ sub select {
   $clauses{select} = { -literal => [ $clauses{select}||'*' ] }
     unless ref($clauses{select});
 
-  return $self->render_expr({ -select => \%clauses });
+  return $self->render_statement({ -select => \%clauses });
 }
 
 sub update {
   my ($self, $table, $set, $where, $options) = @_;
 
-  return $self->render_expr({ -update => $_[1] }) if ref($_[1]) eq 'HASH';
+  return $self->render_statement({ -update => $_[1] }) if ref($_[1]) eq 'HASH';
 
   my %clauses;
   @clauses{qw(target set where)} = ($table, $set, $where);
   puke "Unsupported data type specified to \$sql->update"
     unless ref($clauses{set}) eq 'HASH';
   @clauses{keys %$options} = values %$options;
-  return $self->render_expr({ -update => \%clauses });
+  return $self->render_statement({ -update => \%clauses });
 }
 
 sub delete {
   my ($self, $table, $where, $options) = @_;
 
-  return $self->render_expr({ -delete => $_[1] }) if ref($_[1]) eq 'HASH';
+  return $self->render_statement({ -delete => $_[1] }) if ref($_[1]) eq 'HASH';
 
   my %clauses = (target => $table, where => $where, %{$options||{}});
-  return $self->render_expr({ -delete => \%clauses });
+  return $self->render_statement({ -delete => \%clauses });
 }
 
 sub insert {
   my ($self, $table, $data, $options) = @_;
 
-  return $self->render_expr({ -insert => $_[1] }) if ref($_[1]) eq 'HASH';
+  return $self->render_statement({ -insert => $_[1] }) if ref($_[1]) eq 'HASH';
 
   my %clauses = (target => $table, values => $data, %{$options||{}});
-  return $self->render_expr({ -insert => \%clauses });
+  return $self->render_statement({ -insert => \%clauses });
 }
 
 sub _expand_insert_clause_target {
@@ -224,4 +247,81 @@ sub _expand_insert_clause_values {
   return (from => { -values => $v_aqt }, ($f_aqt ? (fields => $f_aqt) : ()));
 }
 
+sub _expand_values {
+  my ($self, undef, $values) = @_;
+  return { -values => [
+    map +(
+      ref($_) eq 'HASH'
+        ? $self->expand_expr($_)
+        : +{ -row => [ map $self->expand_expr($_), @$_ ] }
+    ), ref($values) eq 'ARRAY' ? @$values : $values
+  ] };
+}
+
+sub _render_values {
+  my ($self, $values) = @_;
+  my ($v_sql, @bind) = $self->_join_parts(
+    ', ',
+    map [ $self->render_aqt($_) ],
+      ref($values) eq 'ARRAY' ? @$values : $values
+  );
+  my $sql = $self->_sqlcase('values').' '.$v_sql;
+  return (
+    (our $Render_Top_Level ? $sql : '('.$sql.')'),
+    @bind
+  );
+}
+
+sub _ext_rw {
+  my ($self, $name, $key, $value) = @_;
+  return $self->{$name}{$key} unless @_ > 2;
+  $self->{$name}{$key} = $value;
+  return $self;
+}
+
+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;
+}
+
+sub clone {
+  my ($self) = @_;
+  bless(
+    {
+      (map +($_ => (
+        ref($self->{$_}) eq 'HASH'
+          ? { %{$self->{$_}} }
+          : $self->{$_}
+      )), keys %$self),
+    },
+    ref($self)
+  );
+}
+
+
 1;