diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2012-01-21 20:07:12 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2012-01-21 20:07:12 +0900 |
| commit | bd603399639fe7dd12e532a89210760fa564440c (patch) | |
| tree | 36798720cbf01f3c20f5353c0b6104f076e9d536 | |
| parent | 2e13850e4c8245214568b7e133908af7db9dbb9f (diff) | |
| download | rails-bd603399639fe7dd12e532a89210760fa564440c.tar.gz rails-bd603399639fe7dd12e532a89210760fa564440c.tar.bz2 rails-bd603399639fe7dd12e532a89210760fa564440c.zip | |
change AR default_timezone to :utc since it's the default for AR::Railtie
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index e90503d173..adba3f710c 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -45,10 +45,10 @@ module ActiveRecord ## # :singleton-method: - # Determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling - # dates and times from the database. This is set to :local by default. + # Determines whether to use Time.utc (using :utc) or Time.local (using :local) when pulling + # dates and times from the database. This is set to :utc by default. config_attribute :default_timezone, :global => true - self.default_timezone = :local + self.default_timezone = :utc ## # :singleton-method: diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 3ab6973549..87a3a0deb9 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -689,7 +689,7 @@ class BasicsTest < ActiveRecord::TestCase } topic = Topic.find(1) topic.attributes = attributes - assert_equal Time.local(2004, 6, 24, 16, 24, 0), topic.written_on + assert_equal Time.utc(2004, 6, 24, 16, 24, 0), topic.written_on end def test_multiparameter_attributes_on_time_with_no_date @@ -938,7 +938,7 @@ class BasicsTest < ActiveRecord::TestCase } topic = Topic.find(1) topic.attributes = attributes - assert_equal Time.local(2000, 1, 1, 5, 42, 0), topic.bonus_time + assert_equal Time.utc(2000, 1, 1, 5, 42, 0), topic.bonus_time end def test_boolean |