Merge pull request #52 from flat3/fix-applying-query-options-to-entit…

…y-sets Fix applying query options to entity sets
flat3 · Mar 18, 2021 · 3ff290a · 3ff290a
2 parents d757dd7 + a3df029
commit 3ff290a
Show file tree

Hide file tree

Showing 20 changed files with 1,183 additions and 156 deletions.
diff --git a/docs/classes/Flat3-Lodata-Drivers-EloquentEntitySet.html b/docs/classes/Flat3-Lodata-Drivers-EloquentEntitySet.html
diff --git a/docs/classes/Flat3-Lodata-Drivers-SQL-SQLSchema.html b/docs/classes/Flat3-Lodata-Drivers-SQL-SQLSchema.html
@@ -95,7 +95,7 @@ <h2 class="phpdocumentor-content__title">
         <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Drivers/SQL/SQLSchema.php"><a href="files/src-drivers-sql-sqlschema.html"><abbr title="src/Drivers/SQL/SQLSchema.php">SQLSchema.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">15</span>
+    <span class="phpdocumentor-element-found-in__line">16</span>
 </aside>
 
             <p class="phpdocumentor-summary">SQL Schema</p>
@@ -160,7 +160,7 @@ <h4 class="phpdocumentor-element__name" id="method_discoverProperties">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Drivers/SQL/SQLSchema.php"><a href="files/src-drivers-sql-sqlschema.html"><abbr title="src/Drivers/SQL/SQLSchema.php">SQLSchema.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">30</span>
+    <span class="phpdocumentor-element-found-in__line">31</span>
 </aside>
 
         <p class="phpdocumentor-summary">Discover SQL fields on this entity set as OData properties</p>
@@ -194,7 +194,7 @@ <h4 class="phpdocumentor-element__name" id="method_getCasts">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Drivers/SQL/SQLSchema.php"><a href="files/src-drivers-sql-sqlschema.html"><abbr title="src/Drivers/SQL/SQLSchema.php">SQLSchema.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">21</span>
+    <span class="phpdocumentor-element-found-in__line">22</span>
 </aside>
 
         <p class="phpdocumentor-summary">Get list of defined type casts</p>
@@ -229,7 +229,7 @@ <h4 class="phpdocumentor-element__name" id="method_sqlTypeToPrimitiveType">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Drivers/SQL/SQLSchema.php"><a href="files/src-drivers-sql-sqlschema.html"><abbr title="src/Drivers/SQL/SQLSchema.php">SQLSchema.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">94</span>
+    <span class="phpdocumentor-element-found-in__line">108</span>
 </aside>
 
         <p class="phpdocumentor-summary">Convert an SQL type to an OData primitive type</p>

diff --git a/docs/classes/Flat3-Lodata-Drivers-SQLEntitySet.html b/docs/classes/Flat3-Lodata-Drivers-SQLEntitySet.html
diff --git a/docs/classes/Flat3-Lodata-EntitySet.html b/docs/classes/Flat3-Lodata-EntitySet.html
diff --git a/docs/classes/Flat3-Lodata-Expression-Lexer.html b/docs/classes/Flat3-Lodata-Expression-Lexer.html
@@ -524,11 +524,11 @@ <h3 id="toc">
 <dd>Sort the provided array by value length</dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
-    <a href="classes/Flat3-Lodata-Expression-Lexer.html#method_splitCommaSeparatedQueryString">splitCommaSeparatedQueryString()</a>
+    <a href="classes/Flat3-Lodata-Expression-Lexer.html#method_splitSemicolonSeparatedQueryString">splitSemicolonSeparatedQueryString()</a>
     <span>
                         &nbsp;: array&lt;string|int, mixed&gt;    </span>
 </dt>
-<dd>Split a comma separated query string</dd>
+<dd>Split a semicolon separated query string</dd>
 
             <dt class="phpdocumentor-table-of-contents__entry -method -public">
     <a href="classes/Flat3-Lodata-Expression-Lexer.html#method_string_">string_()</a>
@@ -2761,21 +2761,21 @@ <h5 class="phpdocumentor-return-value__heading">Return values</h5>
             -public
                                                         "
 >
-    <h4 class="phpdocumentor-element__name" id="method_splitCommaSeparatedQueryString">
-        splitCommaSeparatedQueryString()
-        <a href="classes/Flat3-Lodata-Expression-Lexer.html#method_splitCommaSeparatedQueryString" class="headerlink"><i class="fas fa-link"></i></a>
+    <h4 class="phpdocumentor-element__name" id="method_splitSemicolonSeparatedQueryString">
+        splitSemicolonSeparatedQueryString()
+        <a href="classes/Flat3-Lodata-Expression-Lexer.html#method_splitSemicolonSeparatedQueryString" class="headerlink"><i class="fas fa-link"></i></a>
     </h4>
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Lexer.php"><a href="files/src-expression-lexer.html"><abbr title="src/Expression/Lexer.php">Lexer.php</abbr></a></abbr>
     :
     <span class="phpdocumentor-element-found-in__line">827</span>
 </aside>
 
