Merge pull request #14859 from jefflai2/datetime_type

PostgreSQL Timestamps always map to `:datetime`.

2 files changed, 15 insertions, 6 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index da07633b03..a4c6e5f499 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,17 @@
+*   PostgreSQL should internally use `:datetime` consistently for TimeStamp. Assures
+    different spellings of timestamps are treated the same.
+
+    Example:
+
+        mytimestamp.simplified_type('timestamp without time zone')
+        # => :datetime
+        mytimestamp.simplified_type('timestamp(6) without time zone')
+        # => also :datetime (previously would be :timestamp)
+
+    See #14513.
+
+    *Jefferson Lai*
+
 *   `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions.
 
     Fixes #14841.
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
index 9e898015a6..540b3694b5 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb
@@ -209,12 +209,7 @@ This is not reliable and will be removed in the future.
         class Timestamp < Type
           def type; :timestamp; end
           def simplified_type(sql_type)
-            case sql_type
-            when /^timestamp with(?:out)? time zone$/
-              :datetime
-            else
-              :timestamp
-            end
+            :datetime
           end
 
           def type_cast(value)