Change how we handle limits for columns and how we store @limit for making schema_dumper_test work.

We now store @limit as 2 for smallint and 8 for bigint (so schema dumper will output :integer, :limit => 2 or 8 and we'll get smallint or bigint columns created accordingly.  We also say that if limit is <3 it's a smallint and >4 it's a bigint, before you had to be limit ==4 to be an integer and limit ==3 would be a smallint, which is not quite correct. (Limit of 3 is bigger than a smallint).

Author: h-lame

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -64,8 +64,13 @@ def initialize(info)
         @identity = info[:is_identity]
         @is_special = ["text", "ntext", "image"].include?(info[:type])
         # TODO: check ok to remove @scale = scale_value
+        @limit = nil unless limitable?(type)
+      end
+
+      def limitable?(type)
         # SQL Server only supports limits on *char and float types
-        @limit = nil unless @type == :float or @type == :string
+        # although for schema dumping purposes it's useful to know that (big|small)int are 2|8 respectively.
+        @type == :float || @type == :string || (@type == :integer && type =~ /^(big|small)int/)
       end
 
       def simplified_type(field_type)
@@ -223,13 +228,15 @@ def supports_migrations? #:nodoc:
 
       def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
         return super unless type.to_s == 'integer'
-
-        if limit.nil? || limit == 4
+        
+        if limit.nil?
           'integer'
-        elsif limit < 4
+        elsif limit > 4
+          'bigint'
+        elsif limit < 3
           'smallint'
         else
-          'bigint'
+          'integer'
         end
       end
 

test/cases/adapter_test_sqlserver.rb

@@ -94,6 +94,57 @@ def assert_all_statements_used_are_closed(&block)
   end
 end
 
+class TypeToSqlForIntegersTest < ActiveRecord::TestCase
+  
+  def setup
+    @connection = ActiveRecord::Base.connection
+  end
+  
+  # TODO - ugh these tests are pretty literal...
+  def test_should_create_integers_when_no_limit_supplied
+    assert_equal 'integer', @connection.type_to_sql(:integer)
+  end
+  
+  def test_should_create_integers_when_limit_is_4
+    assert_equal 'integer', @connection.type_to_sql(:integer, 4)
+  end
+  
+  def test_should_create_integers_when_limit_is_3
+    assert_equal 'integer', @connection.type_to_sql(:integer, 3)
+  end
+
+  def test_should_create_smallints_when_limit_is_less_than_3
+    assert_equal 'smallint', @connection.type_to_sql(:integer, 2)
+    assert_equal 'smallint', @connection.type_to_sql(:integer, 1)
+  end
+
+  def test_should_create_bigints_when_limit_is_greateer_than_4
+    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)
+  end
+  
+end
+
+# NOTE: The existing schema_dumper_test doesn't test the limits of <4 limit things
+# for adapaters that aren't mysql, sqlite or postgres.  We should.
+class SchemaDumperForSqlServerTest < ActiveRecord::TestCase
+  def test_schema_dump_includes_limit_constraint_for_integer_columns
+    stream = StringIO.new
+
+    ActiveRecord::SchemaDumper.ignore_tables = [/^(?!integer_limits)/]
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    output = stream.string
+    assert_match %r{c_int_1.*:limit => 2}, output
+    assert_match %r{c_int_2.*:limit => 2}, output
+    assert_match %r{c_int_3.*}, output
+    assert_match %r{c_int_4.*}, output
+    assert_no_match %r{c_int_3.*:limit}, output
+    assert_no_match %r{c_int_4.*:limit}, output
+  end  
+end
+
 class StringDefaultsTest < ActiveRecord::TestCase
   class StringDefaults < ActiveRecord::Base; end;