diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 14:31:38 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 14:31:38 +0000 |
commit | 36a9eff957c29cbb5fd8654c24fef6bfc94b92d4 (patch) | |
tree | 0917aede866fe38352ec4073b411d9ab021cfbda /activerecord | |
parent | 4ef7bfb0166cb45428861ce9e001838ab9a2796f (diff) | |
download | rails-36a9eff957c29cbb5fd8654c24fef6bfc94b92d4.tar.gz rails-36a9eff957c29cbb5fd8654c24fef6bfc94b92d4.tar.bz2 rails-36a9eff957c29cbb5fd8654c24fef6bfc94b92d4.zip |
Added support for timestamp with time zone in PostgreSQL #560 [Scott Barron]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@858 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 46afe282cb..4ea883623e 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added support for timestamp with time zone in PostgreSQL #560 [Scott Barron] + * Added MultiparameterAssignmentErrors and AttributeAssignmentError exceptions #777 [demetrius]. Documentation: * +MultiparameterAssignmentErrors+ -- collection of errors that occurred during a mass assignment using the diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index b7ca509ef8..f9719b9f2b 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -188,6 +188,7 @@ module ActiveRecord when 'numeric', 'real', 'money' then 'float' when 'character varying', 'interval' then 'string' when 'timestamp without time zone' then 'datetime' + when 'timestamp with time zone' then 'datetime' when 'bytea' then 'binary' else field_type end |