From f8cbdd41104128a6a4fdec09e0914754b9d655cf Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Wed, 8 Nov 2023 18:55:33 +0100 Subject: [PATCH] ODATA-1500 (#146) --- .vscode/settings.json | 1 + docs/odata-protocol/odata-protocol.html | 2 +- docs/odata-protocol/odata-protocol.md | 2 +- .../odata-url-conventions/odata-url-conventions.html | 12 ++++++------ docs/odata-url-conventions/odata-url-conventions.md | 12 ++++++------ odata-protocol/11 Data Service Requests.md | 2 +- odata-url-conventions/5 Query Options.md | 10 +++++----- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 84e8e54ef..8ff1b738e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,6 +4,7 @@ "asec", "CSDL", "ETag", + "matchespattern", "odata", "pandoc", "subasec", diff --git a/docs/odata-protocol/odata-protocol.html b/docs/odata-protocol/odata-protocol.html index d5cdaf899..89e711567 100644 --- a/docs/odata-protocol/odata-protocol.html +++ b/docs/odata-protocol/odata-protocol.html @@ -1444,7 +1444,7 @@
String Functions -matchesPattern
matchesPattern(CompanyName,'%5EA.*e$')
+matchespattern
matchespattern(CompanyName,'%5EA.*e$')
tolower
tolower(CompanyName) eq 'alfreds futterkiste'
toupper
toupper(CompanyName) eq 'ALFREDS FUTTERKISTE'
trim 
trim(CompanyName) eq 'Alfreds Futterkiste'
diff --git a/docs/odata-protocol/odata-protocol.md b/docs/odata-protocol/odata-protocol.md index 5e1aecd72..2525bba86 100644 --- a/docs/odata-protocol/odata-protocol.md +++ b/docs/odata-protocol/odata-protocol.md @@ -3175,7 +3175,7 @@ a `null` literal that can be used in comparisons. hassubset
hassubset([4,1,3],[3,1])
hassubsequence
hassubsequence([4,1,3,1],[1,1])
String Functions -matchesPattern
matchesPattern(CompanyName,'%5EA.*e$')
+matchespattern
matchespattern(CompanyName,'%5EA.*e$')
tolower
tolower(CompanyName) eq 'alfreds futterkiste'
toupper
toupper(CompanyName) eq 'ALFREDS FUTTERKISTE'
trim 
trim(CompanyName) eq 'Alfreds Futterkiste'
diff --git a/docs/odata-url-conventions/odata-url-conventions.html b/docs/odata-url-conventions/odata-url-conventions.html index e6ad8ba69..a939a6207 100644 --- a/docs/odata-url-conventions/odata-url-conventions.html +++ b/docs/odata-url-conventions/odata-url-conventions.html @@ -258,7 +258,7 @@

Table of Contents

  • 5.1.1.7 String Functions
      -
    • 5.1.1.7.1 matchesPattern
      • +
    • 5.1.1.7.1 matchespattern
    • 5.1.1.7.2 tolower
    • 5.1.1.7.3 toupper
    • 5.1.1.7.4 trim
      • @@ -1192,13 +1192,13 @@
      5. hassubsequence([1,2],[1,1,2])

      5.1.1.7 String Functions

      -
      5.1.1.7.1 matchesPattern
      -

      The matchesPattern function has the following signature:

      -
      Edm.Boolean matchesPattern(Edm.String,Edm.String)
      -

      The second parameter MUST evaluate to a string containing an [ECMAScript] (JavaScript) regular expression. The matchesPattern function returns true if the first parameter evaluates to a string matching that regular expression, using syntax and semantics of [ECMAScript] regular expressions, otherwise it returns false.

      +
      5.1.1.7.1 matchespattern
      +

      The matchespattern function has the following signature:

      +
      Edm.Boolean matchespattern(Edm.String,Edm.String)
      +

      The second parameter MUST evaluate to a string containing an [ECMAScript] (JavaScript) regular expression. The matchespattern function returns true if the first parameter evaluates to a string matching that regular expression, using syntax and semantics of [ECMAScript] regular expressions, otherwise it returns false.

      Example 81: all customers with a CompanyName that match the (percent-encoded) regular expression ^A.*e$

      -
      http://host/service/Customers?$filter=matchesPattern(CompanyName,'%5EA.*e$')
      +
      http://host/service/Customers?$filter=matchespattern(CompanyName,'%5EA.*e$')
      5.1.1.7.2 tolower

      The tolower function has the following signature:

      diff --git a/docs/odata-url-conventions/odata-url-conventions.md b/docs/odata-url-conventions/odata-url-conventions.md index 22ba664ef..bc585dfda 100644 --- a/docs/odata-url-conventions/odata-url-conventions.md +++ b/docs/odata-url-conventions/odata-url-conventions.md @@ -169,7 +169,7 @@ For complete copyright information please see the full Notices section in an App - [5.1.1.6.1 `hassubset`](#hassubset) - [5.1.1.6.2 `hassubsequence`](#hassubsequence) - [5.1.1.7 String Functions](#StringFunctions) - - [5.1.1.7.1 `matchesPattern`](#matchesPattern) + - [5.1.1.7.1 `matchespattern`](#matchespattern) - [5.1.1.7.2 `tolower`](#tolower) - [5.1.1.7.3 `toupper`](#toupper) - [5.1.1.7.4 `trim`](#trim) @@ -2247,17 +2247,17 @@ hassubsequence([1,2],[1,1,2]) #### 5.1.1.7 String Functions -##### 5.1.1.7.1 `matchesPattern` +##### 5.1.1.7.1 `matchespattern` -The `matchesPattern` function has the following signature: +The `matchespattern` function has the following signature: ``` -Edm.Boolean matchesPattern(Edm.String,Edm.String) +Edm.Boolean matchespattern(Edm.String,Edm.String) ``` The second parameter MUST evaluate to a string containing an [**[ECMAScript]**](#ECMAScript) (JavaScript) regular expression. The -`matchesPattern` function returns true if the first parameter evaluates +`matchespattern` function returns true if the first parameter evaluates to a string matching that regular expression, using syntax and semantics of [**[ECMAScript]**](#ECMAScript) regular expressions, otherwise it returns false. @@ -2266,7 +2266,7 @@ returns false. Example 81: all customers with a `CompanyName` that match the (percent-encoded) regular expression `^A.*e$` ``` -http://host/service/Customers?$filter=matchesPattern(CompanyName,'%5EA.*e$') +http://host/service/Customers?$filter=matchespattern(CompanyName,'%5EA.*e$') ``` ::: diff --git a/odata-protocol/11 Data Service Requests.md b/odata-protocol/11 Data Service Requests.md index 909335753..933597829 100644 --- a/odata-protocol/11 Data Service Requests.md +++ b/odata-protocol/11 Data Service Requests.md @@ -647,7 +647,7 @@ a `null` literal that can be used in comparisons. hassubset
      hassubset([4,1,3],[3,1])
      hassubsequence
      hassubsequence([4,1,3,1],[1,1])
      String Functions -matchesPattern
      matchesPattern(CompanyName,'%5EA.*e$')
      +matchespattern
      matchespattern(CompanyName,'%5EA.*e$')
      tolower
      tolower(CompanyName) eq 'alfreds futterkiste'
      toupper
      toupper(CompanyName) eq 'ALFREDS FUTTERKISTE'
      trim 
      trim(CompanyName) eq 'Alfreds Futterkiste'
      diff --git a/odata-url-conventions/5 Query Options.md b/odata-url-conventions/5 Query Options.md index cadd7577d..a71a06031 100644 --- a/odata-url-conventions/5 Query Options.md +++ b/odata-url-conventions/5 Query Options.md @@ -853,17 +853,17 @@ hassubsequence([1,2],[1,1,2]) #### ##subsubsubsec String Functions -##### ##subsubsubsubsec `matchesPattern` +##### ##subsubsubsubsec `matchespattern` -The `matchesPattern` function has the following signature: +The `matchespattern` function has the following signature: ``` -Edm.Boolean matchesPattern(Edm.String,Edm.String) +Edm.Boolean matchespattern(Edm.String,Edm.String) ``` The second parameter MUST evaluate to a string containing an [**[ECMAScript]**](#ECMAScript) (JavaScript) regular expression. The -`matchesPattern` function returns true if the first parameter evaluates +`matchespattern` function returns true if the first parameter evaluates to a string matching that regular expression, using syntax and semantics of [**[ECMAScript]**](#ECMAScript) regular expressions, otherwise it returns false. @@ -872,7 +872,7 @@ returns false. Example ##ex: all customers with a `CompanyName` that match the (percent-encoded) regular expression `^A.*e$` ``` -http://host/service/Customers?$filter=matchesPattern(CompanyName,'%5EA.*e$') +http://host/service/Customers?$filter=matchespattern(CompanyName,'%5EA.*e$') ``` :::