diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index c2a7f7ca2f..175e6f5bd5 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* SQLServer: don't report limits for unsupported field types. #2835 [Ryan Tomayko] + * Include the Enumerable module in ActiveRecord::Errors. [Rick Bradley <rick@rickbradley.com>] * Add :group option, correspond to GROUP BY, to the find method and to the has_many association. #2818 [rubyonrails@atyp.de] diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb index a91e1ca56f..fecc6a7e1c 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -52,6 +52,8 @@ module ActiveRecord @identity = is_identity @is_special = sql_type =~ /text|ntext|image/i ? true : false @scale = scale_value + # SQL Server only supports limits on *char and float types + @limit = nil unless @type == :float or @type == :string end def simplified_type(field_type) |