Moving some #type_to_sql tests around. Getting ready to overhaul #type_to_sql and/or test more.

Author: metaskills

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -338,7 +338,7 @@ def quoted_false
       end
 
       # TODO: I get the feeling this needs to go and that it is patching something else wrong.
-      def quoted_date(value)      
+      def quoted_date(value)
         if value.acts_like?(:time)
           value.strftime("%Y%m%d %H:%M:%S")
         elsif value.acts_like?(:date)
@@ -588,14 +588,12 @@ def add_order_by_for_association_limiting!(sql, options)
         sql << " ORDER BY #{order.join(',')}"
       end
 
-      def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
+      def type_to_sql(type, limit = nil, precision = nil, scale = nil)
         # Remove limit for data types which do not require it
         # Valid:   ALTER TABLE sessions ALTER COLUMN [data] varchar(max)
         # Invalid: ALTER TABLE sessions ALTER COLUMN [data] varchar(max)(16777215)
         limit = nil if %w{text varchar(max) nvarchar(max) ntext varbinary(max) image}.include?(native_database_types[type.to_sym][:name])
-
         return super unless type.to_s == 'integer'
-
         if limit.nil?
           'integer'
         elsif limit > 4

test/cases/adapter_test_sqlserver.rb

@@ -195,6 +195,34 @@ def setup
 
   context 'For SchemaStatements' do
 
+    context 'returning from #type_to_sql' do
+
+      should 'create integers when no limit supplied' do
+        assert_equal 'integer', @connection.type_to_sql(:integer)
+      end
+      
+      should 'create integers when limit is 4' do
+        assert_equal 'integer', @connection.type_to_sql(:integer, 4)
+      end
+      
+      should 'create integers when limit is 3' do
+        assert_equal 'integer', @connection.type_to_sql(:integer, 3)
+      end
+      
+      should '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)
+      end
+      
+      should '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)
+      end
+      
+    end
+    
   end
 
   context 'For indexes' do

test/cases/schema_statement_test_sqlserver.rb

@@ -7,7 +7,7 @@ def setup
   end
 
   context 'For #columns' do
-
+    
     # Remove brackets and outer quotes (if quoted) of default value returned by db, i.e:
     #   "(1)" => "1", "('1')" => "1", "((-1))" => "-1", "('(-1)')" => "(-1)"
     #   Unicode strings will be prefixed with an N. Remove that too.
@@ -21,30 +21,5 @@ def setup
 
   end
 
-
-  should 'create integers when no limit supplied' do
-    assert_equal 'integer', @connection.type_to_sql(:integer)
-  end
-
-  should 'create integers when limit is 4' do
-    assert_equal 'integer', @connection.type_to_sql(:integer, 4)
-  end
-
-  should 'create integers when limit is 3' do
-    assert_equal 'integer', @connection.type_to_sql(:integer, 3)
-  end
-
-  should '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)
-  end
-
-  should '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)
-  end
-  
 
 end