Skip to content

Commit

Permalink
Merged main
Browse files Browse the repository at this point in the history
  • Loading branch information
ralfhandl committed Nov 7, 2023
2 parents af737fa + e738a98 commit 6418f1b
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions docs/odata-csdl-json/odata-csdl-json.html
Original file line number Diff line number Diff line change
Expand Up @@ -1339,8 +1339,8 @@ <h3><a name="ContainsTarget7.5" href="#ContainsTarget7.5"> <code>$ContainsTarget
<h2 id="85-referential-constraint"><a name="ReferentialConstraint" href="#ReferentialConstraint">8.5 Referential Constraint</a></h2>
<p>A single-valued navigation property MAY define one or more referential constraints. A referential constraint asserts that the <em>dependent property</em> (the property defined on the structured type declaring the navigation property) MUST have the same value as the <em>principal property</em> (the referenced property declared on the entity type that is the target of the navigation).</p>
<p>The type of the dependent property MUST match the type of the principal property, or both types MUST be complex types.</p>
<p>If the principle property references an entity, then the dependent property must reference the same entity.</p>
<p>If the principle property’s value is a complex type instance, then the dependent property’s value must be a complex type instance with the same properties, each with the same values.</p>
<p>If the principal property references an entity, then the dependent property must reference the same entity.</p>
<p>If the principal property’s value is a complex type instance, then the dependent property’s value must be a complex type instance with the same properties, each with the same values.</p>
<p>If the navigation property on which the referential constraint is defined is nullable, or the principal property is nullable, then the dependent property MUST also be nullable. If both the navigation property and the principal property are not nullable, then the dependent property MUST NOT be nullable.</p>
<section id="-referentialconstraint" class="varjson rep">
<h3><a name="ReferentialConstraint7.6" href="#ReferentialConstraint7.6"> <code>$ReferentialConstraint</code></a></h3>
Expand Down
4 changes: 2 additions & 2 deletions docs/odata-csdl-json/odata-csdl-json.md
Original file line number Diff line number Diff line change
Expand Up @@ -2097,10 +2097,10 @@ the target of the navigation).
The type of the dependent property MUST match the type of the principal
property, or both types MUST be complex types.

If the principle property references an entity, then the dependent
If the principal property references an entity, then the dependent
property must reference the same entity.

If the principle property's value is a complex type instance, then the
If the principal property's value is a complex type instance, then the
dependent property's value must be a complex type instance with the same
properties, each with the same values.

Expand Down
4 changes: 2 additions & 2 deletions docs/odata-csdl-xml/odata-csdl-xml.html
Original file line number Diff line number Diff line change
Expand Up @@ -1234,8 +1234,8 @@ <h3><a name="AttributeContainsTarget13.5" href="#AttributeContainsTarget13.5"> A
<h2 id="85-referential-constraint"><a name="ReferentialConstraint" href="#ReferentialConstraint">8.5 Referential Constraint</a></h2>
<p>A single-valued navigation property MAY define one or more referential constraints. A referential constraint asserts that the <em>dependent property</em> (the property defined on the structured type declaring the navigation property) MUST have the same value as the <em>principal property</em> (the referenced property declared on the entity type that is the target of the navigation).</p>
<p>The type of the dependent property MUST match the type of the principal property, or both types MUST be complex types.</p>
<p>If the principle property references an entity, then the dependent property must reference the same entity.</p>
<p>If the principle property’s value is a complex type instance, then the dependent property’s value must be a complex type instance with the same properties, each with the same values.</p>
<p>If the principal property references an entity, then the dependent property must reference the same entity.</p>
<p>If the principal property’s value is a complex type instance, then the dependent property’s value must be a complex type instance with the same properties, each with the same values.</p>
<p>If the navigation property on which the referential constraint is defined is nullable, or the principal property is nullable, then the dependent property MUST also be nullable. If both the navigation property and the principal property are not nullable, then the dependent property MUST NOT be nullable.</p>
<div class="varxml rep">
<h3 id="-element-edmreferentialconstraint"><a name="ElementedmReferentialConstraint14" href="#ElementedmReferentialConstraint14"> Element <code>edm:ReferentialConstraint</code></a></h3>
Expand Down
4 changes: 2 additions & 2 deletions docs/odata-csdl-xml/odata-csdl-xml.md
Original file line number Diff line number Diff line change
Expand Up @@ -1977,10 +1977,10 @@ the target of the navigation).
The type of the dependent property MUST match the type of the principal
property, or both types MUST be complex types.

