1 files changed, 14 insertions, 16 deletions

diff --git a/activerecord/test/cases/bind_parameter_test.rb b/activerecord/test/cases/bind_parameter_test.rb
index 291751c435..c4634d11e2 100644
--- a/activerecord/test/cases/bind_parameter_test.rb
+++ b/activerecord/test/cases/bind_parameter_test.rb
@@ -20,52 +20,50 @@ module ActiveRecord
     def setup
       super
       @connection = ActiveRecord::Base.connection
-      @listener   = LogListener.new
-      @pk         = Topic.columns.find { |c| c.primary }
-      ActiveSupport::Notifications.subscribe('sql.active_record', @listener)
+      @subscriber   = LogListener.new
+      @pk         = Topic.columns_hash[Topic.primary_key]
+      @subscription = ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
     end
 
-    def teardown
-      ActiveSupport::Notifications.unsubscribe(@listener)
+    teardown do
+      ActiveSupport::Notifications.unsubscribe(@subscription)
     end
 
     if ActiveRecord::Base.connection.supports_statement_cache?
       def test_binds_are_logged
-        sub   = @connection.substitute_at(@pk, 0)
+        sub   = @connection.substitute_at(@pk)
         binds = [[@pk, 1]]
-        sql   = "select * from topics where id = #{sub}"
+        sql   = "select * from topics where id = #{sub.to_sql}"
 
         @connection.exec_query(sql, 'SQL', binds)
 
-        message = @listener.calls.find { |args| args[4][:sql] == sql }
+        message = @subscriber.calls.find { |args| args[4][:sql] == sql }
         assert_equal binds, message[4][:binds]
       end
 
       def test_binds_are_logged_after_type_cast
-        sub   = @connection.substitute_at(@pk, 0)
+        sub   = @connection.substitute_at(@pk)
         binds = [[@pk, "3"]]
-        sql   = "select * from topics where id = #{sub}"
+        sql   = "select * from topics where id = #{sub.to_sql}"
 
         @connection.exec_query(sql, 'SQL', binds)
 
-        message = @listener.calls.find { |args| args[4][:sql] == sql }
+        message = @subscriber.calls.find { |args| args[4][:sql] == sql }
         assert_equal [[@pk, 3]], message[4][:binds]
       end
 
       def test_find_one_uses_binds
         Topic.find(1)
         binds = [[@pk, 1]]
-        message = @listener.calls.find { |args| args[4][:binds] == binds }
+        message = @subscriber.calls.find { |args| args[4][:binds] == binds }
         assert message, 'expected a message with binds'
       end
 
       def test_logs_bind_vars
-        pk = Topic.columns.find { |x| x.primary }
-
         payload = {
           :name  => 'SQL',
           :sql   => 'select * from topics where id = ?',
-          :binds => [[pk, 10]]
+          :binds => [[@pk, 10]]
         }
         event  = ActiveSupport::Notifications::Event.new(
           'foo',
@@ -87,7 +85,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