Fixed bind type casting to re-set the casted value back to the bind, fixed bind parameter tests to work with SQL server

Author: wbond

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -334,7 +334,11 @@ def do_exec_query(sql, name, binds, options = {})
             next if ar_column && column.sql_type == 'timestamp'
             v = value
             names_and_types << if ar_column
-                                 v = value.to_i if column.is_integer? && value.present?
+                                 if column.is_integer? && value.present?
+                                   v = value.to_i
+                                   # Reset the casted value to the bind as required by Rails 4.1
+                                   binds[index] = [column, v]
+                                 end
                                  "@#{index} #{column.sql_type_for_statement}"
                                elsif column.acts_like?(:string)
                                  "@#{index} nvarchar(max)"

test/cases/bind_parameter_test_sqlserver.rb

@@ -1,25 +1,62 @@
 require 'cases/sqlserver_helper'
 require 'models/topic'
+require 'models_sqlserver/topic'
 
-class BindParameterTestSqlserver < ActiveRecord::TestCase
-end
-
-class ActiveRecord::BindParameterTest < ActiveRecord::TestCase
-
-  fixtures :topics
+class BindParameterTestSqlServer < ActiveRecord::TestCase
 
   COERCED_TESTS = [
-    :test_binds_are_logged
+    :test_binds_are_logged,
+    :test_binds_are_logged_after_type_cast
   ]
 
   include SqlserverCoercedTest
 
-  # TODO: put a real test here
+  fixtures :topics
+
+  class LogListener
+    attr_accessor :calls
+
+    def initialize
+      @calls = []
+    end
+
+    def call(*args)
+      calls << args
+    end
+  end
+
+  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
+
+  def teardown
+    ActiveSupport::Notifications.unsubscribe(@listener)
+  end
+
   def test_coerced_binds_are_logged
-    assert true, 'they are!'
+    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}"
 
-end
+    @connection.exec_query(sql, 'SQL', binds)
 
+    message = @listener.calls.find { |args| args[4][:sql].include? sql }
+    assert_equal [[@pk, 3]], message[4][:binds]
+  end
 
+end