If the principle property references an entity, then the dependent
If the principal property references an entity, then the dependent
property must reference the same entity.

If the principle property's value is a complex type instance, then the
If the principal property's value is a complex type instance, then the
dependent property's value must be a complex type instance with the same
properties, each with the same values.

Expand Down
2 changes: 1 addition & 1 deletion docs/odata-json-format/odata-json-format.html
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ <h2 id="152-addedchanged-entity"><a name="AddedChangedEntity" href="#AddedChange
<p>Added or changed entities within a delta response are represented as <a href="#Entity">entities</a>.</p>
<p>Added entities MUST include all available selected properties and MAY include additional, unselected properties. Collection-valued properties are treated as atomic values; any collection-valued properties returned from a delta request MUST contain all current values for that collection.</p>
<p>Changed entities MUST include all available selected properties that have changed, and MAY include additional properties.</p>
<p>If a property of an entity is dependent upon the property of another entity within the expanded set of entities being tracked, then both the change to the dependent property as well as the change to the principle property or <a href="#AddedLink">added</a>/<a href="#DeletedLink">deleted link</a> corresponding to the change to the dependent property are returned in the delta response.</p>
<p>If a property of an entity is dependent upon the property of another entity within the expanded set of entities being tracked, then both the change to the dependent property as well as the change to the principal property or <a href="#AddedLink">added</a>/<a href="#DeletedLink">deleted link</a> corresponding to the change to the dependent property are returned in the delta response.</p>
<p>Entities that are not part of the entity set specified by the context URL MUST include the <a href="#ControlInformationcontextodatacontext"><code>context</code></a> control information to specify the entity set of the entity, regardless of the specified <a href="#ControllingtheAmountofControlInformationinResponses"><code>metadata</code></a> value.</p>
<p>Entities include control information for selected navigation links based on <a href="#ControllingtheAmountofControlInformationinResponses"><code>metadata</code></a>.</p>
<p>OData 4.0 payloads MUST NOT include expanded navigation properties inline; all changes MUST be represented as a flat array of added, deleted, or changed entities, along with added or deleted links.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/odata-json-format/odata-json-format.md
Original file line number Diff line number Diff line change
Expand Up @@ -2186,7 +2186,7 @@ have changed, and MAY include additional properties.

