1 files changed, 51 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index c31fe96842..1f1bd342d1 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -209,7 +209,7 @@ module ActiveRecord
 
       NATIVE_DATABASE_TYPES = {
         primary_key: "serial primary key",
-        string:      { name: "character varying", limit: 255 },
+        string:      { name: "character varying" },
         text:        { name: "text" },
         integer:     { name: "integer" },
         float:       { name: "float" },
@@ -454,6 +454,10 @@ module ActiveRecord
         postgresql_version >= 90200
       end
 
+      def supports_materialized_views?
+        postgresql_version >= 90300
+      end
+
       def enable_extension(name)
         exec_query("CREATE EXTENSION IF NOT EXISTS \"#{name}\"").tap {
           reload_type_map
@@ -555,6 +559,17 @@ module ActiveRecord
           @type_map
         end
 
+        def get_oid_type(oid, fmod, column_name)
+          if !type_map.key?(oid)
+            initialize_type_map(type_map, [oid])
+          end
+
+          type_map.fetch(oid, fmod) {
+            warn "unknown OID #{oid}: failed to recognize type of '#{column_name}'. It will be treated as String."
+            type_map[oid] = OID::Identity.new
+          }
+        end
+
         def reload_type_map
           type_map.clear
           initialize_type_map(type_map)
@@ -579,25 +594,32 @@ module ActiveRecord
           type_map
         end
 
-        def initialize_type_map(type_map)
+        def initialize_type_map(type_map, oids = nil)
           if supports_ranges?
-            result = execute(<<-SQL, 'SCHEMA')
-              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype
+            query = <<-SQL
+              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
               FROM pg_type as t
               LEFT JOIN pg_range as r ON oid = rngtypid
             SQL
           else
-            result = execute(<<-SQL, 'SCHEMA')
-              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput
+            query = <<-SQL
+              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, t.typtype, t.typbasetype
               FROM pg_type as t
             SQL
           end
-          ranges, nodes = result.partition { |row| row['typinput'] == 'range_in' }
-          leaves, nodes = nodes.partition { |row| row['typelem'] == '0' }
+
+          if oids
+            query += "WHERE t.oid::integer IN (%s)" % oids.join(", ")
+          end
+
+          result = execute(query, 'SCHEMA')
+          ranges, nodes = result.partition { |row| row['typtype'] == 'r' }
+          enums, nodes = nodes.partition { |row| row['typtype'] == 'e' }
+          domains, nodes = nodes.partition { |row| row['typtype'] == 'd' }
           arrays, nodes = nodes.partition { |row| row['typinput'] == 'array_in' }
+          leaves, nodes = nodes.partition { |row| row['typelem'] == '0' }
 
           # populate the enum types
-          enums, leaves = leaves.partition { |row| row['typinput'] == 'enum_in' }
           enums.each do |row|
             type_map[row['oid'].to_i] = OID::Enum.new
           end
@@ -626,10 +648,28 @@ module ActiveRecord
             range = OID::Range.new subtype
             type_map[row['oid'].to_i] = range
           end
+
+          # populate domain types
+          domains.each do |row|
+            base_type_oid = row["typbasetype"].to_i
+            if base_type = type_map[base_type_oid]
+              type_map[row['oid'].to_i] = base_type
+            else
+              warn "unknown base type (OID: #{base_type_oid}) for domain #{row["typname"]}."
+            end
+          end
         end
 
         FEATURE_NOT_SUPPORTED = "0A000" #:nodoc:
 
+        def execute_and_clear(sql, name, binds)
+          result = without_prepared_statement?(binds) ? exec_no_cache(sql, name, binds) :
+                                                        exec_cache(sql, name, binds)
+          ret = yield result
+          result.clear
+          ret
+        end
+
         def exec_no_cache(sql, name, binds)
           log(sql, name, binds) { @connection.async_exec(sql) }
         end
@@ -707,9 +747,9 @@ module ActiveRecord
           configure_connection
         rescue ::PG::Error => error
           if error.message.include?("does not exist")
-            raise ActiveRecord::NoDatabaseError.new(error.message)
+            raise ActiveRecord::NoDatabaseError.new(error.message, error)
           else
-            raise error
+            raise
           end
         end