Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip serialization for all JSON/JSONB attributes in activerecord plugin #655

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Skip serialization for all JSON/JSONB attributes in activerecord plugin #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/shrine/plugins/activerecord.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ def activerecord_reload
record.transaction { yield record.clone.reload(lock: true) }
end

# Returns true if the data attribute represents a JSON or JSONB column.
# Returns true if the data attribute type is JSON or JSONB.
# Used by the _persistence plugin to determine whether serialization
# should be skipped.
def activerecord_hash_attribute?
column = record.class.columns_hash[attribute.to_s]
column && [:json, :jsonb].include?(column.type)
attribute_type = record.class.type_for_attribute(attribute.to_s)
attribute_type && [:json, :jsonb].include?(attribute_type.type)
end

# Returns whether the record is an ActiveRecord model. Used by the
Expand Down
26 changes: 13 additions & 13 deletions test/plugin/activerecord_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
def self.model_name
ActiveModel::Name.new(self, nil, "User")
end

attribute :json_avatar_data, :json
end

@user = user_class.new
@attacher = @shrine::Attacher.from_model(@user, :avatar)
@user = user_class.new
@attacher = @shrine::Attacher.from_model(@user, :avatar)
@json_attacher = @shrine::Attacher.from_model(@user, :json_avatar)
end

after do
Expand Down Expand Up @@ -271,22 +274,19 @@ def self.model_name
describe "JSON columns" do
[:json, :jsonb].each do |type|
it "handles #{type} type" do
# work around Active Record casting assigned values into a string
@user.class.send(:attr_accessor, :avatar_data)
# redefine attribute type to make :jsonb test
@user.class.type_for_attribute("json_avatar_data").class.send(:define_method, :type) { type }

columns_hash = @user.class.columns_hash.dup # unfreeze
columns_hash["avatar_data"] = columns_hash["avatar_data"].dup # unfreeze
columns_hash["avatar_data"].singleton_class.send(:define_method, :type) { type }
@user.class.instance_variable_set(:@columns_hash, columns_hash)
assert_equal @user.class.type_for_attribute("json_avatar_data").type, type

@attacher.load_model(@user, :avatar)
@attacher.attach(fakeio)
@json_attacher.load_model(@user, :json_avatar)
@json_attacher.attach(fakeio)

assert_equal @attacher.file.data, @user.avatar_data
assert_equal @json_attacher.file.data, @user.json_avatar_data

@attacher.reload
@json_attacher.reload

assert_equal @attacher.file.data, @user.avatar_data
assert_equal @json_attacher.file.data, @user.json_avatar_data
end
end
end
Expand Down