If a property of an entity is dependent upon the property of another
entity within the expanded set of entities being tracked, then both the
change to the dependent property as well as the change to the principle
change to the dependent property as well as the change to the principal
property or [added](#AddedLink)/[deleted link](#DeletedLink)
corresponding to the change to the dependent property are returned in
the delta response.
Expand Down
2 changes: 1 addition & 1 deletion docs/odata-protocol/odata-protocol.html
Original file line number Diff line number Diff line change
Expand Up @@ -1798,7 +1798,7 @@ <h3 id="1143-update-an-entity"><a name="UpdateanEntity" href="#UpdateanEntity">1
<p>Services MAY additionally support <code>PUT</code> but should be aware of the potential for data-loss in round-tripping properties that the client may not know about in advance, such as open or added properties, or properties not specified in metadata. Services that support <code>PUT</code> MUST replace all values of structural properties with those specified in the request body. Missing non-key, updatable structural properties not defined as dependent properties within a referential constraint MUST be set to their default values. Omitting a non-nullable property with no service-generated or default value from a <code>PUT</code> request results in a <code>400 Bad Request</code> error. Missing dynamic structural properties MUST be removed or set to <code>null</code>.</p>
<p>For requests with an <code>OData-Version</code> header with a value of <code>4.01</code> or greater, the media stream of a media entity can be updated by specifying the base64url-encoded representation of the media stream as a virtual property <code>$value</code>.</p>
<p>Updating a dependent property that is tied to a key property of the principal entity through a referential constraint updates the relationship to point to the entity with the specified key value. If there is no such entity, the update fails.</p>
<p>Updating a principle property that is tied to a dependent entity through a referential constraint on the dependent entity updates the dependent property.</p>
<p>Updating a principal property that is tied to a dependent entity through a referential constraint on the dependent entity updates the dependent property.</p>
<p>Key and other properties marked as read-only in metadata (including computed properties), as well as dependent properties that are not tied to key properties of the principal entity, can be omitted from the request. If the request contains a value for one of these properties, the service MUST ignore that value when applying the update. Services MUST return an error if an insert or update contains a new value for a property marked as updatable that cannot currently be changed by the user (i.e., given the state of the object or permissions of the user). The service MAY return success in this case if the specified value matches the value of the property. Clients SHOULD use <code>PATCH</code> and specify only those properties intended to be changed.</p>
<p>Entity id and entity type cannot be changed when updating an entity. However, format-specific rules might in some cases require providing entity id and entity type values in the payload when applying the update.</p>
<p>For requests with an <code>OData-Version</code> header with a value of <code>4.01</code> or greater, if the entity representation in the request body includes an ETag value, the update MUST NOT be performed and SHOULD return <a href="#ResponseCode412PreconditionFailed"><code>412 Precondition Failed</code></a> if the supplied ETag value is not <code>*</code> and does not match the current ETag value for the entity. ETag values in request bodies MUST be ignored for requests containing an OData-Version header with a value of <code>4.0</code>.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/odata-protocol/odata-protocol.md
Original file line number Diff line number Diff line change
Expand Up @@ -4291,7 +4291,7 @@ principal entity through a referential constraint updates the
relationship to point to the entity with the specified key value. If
there is no such entity, the update fails.

Updating a principle property that is tied to a dependent entity through
Updating a principal property that is tied to a dependent entity through
a referential constraint on the dependent entity updates the dependent
property.

Expand Down
4 changes: 2 additions & 2 deletions odata-csdl/7 Structural Property.md
Original file line number Diff line number Diff line change
Expand Up @@ -557,10 +557,10 @@ the target of the navigation).
The type of the dependent property MUST match the type of the principal
property, or both types MUST be complex types.

If the principle property references an entity, then the dependent
If the principal property references an entity, then the dependent
property must reference the same entity.

If the principle property's value is a complex type instance, then the
If the principal property's value is a complex type instance, then the
dependent property's value must be a complex type instance with the same
properties, each with the same values.

Expand Down
2 changes: 1 addition & 1 deletion odata-json-format/15 Delta Payload.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ have changed, and MAY include additional properties.

If a property of an entity is dependent upon the property of another
entity within the expanded set of entities being tracked, then both the
change to the dependent property as well as the change to the principle
change to the dependent property as well as the change to the principal
property or [added](#AddedLink)/[deleted link](#DeletedLink)
corresponding to the change to the dependent property are returned in
the delta response.
Expand Down
2 changes: 1 addition & 1 deletion odata-protocol/11.4 Data Modification.md
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ principal entity through a referential constraint updates the
relationship to point to the entity with the specified key value. If
there is no such entity, the update fails.

Updating a principle property that is tied to a dependent entity through
Updating a principal property that is tied to a dependent entity through
a referential constraint on the dependent entity updates the dependent
property.

Expand Down

0 comments on commit 6418f1b

Please sign in to comment.