aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql
diff options
context:
space:
mode:
authorTroy Kruthoff <tkruthoff@gmail.com>2013-03-01 09:12:30 -0800
committerTroy Kruthoff <tkruthoff@gmail.com>2013-03-01 09:51:23 -0800
commit2cc09441c2de57b024b11ba666ba1e72c2b20cfe (patch)
tree4595e1cd51c5fbaaa452a57e40f224808b3a91d8 /activerecord/lib/active_record/connection_adapters/postgresql
parentb49a2a779ba6deba108d1f842ab5b7bc7460aa14 (diff)
downloadrails-2cc09441c2de57b024b11ba666ba1e72c2b20cfe.tar.gz
rails-2cc09441c2de57b024b11ba666ba1e72c2b20cfe.tar.bz2
rails-2cc09441c2de57b024b11ba666ba1e72c2b20cfe.zip
Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time
In an AR model a timestamptz attribute would return a ruby string and AR tests did not check for any type casting. Previous tests would pass only because an assert_equal was being used on a Time.utc object, which will parse the right side of the eq to a valid Time instance for comparision. switch to test instance of Time instead of ActiveSupport::TimeWithZone
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/oid.rb5
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