diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-07 10:42:14 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-07 10:42:14 +0000 |
| commit | 40bdbba48dfb80b824b1522fc99ca24669dea7b4 (patch) | |
| tree | 310f3e351d69ea85b3e4859ea9772d6c047a6b52 /activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | |
| parent | 9f3625dd0ae1691be3ea0b745a65149b9e4c2837 (diff) | |
| download | rails-40bdbba48dfb80b824b1522fc99ca24669dea7b4.tar.gz rails-40bdbba48dfb80b824b1522fc99ca24669dea7b4.tar.bz2 rails-40bdbba48dfb80b824b1522fc99ca24669dea7b4.zip | |
Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. Closes #5635.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4574 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index 3031c11267..d088e2ca26 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -113,7 +113,7 @@ module ActiveRecord time_hash[:sec_fraction] = microseconds(time_hash) time_array = time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction) # treat 0000-00-00 00:00:00 as nil - Time.send(Base.default_timezone, *time_array) rescue nil + Time.send(Base.default_timezone, *time_array) rescue DateTime.new(*time_array[0..5]) rescue nil end def self.string_to_dummy_time(string) |