1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/bytea.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/bytea.rb
index 89b203d2b1..6bd1b8ecae 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/bytea.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/bytea.rb
@@ -2,9 +2,10 @@ module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
       module OID # :nodoc:
-        class Bytea < Type::Binary
+        class Bytea < Type::Binary # :nodoc:
           def type_cast_from_database(value)
             return if value.nil?
+            return value.to_s if value.is_a?(Type::Binary::Data)
             PGconn.unescape_bytea(super)
           end
         end