delete from, update using, join using

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

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index a2b474d..8fbd784 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -209,6 +209,7 @@ sub new {
     ident => '_expand_ident',
     value => '_expand_value',
     func => '_expand_func',
+    values => '_expand_values',
   };
 
   $opt{expand_op} = {
@@ -224,7 +225,7 @@ sub new {
   };
 
   $opt{render} = {
-    (map +($_, "_render_$_"), qw(op func bind ident literal row)),
+    (map +($_, "_render_$_"), qw(op func bind ident literal row values)),
     %{$opt{render}||{}}
   };
 
@@ -271,8 +272,7 @@ sub insert {
 
   my @parts = ([ $self->_sqlcase('insert into').' '.$table ]);
   push @parts, [ $self->render_aqt($f_aqt) ] if $f_aqt;
-  push @parts, [ $self->render_aqt($v_aqt) ];
-  $parts[-1][0] =~ s/^/VALUES /;
+  push @parts, [ $self->render_aqt({ -values => $v_aqt }) ];
 
   if ($options->{returning}) {
     push @parts, [ $self->_insert_returning($options) ];
@@ -1049,6 +1049,17 @@ sub _expand_bind {
   return { -bind => $bind };
 }
 
+sub _expand_values {
+  my ($self, undef, $values) = @_;
+  return { -values => [
+    map +(
+      ref($_) eq 'HASH'
+        ? $_
+        : +{ -row => [ map $self->expand_expr($_), @$_ ] }
+    ), @$values
+  ] };
+}
+
 sub _recurse_where {
   my ($self, $where, $logic) = @_;
 
@@ -1084,6 +1095,16 @@ sub _render_row {
   return "($sql)", @bind;  
 }
 
+sub _render_values {
+  my ($self, $values) = @_;
+  my ($sql, @bind) = $self->_join_parts(
+    ', ',
+    map [ $self->render_aqt($_) ],
+      ref($values) eq 'ARRAY' ? @$values : $values
+  );
+  return $self->_sqlcase('values ').$sql, @bind;
+}
+
 sub _render_func {
   my ($self, $rest) = @_;
   my ($func, @args) = @$rest;