aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-14 18:55:10 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-14 18:55:10 -0300
commit57a952a223e10b1f4062f45a9490dc7076ea40ba (patch)
treea3d1b23752297c22e44862962b9340b8f1e40cf8 /activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
parent86af7d357899057f1565b2ebbeb4f3c3235846a1 (diff)
parent12e9a75f227ea7bcc23e2717e9ff5a72ec64e1f1 (diff)
downloadrails-57a952a223e10b1f4062f45a9490dc7076ea40ba.tar.gz
rails-57a952a223e10b1f4062f45a9490dc7076ea40ba.tar.bz2
rails-57a952a223e10b1f4062f45a9490dc7076ea40ba.zip
Merge pull request #6713 from etehtsea/activerecord-uuid
Add uuid datatype support to PostgreSQL adapter
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql/oid.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/oid.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
index df3d5e4657..6657491c06 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
@@ -223,6 +223,7 @@ module ActiveRecord
alias_type 'bit', 'text'
alias_type 'varbit', 'text'
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.