Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ODATA-1628: odata.concat with exactly two arguments #234

Merged
merged 1 commit into from
Jan 24, 2024
Merged

ODATA-1628: odata.concat with exactly two arguments #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,29 @@
"cSpell.words": [
"ABNF",
"asec",
"ccid",
"concat",
"CSDL",
"CSDLXML",
"Datetimestamp",
"EDMX",
"entitytype",
"ETag",
"isec",
"isomorphy",
"matchespattern",
"odata",
"pandoc",
"parameterless",
"SRID",
"subasec",
"subisec",
"subsec",
"subsubsec",
"subsubsubsec",
"subsubsubsubsec",
"upsert"
"upsert",
"varjson",
"varxml"
]
}
125 changes: 80 additions & 45 deletions docs/odata-csdl-json/odata-csdl-json.html
View file
Open in desktop

Large diffs are not rendered by default.

81 changes: 58 additions & 23 deletions docs/odata-csdl-json/odata-csdl-json.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3181,7 +3181,7 @@ It MAY contain the members `$IncludeInServiceDocument` and

### <a name="Collection.16.1" href="#Collection.16.1">`$Collection`</a>

The value of `$Collection` is the Booelan value `true`.
The value of `$Collection` is the Boolean value `true`.

### <a name="Type.16.2" href="#Type.16.2">`$Type`</a>

Expand Down Expand Up @@ -3543,9 +3543,14 @@ type specified by the term `SearchResult`
"$Apply": [
"Products(",
{
"$Path": "ID"
},
")"
"$Apply": [
{
"$Path": "ID"
},
")"
],
"$Function": "odata.concat"
}
],
"$Function": "odata.concat"
}
Expand Down Expand Up @@ -4433,12 +4438,12 @@ type `self.B` of the hosting property `A2`.
},
"$Annotations": {
"self.Container/SetA/A2": {
"@Core.Description#viaset@Core.IsLanguageDependent": {
"@Core.Description#viaSet@Core.IsLanguageDependent": {
"$Path": "B1"
},
"@Core.Description#viaset": "…"
"@Core.Description#viaSet": "…"
},
"self.Container/SetA/A2/@Core.Description#viaset": {
"self.Container/SetA/A2/@Core.Description#viaSet": {
"@Core.IsLanguageDependent": {
"$Path": "B1"
}
Expand Down Expand Up @@ -4543,7 +4548,7 @@ element whose type is an entity type, or a collection of entity types,
e.g. a navigation property.

The value of the navigation property path expression is the path itself,
not the entitiy or collection of entities identified by the path.
not the entity or collection of entities identified by the path.

::: {.varjson .rep}
Navigation property path expressions are represented as a string
Expand Down Expand Up @@ -4934,7 +4939,7 @@ client-side functions, qualified with the namespace `odata`. The
semantics of these client-side functions is identical to their
counterpart function defined in [OData-URL](#ODataURL).

For example, the `odata.concat` client-side function takes two or more
For example, the `odata.concat` client-side function takes two
expressions as arguments. Each argument MUST evaluate to a primitive or
enumeration type. It returns a value of type `Edm.String` that is the
concatenation of the literal representations of the results of the
Expand All @@ -4950,17 +4955,42 @@ Example 75:
"$Apply": [
"Product: ",
{
"$Path": "ProductName"
},
" (",
{
"$Path": "Available/Quantity"
},
" ",
{
"$Path": "Available/Unit"
},
" available)"
"$Apply": [
{
"$Path": "ProductName"
},
{
"$Apply": [
" (",
{
"$Apply": [
{
"$Path": "Available/Quantity"
},
{
"$Apply": [
" ",
{
"$Apply": [
{
"$Path": "Available/Unit"
},
" available)"
],
"$Function": "odata.concat"
}
],
"$Function": "odata.concat"
}
],
"$Function": "odata.concat"
}
],
"$Function": "odata.concat"
}
],
"$Function": "odata.concat"
}
],
"$Function": "odata.concat"
}
Expand Down Expand Up @@ -5058,7 +5088,7 @@ primitive type and returns the URL-encoded OData literal that can be
used as a key value in OData URLs or in the query part of OData URLs.

Note: string literals are surrounded by single quotes as required by the
paren-style key syntax.
parentheses-style key syntax.

::: {.varjson .example}
Example 78:
Expand Down Expand Up @@ -5821,9 +5851,14 @@ Example 91:
{
"$Path": "Name"
},
" in ",
{
"$Path": "Address/CountryName"
"$Apply": [
" in ",
{
"$Path": "Address/CountryName"
}
],
"$Function": "odata.concat"
}
],
"$Function": "odata.concat"
Expand Down
Loading