1 files changed, 10 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
index ab1165f301..e12ddd9901 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
@@ -10,11 +10,19 @@ module ActiveRecord
           end
 
           def type_cast_from_database(value)
-            ConnectionAdapters::PostgreSQLColumn.string_to_json(value)
+            if value.is_a?(::String)
+              ::ActiveSupport::JSON.decode(value)
+            else
+              super
+            end
           end
 
           def type_cast_for_database(value)
-            ConnectionAdapters::PostgreSQLColumn.json_to_string(value)
+            if value.is_a?(::Array) || value.is_a?(::Hash)
+              ::ActiveSupport::JSON.encode(value)
+            else
+              super
+            end
           end
 
           def accessor