aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorJoel <joel@renewfund.com>2012-02-04 17:22:32 -0800
committerJoel <joel@renewfund.com>2012-02-08 22:28:50 -0800
commita110789ca4b89c2ad984d044c175a0b8a018c54b (patch)
tree143fe9b3673c9fb4d4d9171b7d468bed4d7b56a4 /activerecord/lib/active_record
parentd1abb8ba64238bbcf748fc3bab0e8ee07df37fc1 (diff)
downloadrails-a110789ca4b89c2ad984d044c175a0b8a018c54b.tar.gz
rails-a110789ca4b89c2ad984d044c175a0b8a018c54b.tar.bz2
rails-a110789ca4b89c2ad984d044c175a0b8a018c54b.zip
add hstore to postgres native types and defaults
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb6
1 files changed, 5 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 194c814e5b..ed82c4d6f6 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -217,6 +217,9 @@ module ActiveRecord
# Arrays
when /\A'(.*)'::"?\D+"?\[\]\z/
$1
+ # Hstore
+ when /\A'(.*)'::hstore\z/
+ $1
# Object identifier types
when /\A-?\d+\z/
$1
@@ -284,7 +287,8 @@ module ActiveRecord
:binary => { :name => "bytea" },
:boolean => { :name => "boolean" },
:xml => { :name => "xml" },
- :tsvector => { :name => "tsvector" }
+ :tsvector => { :name => "tsvector" },
+ :hstore => { :name => "hstore" }
}
# Returns 'PostgreSQL' as adapter name for identification purposes.