make INSERT SELECT work

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

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index eea7cc1..686f6e3 100644 (file)
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -48,6 +48,12 @@ sub register_defaults {
   $self->{render}{insert} = sub { shift->_render_statement(insert => @_) };
   $self->{expand_clause}{'insert.into'} = '_expand_insert_clause_target';
   $self->{expand_clause}{'insert.target'} = '_expand_insert_clause_target';
+  $self->{expand_clause}{'insert.fields'} = sub {
+    return +{ -row => [
+      shift->_expand_maybe_list_expr(@_, -ident)
+    ] } if ref($_[1]) eq 'ARRAY';
+    return $_[1]; # should maybe still expand somewhat?
+  };
   $self->{expand_clause}{'insert.values'} = '_expand_insert_clause_values';
   $self->{expand_clause}{'insert.returning'} = sub {
     shift->_expand_maybe_list_expr(@_, -ident);
@@ -60,6 +66,9 @@ sub register_defaults {
     my ($sql, @bind) = $self->render_aqt($from);
     ($self->_sqlcase('insert into ').$sql, @bind);
   };
+  $self->{render_clause}{'insert.values'} = sub {
+    return $_[0]->render_aqt($_[1]);
+  };
   return $self;
 }
 
@@ -85,7 +94,7 @@ sub _expand_select_clause_order_by {
 
 sub _expand_update_clause_target {
   my ($self, $target) = @_;
-  +(target => $self->expand_expr($target, -ident));
+  +(target => $self->_expand_maybe_list_expr($target, -ident));
 }
 
 sub _expand_update_clause_set {
@@ -155,6 +164,9 @@ sub _render_statement {
 
 sub select {
   my ($self, @args) = @_;
+
+  return $self->render_expr({ -select => $_[1] }) if ref($_[1]) eq 'HASH';
+
   my %clauses;
   @clauses{qw(from select where order_by)} = @args;
 
@@ -164,33 +176,38 @@ sub select {
   $clauses{select} = { -literal => [ $clauses{select}||'*' ] }
     unless ref($clauses{select});
 
-  my ($sql, @bind) = $self->render_expr({ -select => \%clauses });
-  return wantarray ? ($sql, @bind) : $sql;
+  return $self->render_expr({ -select => \%clauses });
 }
 
 sub update {
   my ($self, $table, $set, $where, $options) = @_;
+
+  return $self->render_expr({ -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;
-  my ($sql, @bind) = $self->render_expr({ -update => \%clauses });
-  return wantarray ? ($sql, @bind) : $sql;
+  return $self->render_expr({ -update => \%clauses });
 }
 
 sub delete {
   my ($self, $table, $where, $options) = @_;
+
+  return $self->render_expr({ -delete => $_[1] }) if ref($_[1]) eq 'HASH';
+
   my %clauses = (target => $table, where => $where, %{$options||{}});
-  my ($sql, @bind) = $self->render_expr({ -delete => \%clauses });
-  return wantarray ? ($sql, @bind) : $sql;
+  return $self->render_expr({ -delete => \%clauses });
 }
 
 sub insert {
   my ($self, $table, $data, $options) = @_;
+
+  return $self->render_expr({ -insert => $_[1] }) if ref($_[1]) eq 'HASH';
+
   my %clauses = (target => $table, values => $data, %{$options||{}});
-  my ($sql, @bind) = $self->render_expr({ -insert => \%clauses });
-  return wantarray ? ($sql, @bind) : $sql;
+  return $self->render_expr({ -insert => \%clauses });
 }
 
 sub _expand_insert_clause_target {
@@ -199,9 +216,12 @@ sub _expand_insert_clause_target {
 
 sub _expand_insert_clause_values {
   my ($self, $data) = @_;
+  if (ref($data) eq 'HASH' and (keys(%$data))[0] =~ /^-/) {
+    return $self->expand_expr($data);
+  }
   return $data if ref($data) eq 'HASH' and $data->{-row};
   my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
-  return (values => $v_aqt, ($f_aqt ? (fields => $f_aqt) : ()));
+  return (values => { -values => $v_aqt }, ($f_aqt ? (fields => $f_aqt) : ()));
 }
 
 1;