Add support/test around handling of float/real column types [Lucas Maxwell]

Author: metaskills

CHANGELOG

@@ -1,6 +1,8 @@
 
 * 3.1.0 *
 
+* Add support/test around handling of float/real column types [Lucas Maxwell]
+
 * Make auto reconnect duration configurable. Fixes #109 [David Chelimsky]
 
 * Quote most time objects to use ISO8601 format to be multi-language dateformat compatible. The [datetime] data type is

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -214,6 +214,8 @@ def column_definitions(table_name)
                            ci[:type]
                          when /^numeric|decimal$/i
                            "#{ci[:type]}(#{ci[:numeric_precision]},#{ci[:numeric_scale]})"
+                         when /^float|real$/i
+                           "#{ci[:type]}(#{ci[:numeric_precision]})"
                          when /^char|nchar|varchar|nvarchar|varbinary|bigint|int|smallint$/
                            ci[:length].to_i == -1 ? "#{ci[:type]}(max)" : "#{ci[:type]}(#{ci[:length]})"
                          else

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -79,8 +79,16 @@ def is_integer?
         !!(@sql_type =~ /int/i)
       end
 
+      def is_real?
+        !!(@sql_type =~ /real/i)
+      end
+      
       def sql_type_for_statement
-        is_integer? ? sql_type.sub(/\(\d+\)/,'') : sql_type
+        if is_integer? || is_real?
+          sql_type.sub(/\(\d+\)/,'')
+        else
+          sql_type
+        end
       end
 
       def default_function

test/cases/adapter_test_sqlserver.rb

@@ -481,6 +481,14 @@ def setup
         assert_equal 'bigint', @connection.type_to_sql(:integer, 8)
       end
 
+      should 'create floats when no limit supplied' do
+        assert_equal 'float(8)', @connection.type_to_sql(:float)
+      end
+
+      should 'create floats when limit is supplied' do
+        assert_equal 'float(27)', @connection.type_to_sql(:float, 27)
+      end
+      
     end
 
   end

test/cases/column_test_sqlserver.rb

@@ -273,6 +273,53 @@ def setup
 
   end
 
+  context 'For float columns' do
+    # NOTE: float limits are adjusted to 24 or 53 by the database as per
+    # http://msdn.microsoft.com/en-us/library/ms173773.aspx
+    # NOTE: floats with a limit of <= 24 are reduced to reals by sqlserver on creation
+
+    setup do
+      @temperature = FloatData.columns_hash['temperature']
+      @freezing = FloatData.columns_hash['temperature_8']
+      @mild = FloatData.columns_hash['temperature_24']
+      @beach = FloatData.columns_hash['temperature_32']
+      @desert = FloatData.columns_hash['temperature_53']
+    end
+
+    should 'have correct simplified types' do
+      assert_equal :float, @temperature.type
+      assert_equal :float, @freezing.type
+      assert_equal :float, @mild.type
+      assert_equal :float, @beach.type
+      assert_equal :float, @desert.type
+    end
+
+    should 'have correct #sql_type' do
+      assert_equal 'real(24)', @temperature.sql_type
+      assert_equal 'real(24)', @freezing.sql_type
+      assert_equal 'real(24)', @mild.sql_type
+      assert_equal 'float(53)', @beach.sql_type
+      assert_equal 'float(53)',  @desert.sql_type
+    end
+
+    should 'have correct #limit' do
+      assert_equal 24, @temperature.limit
+      assert_equal 24, @freezing.limit
+      assert_equal 24, @mild.limit
+      assert_equal 53, @beach.limit
+      assert_equal 53, @desert.limit
+    end
+
+    should 'return nil precisions and scales' do
+      assert_equal [nil,nil], [@temperature.precision, @temperature.scale]
+      assert_equal [nil,nil], [@freezing.precision, @freezing.scale]
+      assert_equal [nil,nil], [@mild.precision, @mild.scale]
+      assert_equal [nil,nil], [@beach.precision, @beach.scale]
+      assert_equal [nil,nil], [@desert.precision, @desert.scale]
+    end
+
+  end
+  
   context 'For tinyint columns' do
 
     setup do

test/cases/sqlserver_helper.rb

@@ -32,6 +32,7 @@ class TableWithRealColumn < ActiveRecord::Base; end
 class FkTestHasFk < ActiveRecord::Base ; end
 class FkTestHasPk < ActiveRecord::Base ; end
 class NumericData < ActiveRecord::Base ; self.table_name = 'numeric_data' ; end
+class FloatData < ActiveRecord::Base ; self.table_name = 'float_data' ; end
 class CustomersView < ActiveRecord::Base ; self.table_name = 'customers_view' ; end
 class StringDefaultsView < ActiveRecord::Base ; self.table_name = 'string_defaults_view' ; end
 class StringDefaultsBigView < ActiveRecord::Base ; self.table_name = 'string_defaults_big_view' ; end

test/schema/sqlserver_specific_schema.rb

@@ -5,6 +5,14 @@
     t.column :COLUMN2, :integer
   end
 
+  create_table :float_data, :force => true do |t|
+    t.float   :temperature
+    t.float   :temperature_8, :limit => 8
+    t.float   :temperature_24, :limit => 24
+    t.float   :temperature_32, :limit => 32
+    t.float   :temperature_53, :limit => 53
+  end
+  
   create_table :table_with_real_columns, :force => true do |t|
     t.column :real_number, :real
   end