Skip to content

Commit

Permalink
Merge pull request #4231 from estolfo/MONGOID-3606-foreign-key-poly
Browse files Browse the repository at this point in the history
MONGOID-3606 Don't evolve foreign keys of polymorphic relations
  • Loading branch information
estolfo committed Jan 26, 2016
2 parents 071b49a + 894dc1b commit 1939ace
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
6 changes: 5 additions & 1 deletion lib/mongoid/fields/foreign_key.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ def foreign_key?
# @since 3.0.0
def evolve(object)
if object_id_field? || object.is_a?(Document)
object.__evolve_object_id__
if metadata.polymorphic? && constraint
constraint.convert(object)
else
object.__evolve_object_id__
end
else
related_id_field.evolve(object)
end
Expand Down
23 changes: 23 additions & 0 deletions spec/mongoid/fields/foreign_key_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,29 @@
end
end
end

context "when the metadata is polymoprhic" do

let(:metadata) do
Agent.reflect_on_association(:names)
end

let(:field) do
described_class.new(:nameable_id, type: Object, metadata: metadata)
end

let(:value) do
BSON::ObjectId.new().to_s
end

let(:evolved) do
field.evolve(value)
end

it "does not change the foreign key" do
expect(evolved).to be(value)
end
end
end

describe "#lazy?" do
Expand Down

0 comments on commit 1939ace

Please sign in to comment.