diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-03-02 10:03:04 +0000 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-03-02 10:03:04 +0000 |
| commit | c09f934dcb2d02763777e7fd025cdc33bc8ec8bb (patch) | |
| tree | 5a00fc27911ee2da06a41ca49f7d3049704e5762 /activerecord/test | |
| parent | 2d4068dbeff7313ab332538b3934cfbf10445104 (diff) | |
| parent | 2cc09441c2de57b024b11ba666ba1e72c2b20cfe (diff) | |
| download | rails-c09f934dcb2d02763777e7fd025cdc33bc8ec8bb.tar.gz rails-c09f934dcb2d02763777e7fd025cdc33bc8ec8bb.tar.bz2 rails-c09f934dcb2d02763777e7fd025cdc33bc8ec8bb.zip | |
Merge pull request #9431 from troyk/patch-2
Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/adapters/postgresql/datatype_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb index 33c796191e..1e6ae85a25 100644 --- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb +++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb @@ -573,6 +573,7 @@ _SQL @first_timestamp_with_zone = PostgresqlTimestampWithZone.find(1) assert_equal Time.utc(2010,1,1, 11,0,0), @first_timestamp_with_zone.time + assert_instance_of Time, @first_timestamp_with_zone.time ensure ActiveRecord::Base.default_timezone = old_default_tz ActiveRecord::Base.time_zone_aware_attributes = old_tz @@ -590,6 +591,7 @@ _SQL @first_timestamp_with_zone = PostgresqlTimestampWithZone.find(1) assert_equal Time.utc(2010,1,1, 11,0,0), @first_timestamp_with_zone.time + assert_instance_of Time, @first_timestamp_with_zone.time ensure ActiveRecord::Base.default_timezone = old_default_tz ActiveRecord::Base.time_zone_aware_attributes = old_tz |