Support new type_to_sql arity.

Author: metaskills

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -130,7 +130,7 @@ def change_column(table_name, column_name, type, options = {})
             remove_indexes(table_name, column_name)
           end
           sql_commands << "UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote_default_expression(options[:default], column_object)} WHERE #{quote_column_name(column_name)} IS NULL" if !options[:null].nil? && options[:null] == false && !options[:default].nil?
-          sql_commands << "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+          sql_commands << "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, limit: options[:limit], precision: options[:precision], scale: options[:scale])}"
           sql_commands[-1] << ' NOT NULL' if !options[:null].nil? && options[:null] == false
           if options_include_default?(options)
             sql_commands << "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{default_constraint_name(table_name, column_name)} DEFAULT #{quote_default_expression(options[:default], column_object)} FOR #{quote_column_name(column_name)}"
@@ -194,7 +194,7 @@ def extract_foreign_key_action(action, fk_name)
           end
         end
 
-        def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+        def type_to_sql(type, limit: nil, precision: nil, scale: nil, **)
           type_limitable = %w(string integer float char nchar varchar nvarchar).include?(type.to_s)
           limit = nil unless type_limitable
           case type.to_s
@@ -240,7 +240,7 @@ def change_column_null(table_name, column_name, allow_null, default = nil)
           if !allow_null.nil? && allow_null == false && !default.nil?
             do_execute("UPDATE #{table_id} SET #{column_id}=#{quote(default)} WHERE #{column_id} IS NULL")
           end
-          sql = "ALTER TABLE #{table_id} ALTER COLUMN #{column_id} #{type_to_sql column.type, column.limit, column.precision, column.scale}"
+          sql = "ALTER TABLE #{table_id} ALTER COLUMN #{column_id} #{type_to_sql column.type, limit: column.limit, precision: column.precision, scale: column.scale}"
           sql << ' NOT NULL' if !allow_null.nil? && allow_null == false
           do_execute sql
         end

test/cases/adapter_test_sqlserver.rb

@@ -265,23 +265,23 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it 'create integers when limit is 4' do
-      assert_equal 'integer', connection.type_to_sql(:integer, 4)
+      assert_equal 'integer', connection.type_to_sql(:integer, limit: 4)
     end
 
     it 'create integers when limit is 3' do
-      assert_equal 'integer', connection.type_to_sql(:integer, 3)
+      assert_equal 'integer', connection.type_to_sql(:integer, limit: 3)
     end
 
     it 'create smallints when limit is less than 3' do
-      assert_equal 'smallint', connection.type_to_sql(:integer, 2)
-      assert_equal 'smallint', connection.type_to_sql(:integer, 1)
+      assert_equal 'smallint', connection.type_to_sql(:integer, limit: 2)
+      assert_equal 'smallint', connection.type_to_sql(:integer, limit: 1)
     end
 
     it 'create bigints when limit is greateer than 4' do
-      assert_equal 'bigint', connection.type_to_sql(:integer, 5)
-      assert_equal 'bigint', connection.type_to_sql(:integer, 6)
-      assert_equal 'bigint', connection.type_to_sql(:integer, 7)
-      assert_equal 'bigint', connection.type_to_sql(:integer, 8)
+      assert_equal 'bigint', connection.type_to_sql(:integer, limit: 5)
+      assert_equal 'bigint', connection.type_to_sql(:integer, limit: 6)
+      assert_equal 'bigint', connection.type_to_sql(:integer, limit: 7)
+      assert_equal 'bigint', connection.type_to_sql(:integer, limit: 8)
     end
 
     it 'create floats when no limit supplied' do