2 files changed, 5 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb
index 97a93ce87a..77fdebbbc9 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb
@@ -12,10 +12,10 @@ module ActiveRecord
 
         if sql_type =~ /\[\]$/
           @array = true
-          super(name, default_value, sql_type[0..sql_type.length - 3], null)
+          super(name, default_value, oid_type, sql_type[0..sql_type.length - 3], null)
         else
           @array = false
-          super(name, default_value, sql_type, null)
+          super(name, default_value, oid_type, sql_type, null)
         end
 
         @default_function = default if has_default_function?(default_value, default)
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
index cf6a375704..a32915f363 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
@@ -204,11 +204,8 @@ This is not reliable and will be removed in the future.
           end
         end
 
-        class Timestamp < Type
-          def type; :timestamp; end
-          def simplified_type(sql_type)
-            :datetime
-          end
+        class DateTime < Type
+          def type; :datetime; end
 
           def type_cast(value)
             return if value.nil?
@@ -483,7 +480,7 @@ This is not reliable and will be removed in the future.
         register_type 'bool', OID::Boolean.new
         register_type 'bit', OID::Bit.new
         alias_type 'varbit', 'bit'
-        register_type 'timestamp', OID::Timestamp.new
+        register_type 'timestamp', OID::DateTime.new
         alias_type 'timestamptz', 'timestamp'
         register_type 'date', OID::Date.new
         register_type 'time', OID::Time.new