-        <p class="phpdocumentor-summary">Split a comma separated query string</p>
+        <p class="phpdocumentor-summary">Split a semicolon separated query string</p>
 
     <code class="phpdocumentor-code phpdocumentor-signature ">
     <span class="phpdocumentor-signature__visibility">public</span>
-                <span class="phpdocumentor-signature__name">splitCommaSeparatedQueryString</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">array&lt;string|int, mixed&gt;</span></code>
+                <span class="phpdocumentor-signature__name">splitSemicolonSeparatedQueryString</span><span>(</span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">array&lt;string|int, mixed&gt;</span></code>
 
         <section class="phpdocumentor-description"></section>
 

diff --git a/docs/classes/Flat3-Lodata-Expression-Parser-Filter.html b/docs/classes/Flat3-Lodata-Expression-Parser-Filter.html
@@ -774,7 +774,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeBoolean">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">417</span>
+    <span class="phpdocumentor-element-found-in__line">416</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a boolean</p>
@@ -843,7 +843,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeDate">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">497</span>
+    <span class="phpdocumentor-element-found-in__line">496</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a date</p>
@@ -877,7 +877,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeDateTimeOffset">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">477</span>
+    <span class="phpdocumentor-element-found-in__line">476</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a date time offset</p>
@@ -911,7 +911,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeDoubleQuotedString">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">457</span>
+    <span class="phpdocumentor-element-found-in__line">456</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a double quoted string</p>
@@ -945,7 +945,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeDuration">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">359</span>
+    <span class="phpdocumentor-element-found-in__line">358</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a duration</p>
@@ -979,7 +979,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeGuid">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">340</span>
+    <span class="phpdocumentor-element-found-in__line">339</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a GUID</p>
@@ -1013,7 +1013,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeKeyword">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">537</span>
+    <span class="phpdocumentor-element-found-in__line">536</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a registered literal keyword</p>
@@ -1081,7 +1081,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeNull">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">378</span>
+    <span class="phpdocumentor-element-found-in__line">377</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize literal null</p>
@@ -1115,7 +1115,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeNumber">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">396</span>
+    <span class="phpdocumentor-element-found-in__line">395</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a number</p>
@@ -1263,7 +1263,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeSingleQuotedString">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">437</span>
+    <span class="phpdocumentor-element-found-in__line">436</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a single quoted string</p>
@@ -1331,7 +1331,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeString">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">557</span>
+    <span class="phpdocumentor-element-found-in__line">556</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a string</p>
@@ -1365,7 +1365,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeTimeOfDay">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">517</span>
+    <span class="phpdocumentor-element-found-in__line">516</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a time of day</p>

diff --git a/docs/classes/Flat3-Lodata-Expression-Parser-Search.html b/docs/classes/Flat3-Lodata-Expression-Parser-Search.html
@@ -623,7 +623,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeBoolean">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">417</span>
+    <span class="phpdocumentor-element-found-in__line">416</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a boolean</p>
@@ -692,7 +692,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeDate">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">497</span>
+    <span class="phpdocumentor-element-found-in__line">496</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a date</p>
@@ -726,7 +726,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeDateTimeOffset">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">477</span>
+    <span class="phpdocumentor-element-found-in__line">476</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a date time offset</p>
@@ -760,7 +760,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeDoubleQuotedString">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">457</span>
+    <span class="phpdocumentor-element-found-in__line">456</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a double quoted string</p>
@@ -794,7 +794,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeDuration">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">359</span>
+    <span class="phpdocumentor-element-found-in__line">358</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a duration</p>
@@ -828,7 +828,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeGuid">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">340</span>
+    <span class="phpdocumentor-element-found-in__line">339</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a GUID</p>
@@ -862,7 +862,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeKeyword">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">537</span>
+    <span class="phpdocumentor-element-found-in__line">536</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a registered literal keyword</p>
@@ -930,7 +930,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeNull">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">378</span>
+    <span class="phpdocumentor-element-found-in__line">377</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize literal null</p>
@@ -964,7 +964,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeNumber">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">396</span>
+    <span class="phpdocumentor-element-found-in__line">395</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a number</p>
@@ -1066,7 +1066,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeSingleQuotedString">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">437</span>
+    <span class="phpdocumentor-element-found-in__line">436</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a single quoted string</p>
@@ -1134,7 +1134,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeString">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">557</span>
+    <span class="phpdocumentor-element-found-in__line">556</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a string</p>
@@ -1168,7 +1168,7 @@ <h4 class="phpdocumentor-element__name" id="method_tokenizeTimeOfDay">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/Expression/Parser.php"><a href="files/src-expression-parser.html"><abbr title="src/Expression/Parser.php">Parser.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">517</span>
+    <span class="phpdocumentor-element-found-in__line">516</span>
 </aside>
 
         <p class="phpdocumentor-summary">Tokenize a time of day</p>