From 339ad0d0020cf7173ef7debe32f3cbb8809de5ca Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 10 Feb 2011 14:17:09 -0800 Subject: [PATCH] fixing tests on 1.8, using a list of lists because order is important --- activerecord/lib/active_record/log_subscriber.rb | 4 +++- activerecord/test/cases/bind_parameter_test.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb index 8855798bde..afadbf03ef 100644 --- a/activerecord/lib/active_record/log_subscriber.rb +++ b/activerecord/lib/active_record/log_subscriber.rb @@ -28,7 +28,9 @@ module ActiveRecord binds = nil unless (payload[:binds] || []).empty? - binds = " #{Hash[payload[:binds].map { |col,v| [col.name, v] }]}" + binds = " " + payload[:binds].map { |col,v| + [col.name, v] + }.inspect end if odd? diff --git a/activerecord/test/cases/bind_parameter_test.rb b/activerecord/test/cases/bind_parameter_test.rb index eb2991437b..19383bb06b 100644 --- a/activerecord/test/cases/bind_parameter_test.rb +++ b/activerecord/test/cases/bind_parameter_test.rb @@ -84,7 +84,7 @@ module ActiveRecord }.new logger.sql event - assert_match({pk.name => 10}.inspect, logger.debugs.first) + assert_match([[pk.name, 10]].inspect, logger.debugs.first) end end end