Pass all expression stability tests. Verified by:

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

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index df523f2..4a2d3d1 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -264,47 +264,54 @@ sub insert {
   my $data    = shift || return;
   my $options = shift;
 
-  my ($sql, @bind) = do {
-    if (is_literal_value($data)) {
-      $self->render_expr($data);
-    } else {
-      my ($fields, $values) = (
-        ref($data) eq 'HASH' ?
-          ([ sort keys %$data ], [ @{$data}{sort keys %$data} ])
-          : (undef, $data)
-      );
-
-      # no names (arrayref) means can't generate bindtype
-      !($fields) && $self->{bindtype} eq 'columns'
-        && belch "can't do 'columns' bindtype when called with arrayref";
+  my $fields;
 
-      my $fields_sql = ($fields
-        ? ' '.($self->render_expr({ -row => $fields }, '-ident'))[0]
-        : ''
-      );
-      my ($values_sql, @bind) = $self->render_aqt(
-        { -row => [
-            map {
-              local our $Cur_Col_Meta = $fields->[$_];
-              $self->_expand_insert_value($values->[$_])
-            } 0..$#$values
-        ] }
-      );
-      ($fields_sql.' '.$self->_sqlcase('values').' '.$values_sql, @bind);
-    }
-  };
+  my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
 
-  $sql = (join " ", $self->_sqlcase('insert into'), $table).$sql;
+  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 /;
 
   if ($options->{returning}) {
-    my ($s, @b) = $self->_insert_returning($options);
-    $sql .= $s;
-    push @bind, @b;
+    push @parts, [ $self->_insert_returning($options) ];
   }
 
+  my ($sql, @bind) = $self->_join_parts(' ', @parts);
+
   return wantarray ? ($sql, @bind) : $sql;
 }
 
+sub _expand_insert_values {
+  my ($self, $data) = @_;
+  if (is_literal_value($data)) {
+    (undef, $self->expand_expr($data));
+  } else {
+    my ($fields, $values) = (
+      ref($data) eq 'HASH' ?
+        ([ sort keys %$data ], [ @{$data}{sort keys %$data} ])
+        : ([], $data)
+    );
+
+    # no names (arrayref) means can't generate bindtype
+    !($fields) && $self->{bindtype} eq 'columns'
+      && belch "can't do 'columns' bindtype when called with arrayref";
+
+    +(
+      (@$fields
+        ? $self->expand_expr({ -row => $fields }, -ident)
+        : undef
+      ),
+      +{ -row => [
+        map {
+         local our $Cur_Col_Meta = $fields->[$_];
+         $self->_expand_insert_value($values->[$_])
+         } 0..$#$values
+      ] },
+    );
+  }
+}
+
 # So that subclasses can override INSERT ... RETURNING separately from
 # UPDATE and DELETE (e.g. DBIx::Class::SQLMaker::Oracle does this)
 sub _insert_returning { shift->_returning(@_) }
@@ -873,6 +880,9 @@ sub _expand_row {
 sub _expand_op {
   my ($self, undef, $args) = @_;
   my ($op, @opargs) = @$args;
+  if (my $exp = $self->{expand_op}{$op}) {
+    return $self->$exp($op, \@opargs);
+  }
   +{ -op => [ $op, map $self->expand_expr($_), @opargs ] };
 }
 
@@ -978,7 +988,7 @@ sub _expand_in {
     my $opened_sql = $self->_open_outer_paren($sql);
     return +{ -op => [
       $op, $self->expand_expr($k, -ident),
-      [ { -literal => [ $opened_sql, @bind ] } ]
+      { -literal => [ $opened_sql, @bind ] }
     ] };
   }
   my $undef_err =
@@ -997,7 +1007,7 @@ sub _expand_in {
   return +{ -op => [
     $op,
     $self->expand_expr($k, -ident),
-    \@rhs
+    @rhs
   ] };
 }
 
@@ -1142,13 +1152,13 @@ sub _render_op_between {
 
 sub _render_op_in {
   my ($self, $op, $args) = @_;
-  my ($lhs, $rhs) = @$args;
+  my ($lhs, @rhs) = @$args;
   my @in_bind;
   my @in_sql = map {
     my ($sql, @bind) = $self->render_aqt($_);
     push @in_bind, @bind;
     $sql;
-  } @$rhs;
+  } @rhs;
   my ($lhsql, @lbind) = $self->render_aqt($lhs);
   return (
     $lhsql.' '.$self->_sqlcase(join ' ', split '_', $op).' ( '
@@ -1248,6 +1258,8 @@ sub _expand_order_by {
 
   return unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg);
 
+  return $arg if ref($arg) eq 'HASH' and ($arg->{-op}||[''])->[0] eq ',';
+
   my $expander = sub {
     my ($self, $dir, $expr) = @_;
     my @to_expand = ref($expr) eq 'ARRAY' ? @$expr : $expr;
@@ -1333,6 +1345,7 @@ sub _table  {
 
 sub _expand_maybe_list_expr {
   my ($self, $expr, $default) = @_;
+  return $expr if ref($expr) eq 'HASH' and ($expr->{-op}||[''])->[0] eq ',';
   return +{ -op => [ ',',
     map $self->expand_expr($_, $default),
       ref($expr) eq 'ARRAY' ? @$expr : $expr