aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2007-01-16 01:39:05 +0000
committerMichael Koziarski <michael@koziarski.com>2007-01-16 01:39:05 +0000
commit71a4f7161fb02cd5b2cefb374224be94b185306a (patch)
tree583117c93627db2bdb554cd44184930c44d8d644 /activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
parent8437be33801d598b3b3389163cb3082fb04b0ec8 (diff)
downloadrails-71a4f7161fb02cd5b2cefb374224be94b185306a.tar.gz
rails-71a4f7161fb02cd5b2cefb374224be94b185306a.tar.bz2
rails-71a4f7161fb02cd5b2cefb374224be94b185306a.zip
Allow the Oracle adapter to insert a string "null". Closes #6997 [laurelfan]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5958 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/oracle_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/oracle_adapter.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
index b44510fd7d..01eb350da4 100644
--- a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
@@ -66,7 +66,6 @@ begin
class OracleColumn < Column #:nodoc:
def type_cast(value)
- return nil if value =~ /^\s*null\s*$/i
return guess_date_or_time(value) if type == :datetime && OracleAdapter.emulate_dates
super
end