RT81485: sorting keys to account for new Perl hash randomization in P…

…erl 5.17.6
damil · Nov 30, 2012 · 801655c · 801655c
1 parent 58b8368
commit 801655c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/SQL/Abstract/More.pm b/lib/SQL/Abstract/More.pm
@@ -298,10 +298,10 @@ sub insert {
     # is interpreted as .. RETURNING ... INTO ...
     if (my $returning = $args{-returning}) {
       if (does($returning, 'HASH')) {
-        my @keys = keys %$returning
+        my @keys = sort keys %$returning
           or croak "-returning => {} : the hash is empty";
         push @old_API_args, {returning => \@keys};
-        $returning_into = [values %$returning];
+        $returning_into = [@{$returning}{@keys}];
       }
       else {
         push @old_API_args, {returning => $returning};
@@ -406,7 +406,7 @@ sub merge_conditions {
 
   foreach my $cond (@_) {
     if    (does($cond, 'HASH'))  {
-      foreach my $col (keys %$cond) {
+      foreach my $col (sort keys %$cond) {
         $merged{$col} = $merged{$col} ? [-and => $merged{$col}, $cond->{$col}]
                                       : $cond->{$col};
       }
@@ -540,7 +540,7 @@ sub _single_join {
 
   # build result and return
   my %result = (sql => $sql, bind => \@bind);
-  $result{name}    = ($self->{join_assoc_right} ? $left : $right)->{name};
+  $result{name} = ($self->{join_assoc_right} ? $left : $right)->{name};
   $result{aliased_tables} = $left->{aliased_tables};
   foreach my $alias (keys %{$right->{aliased_tables}}) {
     $result{aliased_tables}{$alias} = $right->{aliased_tables}{$alias};

diff --git a/t/01-sql_abstract_more.t b/t/01-sql_abstract_more.t
@@ -473,7 +473,7 @@ is_same_sql_bind(
 );
 is_same_sql_bind(
   $sql, \@bind,
-  'INSERT INTO Foo(bar, foo) VALUES (?, ?) RETURNING k2, k1 INTO ?, ?',
+  'INSERT INTO Foo(bar, foo) VALUES (?, ?) RETURNING k1, k2 INTO ?, ?',
   [2, 1, \$k2, \$k1],
 );