1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index a6042e1382..2395a744a3 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -114,6 +114,12 @@ module ActiveRecord
             # Object identifier types
             when /^oid$/
               :integer
+            # UUID type
+            when /^uuid$/
+              :string
+            # Small and big integer types
+            when /^(?:small|big)int$/
+              :integer
             # Pass through all types that are not specific to PostgreSQL.
             else
               super