Fix how we are checking bind tests, can't use coerce since the test methods are defined in an if block

Author: wbond

test/cases/bind_parameter_test_sqlserver.rb

@@ -1,62 +1,33 @@
 require 'cases/sqlserver_helper'
 require 'models/topic'
 require 'models_sqlserver/topic'
-
-class BindParameterTestSqlServer < ActiveRecord::TestCase
-
-  COERCED_TESTS = [
-    :test_binds_are_logged,
-    :test_binds_are_logged_after_type_cast
-  ]
-
-  include SqlserverCoercedTest
-
-  fixtures :topics
-
-  class LogListener
-    attr_accessor :calls
-
-    def initialize
-      @calls = []
+require 'cases/bind_parameter_test'
+
+# We don't coerce here because these tests are located inside of an if block
+# and don't seem to be able to be properly overriden with the coerce
+# functionality
+module ActiveRecord
+  class BindParameterTest
+    def test_binds_are_logged
+      sub   = @connection.substitute_at(@pk, 0)
+      binds = [[@pk, 1]]
+      sql   = "select * from topics where id = #{sub}"
+
+      @connection.exec_query(sql, 'SQL', binds)
+
+      message = @listener.calls.find { |args| args[4][:sql].include? sql }
+      assert_equal binds, message[4][:binds]
     end
 
-    def call(*args)
-      calls << args
-    end
-  end
+    def test_binds_are_logged_after_type_cast
+      sub   = @connection.substitute_at(@pk, 0)
+      binds = [[@pk, "3"]]
+      sql   = "select * from topics where id = #{sub}"
 
-  def setup
-    super
-    @connection = ActiveRecord::Base.connection
-    @listener   = LogListener.new
-    @pk         = Topic.columns.find { |c| c.primary }
-    ActiveSupport::Notifications.subscribe('sql.active_record', @listener)
-  end
+      @connection.exec_query(sql, 'SQL', binds)
 
-  def teardown
-    ActiveSupport::Notifications.unsubscribe(@listener)
-  end
-
-  def test_coerced_binds_are_logged
-    sub   = @connection.substitute_at(@pk, 0)
-    binds = [[@pk, 1]]
-    sql   = "select * from topics where id = #{sub}"
-
-    @connection.exec_query(sql, 'SQL', binds)
-
-    message = @listener.calls.find { |args| args[4][:sql].include? sql }
-    assert_equal binds, message[4][:binds]
-  end
-
-  def test_coerced_binds_are_logged_after_type_cast
-    sub   = @connection.substitute_at(@pk, 0)
-    binds = [[@pk, "3"]]
-    sql   = "select * from topics where id = #{sub}"
-
-    @connection.exec_query(sql, 'SQL', binds)
-
-    message = @listener.calls.find { |args| args[4][:sql].include? sql }
-    assert_equal [[@pk, 3]], message[4][:binds]
+      message = @listener.calls.find { |args| args[4][:sql].include? sql }
+      assert_equal [[@pk, 3]], message[4][:binds]
+    end
   end
-
 end