From 16f6bd4070d57fc1eacb1a531385af205233a573 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 28 Jan 2007 17:51:21 +0000 Subject: SQLServer: don't choke on strings containing 'null'. Closes #7083. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb index 92ac249fdf..e85a826942 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -73,7 +73,7 @@ module ActiveRecord end def type_cast(value) - return nil if value.nil? || value =~ /^\s*null\s*$/i + return nil if value.nil? case type when :datetime then cast_to_datetime(value) when :timestamp then cast_to_time(value) -- cgit v1.2.3