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 03f9496..4a2d3d1 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -266,33 +266,7 @@ sub insert {
 
   my $fields;
 
-  my $v_aqt = do {
-    if (is_literal_value($data)) {
-      $self->expand_expr($data);
-    } else {
-      ($fields, my $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";
-
-      +{ -row => [
-        map {
-         local our $Cur_Col_Meta = $fields->[$_];
-         $self->_expand_insert_value($values->[$_])
-         } 0..$#$values
-      ] };
-    }
-  };
-
-  my $f_aqt = (@$fields
-    ? $self->expand_expr({ -row => $fields }, -ident)
-    : undef
-  );
+  my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
 
   my @parts = ([ $self->_sqlcase('insert into').' '.$table ]);
   push @parts, [ $self->render_aqt($f_aqt) ] if $f_aqt;
@@ -308,6 +282,36 @@ sub insert {
   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(@_) }
@@ -1254,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;
@@ -1339,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