Repository navigation
Fix - Entity injection fails when additional fields (Fields plugin) are mapped - #708
Merged
Merged
Conversation
RomainLvr
requested review from
a team,
Lainow,
MyvTsv and
jdurand-teclib
and removed request for
a team
November 12, 2026 09:29
jdurand-teclib
approved these changes
Nov 13, 2026
Lainow
approved these changes
Nov 13, 2026
MyvTsv
approved these changes
Nov 16, 2026
|
Backport-action backported this pull request in workflow run 43833697264.
|
3 of 4 tasks
RomainLvr
added a commit
that referenced
this pull request
Nov 16, 2026
…re mapped (#708) *Please delete options that are not relevant.* - [x] I have performed a self-review of my code. - [x] I have added tests (when available) that prove my fix is effective or that my feature works. - [x] I have updated the CHANGELOG with a short functional description of the fix or new feature. - [ ] This change requires a documentation update. - It fixes !47495 - Here is a brief description of what this PR does Follow-up of #703. When injecting entities with a column mapped to an additional field (Fields plugin), every line ends as "Import failed" and the logs show: > MySQL query error: Duplicate entry 'Entity-2268-11' for key 'glpi_plugin_fields_entitycontactentites.itemtype_item_container' Before inserting a linked item, `dataAlreadyInDB()` looks for an existing row restricted to the entity set by `addNeededFields()`, which copies the primary item's `entities_id`. For an entity, this field is its parent. Fields always stores its row in the entity of the parent item (`getEntityID()`), which for an entity is the entity itself. The existing row is never found, so it is inserted again. `PluginDatainjectionEntityInjection::addOrUpdateObject()` runs the injection twice, so the error appears on the very first import. - When the primary type is `Entity`, linked items are searched and written in the entity itself instead of its parent. - Other itemtypes are not affected. - `FieldsContainerRightTest`: a Fields value is injected on a new entity, then updated on an existing one. - The Fields stubs now force the stored entity from the parent item, like the real plugin, and a stub container on `Entity` was added. (cherry picked from commit 3339b28)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Checklist before requesting a review
Please delete options that are not relevant.
Description
Follow-up of #703. When injecting entities with a column mapped to an additional field (Fields plugin), every line ends as "Import failed" and the logs show:
Before inserting a linked item,
dataAlreadyInDB()looks for an existing row restricted to the entity set byaddNeededFields(), which copies the primary item'sentities_id. For an entity, this field is its parent. Fields always stores its row in the entity of the parent item (getEntityID()), which for an entity is the entity itself. The existing row is never found, so it is inserted again.PluginDatainjectionEntityInjection::addOrUpdateObject()runs the injection twice, so the error appears on the very first import.Fix
Entity, linked items are searched and written in the entity itself instead of its parent.Tests
FieldsContainerRightTest: a Fields value is injected on a new entity, then updated on an existing one.Entitywas added.