aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-09-07 11:07:09 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-09-07 11:07:09 -0700
commitf41dba27a411fe3e2ddeb8d9ab6856dbb23acd02 (patch)
treea5ff9ce032648164cd80cb40978c61bbf1fee63c /activerecord/lib
parentec39055456339f69e0171aec89c7d3a711137f13 (diff)
parent319482d8fe49d70817ffa0f30ab6653b1ea9cbac (diff)
downloadrails-f41dba27a411fe3e2ddeb8d9ab6856dbb23acd02.tar.gz
rails-f41dba27a411fe3e2ddeb8d9ab6856dbb23acd02.tar.bz2
rails-f41dba27a411fe3e2ddeb8d9ab6856dbb23acd02.zip
Merge pull request #7545 from senny/7518_postgres_type_detection
postgres, map scaled intervals to string datatype
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index c508afb33e..d1751d70c6 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -181,7 +181,7 @@ module ActiveRecord
# Date/time types
when /^timestamp with(?:out)? time zone$/
:datetime
- when 'interval'
+ when /^interval(?:|\(\d+\))$/
:string
# Geometric types
when /^(?:point|line|lseg|box|"?path"?|polygon|circle)$/