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/lib | |
| 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/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/oid.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb index e09319890a..68f2f2ca7b 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb @@ -317,10 +317,6 @@ module ActiveRecord alias_type 'macaddr', 'text' alias_type 'uuid', 'text' - # FIXME: I don't think this is correct. We should probably be returning a parsed date, - # but the tests pass with a string returned. - register_type 'timestamptz', OID::Identity.new - register_type 'money', OID::Money.new register_type 'bytea', OID::Bytea.new register_type 'bool', OID::Boolean.new @@ -329,6 +325,7 @@ module ActiveRecord alias_type 'float8', 'float4' register_type 'timestamp', OID::Timestamp.new + register_type 'timestamptz', OID::Timestamp.new register_type 'date', OID::Date.new register_type 'time', OID::Time.new |