Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/couchbase-orm/relation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def build_update(**cond)
end
if value.is_a?(Hash)
value.map do |k, v|
"#{key}.#{k} = #{v}"
"#{key}.#{k} = #{@model.quote(v) || 'NULL'}"

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A la place du || NULL, une meilleure approche serait de corriger quote elle-même pour retourner 'NULL' au lieu de nil — ce qui fixerait le problème à la source pour tous les appelants. Mais dans le cadre de cette PR (qui ne touche que le cas Hash), le fix local proposé par Gemini est raisonnable.

end.join(", ") + for_clause
else
"#{key} = #{@model.quote(value)}#{for_clause}"
Expand Down
26 changes: 26 additions & 0 deletions spec/relation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,32 @@ def self.active
expect(m3.reload.children.map(&:age)).to eq([50, 20])
end

it "should update nested hash attributes with string values" do
m1 = RelationModel.create!(age: 10, children: [NestedRelationModel.new(age: 10, name: "Tom"), NestedRelationModel.new(age: 20, name: "Jerry")])
m2 = RelationModel.create!(age: 20, children: [NestedRelationModel.new(age: 15, name: "Tom"), NestedRelationModel.new(age: 20, name: "Jerry")])

RelationModel.where(age: 20).update_all(child: {name: "Updated", _for: :children, _when: {child: {name: "Tom"}}})

expect(m1.reload.children.map(&:name)).to eq(["Tom", "Jerry"])
expect(m2.reload.children.map(&:name)).to eq(["Updated", "Jerry"])
end

it "should update nested hash attributes with nil values" do
m1 = RelationModel.create!(age: 20, children: [NestedRelationModel.new(age: 10, name: "Tom"), NestedRelationModel.new(age: 20, name: "Jerry")])

RelationModel.where(age: 20).update_all(child: {name: nil, _for: :children, _when: {child: {name: "Tom"}}})

expect(m1.reload.children.map(&:name)).to eq([nil, "Jerry"])
end

it "should properly quote string values containing special characters in hash updates" do
m1 = RelationModel.create!(age: 20, children: [NestedRelationModel.new(age: 10, name: "Tom"), NestedRelationModel.new(age: 20, name: "Jerry")])

RelationModel.where(age: 20).update_all(child: {name: "it's a test", _for: :children, _when: {child: {name: "Tom"}}})

expect(m1.reload.children.map(&:name)).to eq(["it's a test", "Jerry"])
end

it "should update nested attributes with a path in a for clause" do
m1 = RelationModel.create!(
pathelement: PathRelationModel.new(
Expand Down
Loading