Make XSD more strict for other Document types #2766
Conversation
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
alcaeus
reviewed
May 6, 2025
doctrine-mongo-mapping.xsd
Outdated
| <xs:element name="reference-one" type="odm:reference-one" minOccurs="0" maxOccurs="unbounded" /> | ||
| <xs:element name="reference-many" type="odm:reference-many" minOccurs="0" maxOccurs="unbounded" /> | ||
| <xs:element name="also-load-methods" type="odm:also-load-methods" minOccurs="0" /> | ||
| <xs:element name="indexes" type="odm:indexes" minOccurs="0" /> |
There was a problem hiding this comment.
Query result documents don't have indexes. Looking at the elements possible in a document, I think we should add lifecycle callbacks and the three discriminator elements (field, map, default value) here as well.
| <xs:element name="reference-one" type="odm:reference-one" minOccurs="0" maxOccurs="unbounded" /> | ||
| <xs:element name="reference-many" type="odm:reference-many" minOccurs="0" maxOccurs="unbounded" /> | ||
| <xs:element name="also-load-methods" type="odm:also-load-methods" minOccurs="0" /> | ||
| <xs:element name="indexes" type="odm:indexes" minOccurs="0" /> |
There was a problem hiding this comment.
I'd have to confirm in tests, but IIRC embedded documents can be discriminated and also have lifecycle callbacks, so those elements should be added.
| </xs:complexType> | ||
|
|
||
| <xs:complexType name="mapped-superclass"> | ||
| <xs:attribute name="name" type="xs:NMTOKEN" /> | ||
| <xs:choice minOccurs="0" maxOccurs="unbounded"> |
There was a problem hiding this comment.
For mapped superclasses, we should check the inheritance logic in the mapping driver to confirm what elements are allowed. IIRC, attributes like the write concern, capped collection information, etc. is all inherited to documents, so we may want to add it here as well.
alcaeus
approved these changes
May 7, 2025
SenseException
approved these changes
May 7, 2025
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.
Summary
The goal of this change is to detect earlier when an XML attribute is used while it's not supported by Doctrine ODM.
BC Break: previously, the XSD schema allowed some attributes or child elements that were not used in the metadata. Example: "collection" name for embedded documents.