@budibase/server 1.0.219 → 1.0.220-alpha.0

package/coverage/lcov-report/api/controllers/row/external.js.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">16.07% </span>
+                <span class="strong">15.12% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>18/112</span>
+                <span class='fraction'>18/119</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/46</span>
+                <span class='fraction'>0/50</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">16.36% </span>
+                <span class="strong">15.51% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>18/110</span>
+                <span class='fraction'>18/116</span>
             </div>
         
             
@@ -296,7 +296,17 @@
 <a name='L231'></a><a href='#L231'>231</a>
 <a name='L232'></a><a href='#L232'>232</a>
 <a name='L233'></a><a href='#L233'>233</a>
-<a name='L234'></a><a href='#L234'>234</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L234'></a><a href='#L234'>234</a>
+<a name='L235'></a><a href='#L235'>235</a>
+<a name='L236'></a><a href='#L236'>236</a>
+<a name='L237'></a><a href='#L237'>237</a>
+<a name='L238'></a><a href='#L238'>238</a>
+<a name='L239'></a><a href='#L239'>239</a>
+<a name='L240'></a><a href='#L240'>240</a>
+<a name='L241'></a><a href='#L241'>241</a>
+<a name='L242'></a><a href='#L242'>242</a>
+<a name='L243'></a><a href='#L243'>243</a>
+<a name='L244'></a><a href='#L244'>244</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -459,21 +469,31 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -686,34 +706,44 @@ exports.validate = <span class="fstat-no" title="function not covered" >as</span
 }
 &nbsp;
 exports.exportRows = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
-  const { datasourceId, tableName } = <span class="cstat-no" title="statement not covered" >breakExternalTableId(ctx.params.tableId)</span>
+  const { datasourceId } = <span class="cstat-no" title="statement not covered" >breakExternalTableId(ctx.params.tableId)</span>
   const db = <span class="cstat-no" title="statement not covered" >getAppDB()</span>
-  let format = <span class="cstat-no" title="statement not covered" >ctx.query.format</span>
+  const format = <span class="cstat-no" title="statement not covered" >ctx.query.format</span>
+  const { columns } = <span class="cstat-no" title="statement not covered" >ctx.request.body</span>
   const datasource = <span class="cstat-no" title="statement not covered" >await db.get(datasourceId)</span>
 <span class="cstat-no" title="statement not covered" >  if (!datasource || !datasource.entities) {</span>
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Datasource has not been configured for plus API.")</span>
   }
-  const tables = <span class="cstat-no" title="statement not covered" >datasource.entities</span>
-  const table = <span class="cstat-no" title="statement not covered" >tables[tableName]</span>
 <span class="cstat-no" title="statement not covered" >  ctx.request.body = {</span>
     query: {
       oneOf: {
-        [table.primaryDisplay]: ctx.request.body.rows.map(
-<span class="fstat-no" title="function not covered" >          id</span> =&gt; <span class="cstat-no" title="statement not covered" >breakRowIdField(id)[0]</span>
-        ),
+        _id: ctx.request.body.rows.map(<span class="fstat-no" title="function not covered" >ro</span>w =&gt; <span class="cstat-no" title="statement not covered" >JSON.parse(decodeURI(row))[0])</span>,
       },
     },
   }
 &nbsp;
   let result = <span class="cstat-no" title="statement not covered" >await exports.search(ctx)</span>
+  let rows = <span class="cstat-no" title="statement not covered" >[]</span>
+&nbsp;
+  // Filter data to only specified columns if required
+<span class="cstat-no" title="statement not covered" >  if (columns &amp;&amp; columns.length) {</span>
+<span class="cstat-no" title="statement not covered" >    for (let i = <span class="cstat-no" title="statement not covered" >0;</span> i &lt; result.rows.length; i++) {</span>
+<span class="cstat-no" title="statement not covered" >      rows[i] = {}</span>
+<span class="cstat-no" title="statement not covered" >      for (let column of columns) {</span>
+<span class="cstat-no" title="statement not covered" >        rows[i][column] = result.rows[i][column]</span>
+      }
+    }
+  } else {
+<span class="cstat-no" title="statement not covered" >    rows = result.rows</span>
+  }
 &nbsp;
-  let headers = <span class="cstat-no" title="statement not covered" >Object.keys(result.rows[0])</span>
+  let headers = <span class="cstat-no" title="statement not covered" >Object.keys(rows[0])</span>
   const exporter = <span class="cstat-no" title="statement not covered" >exporters[format]</span>
   const filename = <span class="cstat-no" title="statement not covered" >`export.${format}`</span>
 &nbsp;
   // send down the file
 <span class="cstat-no" title="statement not covered" >  ctx.attachment(filename)</span>
-<span class="cstat-no" title="statement not covered" >  return apiFileReturn(exporter(headers, result.rows))</span>
+<span class="cstat-no" title="statement not covered" >  return apiFileReturn(exporter(headers, rows))</span>
 }
 &nbsp;
 exports.fetchEnrichedRow = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
@@ -769,7 +799,7 @@ exports.fetchEnrichedRow = <span class="fstat-no" title="function not covered" >
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Jul 08 2022 12:33:10 GMT+0000 (Coordinated Universal Time)
+                at Mon Jul 11 2022 09:30:59 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/row/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">57.87% </span>
+                <span class="strong">56.91% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>349/603</span>
+                <span class='fraction'>362/636</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">35.82% </span>
+                <span class="strong">35.61% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>96/268</span>
+                <span class='fraction'>104/292</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">53.48% </span>
+                <span class="strong">52.27% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>46/86</span>
+                <span class='fraction'>46/88</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">57.96% </span>
+                <span class="strong">57.16% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>342/590</span>
+                <span class='fraction'>355/621</span>
             </div>
         
             
@@ -80,17 +80,17 @@
 </thead>
 <tbody><tr>
 	<td class="file low" data-value="external.js"><a href="external.js.html">external.js</a></td>
-	<td data-value="16.07" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 16%"></div><div class="cover-empty" style="width: 84%"></div></div>
+	<td data-value="15.12" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 15%"></div><div class="cover-empty" style="width: 85%"></div></div>
 	</td>
-	<td data-value="16.07" class="pct low">16.07%</td>
-	<td data-value="112" class="abs low">18/112</td>
+	<td data-value="15.12" class="pct low">15.12%</td>
+	<td data-value="119" class="abs low">18/119</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="46" class="abs low">0/46</td>
+	<td data-value="50" class="abs low">0/50</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="15" class="abs low">0/15</td>
-	<td data-value="16.36" class="pct low">16.36%</td>
-	<td data-value="110" class="abs low">18/110</td>
+	<td data-value="15.51" class="pct low">15.51%</td>
+	<td data-value="116" class="abs low">18/116</td>
 	</tr>
 
 <tr>
@@ -110,17 +110,17 @@
 
 <tr>
 	<td class="file medium" data-value="internalSearch.js"><a href="internalSearch.js.html">internalSearch.js</a></td>
-	<td data-value="60.89" class="pic medium">
+	<td data-value="60" class="pic medium">
 	<div class="chart"><div class="cover-fill" style="width: 60%"></div><div class="cover-empty" style="width: 40%"></div></div>
 	</td>
-	<td data-value="60.89" class="pct medium">60.89%</td>
-	<td data-value="156" class="abs medium">95/156</td>
-	<td data-value="40" class="pct low">40%</td>
-	<td data-value="95" class="abs low">38/95</td>
-	<td data-value="54.54" class="pct medium">54.54%</td>
-	<td data-value="33" class="abs medium">18/33</td>
-	<td data-value="61.43" class="pct medium">61.43%</td>
-	<td data-value="153" class="abs medium">94/153</td>
+	<td data-value="60" class="pct medium">60%</td>
+	<td data-value="180" class="abs medium">108/180</td>
+	<td data-value="40.7" class="pct low">40.7%</td>
+	<td data-value="113" class="abs low">46/113</td>
+	<td data-value="51.42" class="pct medium">51.42%</td>
+	<td data-value="35" class="abs medium">18/35</td>
+	<td data-value="60.79" class="pct medium">60.79%</td>
+	<td data-value="176" class="abs medium">107/176</td>
 	</tr>
 
 <tr>
@@ -140,17 +140,17 @@
 
 <tr>
 	<td class="file medium" data-value="utils.js"><a href="utils.js.html">utils.js</a></td>
-	<td data-value="69.23" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 69%"></div><div class="cover-empty" style="width: 31%"></div></div>
+	<td data-value="66.66" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 66%"></div><div class="cover-empty" style="width: 34%"></div></div>
 	</td>
-	<td data-value="69.23" class="pct medium">69.23%</td>
-	<td data-value="52" class="abs medium">36/52</td>
-	<td data-value="40.62" class="pct low">40.62%</td>
-	<td data-value="32" class="abs low">13/32</td>
+	<td data-value="66.66" class="pct medium">66.66%</td>
+	<td data-value="54" class="abs medium">36/54</td>
+	<td data-value="38.23" class="pct low">38.23%</td>
+	<td data-value="34" class="abs low">13/34</td>
 	<td data-value="66.66" class="pct medium">66.66%</td>
 	<td data-value="6" class="abs medium">4/6</td>
-	<td data-value="68.62" class="pct medium">68.62%</td>
-	<td data-value="51" class="abs medium">35/51</td>
+	<td data-value="66.03" class="pct medium">66.03%</td>
+	<td data-value="53" class="abs medium">35/53</td>
 	</tr>
 
 </tbody>
@@ -161,7 +161,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Jul 08 2022 12:33:10 GMT+0000 (Coordinated Universal Time)
+                at Mon Jul 11 2022 09:30:59 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/row/internal.js.html

@@ -1435,7 +1435,7 @@ exports.fetchEnrichedRow = async ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Jul 08 2022 12:33:10 GMT+0000 (Coordinated Universal Time)
+                at Mon Jul 11 2022 09:30:59 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/row/internalSearch.js.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">60.89% </span>
+                <span class="strong">60% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>95/156</span>
+                <span class='fraction'>108/180</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">40% </span>
+                <span class="strong">40.7% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>38/95</span>
+                <span class='fraction'>46/113</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">54.54% </span>
+                <span class="strong">51.42% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>18/33</span>
+                <span class='fraction'>18/35</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">61.43% </span>
+                <span class="strong">60.79% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>94/153</span>
+                <span class='fraction'>107/176</span>
             </div>
         
             
@@ -461,7 +461,53 @@
 <a name='L396'></a><a href='#L396'>396</a>
 <a name='L397'></a><a href='#L397'>397</a>
 <a name='L398'></a><a href='#L398'>398</a>
-<a name='L399'></a><a href='#L399'>399</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">43x</span>
+<a name='L399'></a><a href='#L399'>399</a>
+<a name='L400'></a><a href='#L400'>400</a>
+<a name='L401'></a><a href='#L401'>401</a>
+<a name='L402'></a><a href='#L402'>402</a>
+<a name='L403'></a><a href='#L403'>403</a>
+<a name='L404'></a><a href='#L404'>404</a>
+<a name='L405'></a><a href='#L405'>405</a>
+<a name='L406'></a><a href='#L406'>406</a>
+<a name='L407'></a><a href='#L407'>407</a>
+<a name='L408'></a><a href='#L408'>408</a>
+<a name='L409'></a><a href='#L409'>409</a>
+<a name='L410'></a><a href='#L410'>410</a>
+<a name='L411'></a><a href='#L411'>411</a>
+<a name='L412'></a><a href='#L412'>412</a>
+<a name='L413'></a><a href='#L413'>413</a>
+<a name='L414'></a><a href='#L414'>414</a>
+<a name='L415'></a><a href='#L415'>415</a>
+<a name='L416'></a><a href='#L416'>416</a>
+<a name='L417'></a><a href='#L417'>417</a>
+<a name='L418'></a><a href='#L418'>418</a>
+<a name='L419'></a><a href='#L419'>419</a>
+<a name='L420'></a><a href='#L420'>420</a>
+<a name='L421'></a><a href='#L421'>421</a>
+<a name='L422'></a><a href='#L422'>422</a>
+<a name='L423'></a><a href='#L423'>423</a>
+<a name='L424'></a><a href='#L424'>424</a>
+<a name='L425'></a><a href='#L425'>425</a>
+<a name='L426'></a><a href='#L426'>426</a>
+<a name='L427'></a><a href='#L427'>427</a>
+<a name='L428'></a><a href='#L428'>428</a>
+<a name='L429'></a><a href='#L429'>429</a>
+<a name='L430'></a><a href='#L430'>430</a>
+<a name='L431'></a><a href='#L431'>431</a>
+<a name='L432'></a><a href='#L432'>432</a>
+<a name='L433'></a><a href='#L433'>433</a>
+<a name='L434'></a><a href='#L434'>434</a>
+<a name='L435'></a><a href='#L435'>435</a>
+<a name='L436'></a><a href='#L436'>436</a>
+<a name='L437'></a><a href='#L437'>437</a>
+<a name='L438'></a><a href='#L438'>438</a>
+<a name='L439'></a><a href='#L439'>439</a>
+<a name='L440'></a><a href='#L440'>440</a>
+<a name='L441'></a><a href='#L441'>441</a>
+<a name='L442'></a><a href='#L442'>442</a>
+<a name='L443'></a><a href='#L443'>443</a>
+<a name='L444'></a><a href='#L444'>444</a>
+<a name='L445'></a><a href='#L445'>445</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">43x</span>
 <span class="cline-any cline-yes">43x</span>
 <span class="cline-any cline-yes">43x</span>
 <span class="cline-any cline-yes">43x</span>
@@ -482,6 +528,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -576,6 +624,11 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -605,9 +658,23 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -616,6 +683,9 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -664,22 +734,44 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -871,6 +963,7 @@ const { getAppId } = require("@budibase/backend-core/context")
 class QueryBuilder {
   constructor(base) {
     this.query = {
+      allOr: false,
       string: {},
       fuzzy: {},
       range: {},
@@ -878,6 +971,7 @@ class QueryBuilder {
       notEqual: {},
       empty: {},
       notEmpty: {},
+      oneOf: {},
       ...base,
     }
     this.limit = 50
@@ -970,6 +1064,11 @@ class QueryBuilder {
 &nbsp;
 <span class="fstat-no" title="function not covered" >  ad</span>dNotEmpty(key, value) {
 <span class="cstat-no" title="statement not covered" >    this.query.notEmpty[key] = value</span>
+<span class="cstat-no" title="statement not covered" >    return this</span>
+  }
+&nbsp;
+<span class="fstat-no" title="function not covered" >  ad</span>dOneOf(key, value) {
+<span class="cstat-no" title="statement not covered" >    this.query.oneOf[key] = value</span>
 <span class="cstat-no" title="statement not covered" >    return this</span>
   }
 &nbsp;
@@ -1001,8 +1100,22 @@ class QueryBuilder {
 &nbsp;
   buildSearchQuery() {
     const builder = this
-    let query = "*:*"
+    let allOr = this.query &amp;&amp; this.query.allOr
+    let query = allOr ? <span class="branch-0 cbranch-no" title="branch not covered" >"" </span>: "*:*"
     const allPreProcessingOpts = { escape: true, lowercase: true, wrap: true }
+    let tableId
+    <span class="missing-if-branch" title="else path not taken" >E</span>if (this.query.equal.tableId) {
+      tableId = this.query.equal.tableId
+      delete this.query.equal.tableId
+    }
+&nbsp;
+    const equal = (key, value) =&gt; {
+      // 0 evaluates to false, which means we would return all rows if we don't check it
+      <span class="missing-if-branch" title="if path not taken" >I</span>if (!value &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >value !== 0)</span> {
+<span class="cstat-no" title="statement not covered" >        return null</span>
+      }
+      return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
+    }
 &nbsp;
     function build(structure, queryFn) {
       for (let [key, value] of Object.entries(structure)) {
@@ -1013,7 +1126,10 @@ class QueryBuilder {
         <span class="missing-if-branch" title="if path not taken" >I</span>if (expression == null) {
 <span class="cstat-no" title="statement not covered" >          continue</span>
         }
-        query += ` AND ${expression}`
+        <span class="missing-if-branch" title="else path not taken" >E</span>if (query.length &gt; 0) {
+          query += ` ${allOr ? <span class="branch-0 cbranch-no" title="branch not covered" >"OR" </span>: "AND"} `
+        }
+        query += expression
       }
     }
 &nbsp;
@@ -1059,13 +1175,7 @@ class QueryBuilder {
       })
     }
     <span class="missing-if-branch" title="else path not taken" >E</span>if (this.query.equal) {
-      build(this.query.equal, (key, value) =&gt; {
-        // 0 evaluates to false, which means we would return all rows if we don't check it
-        <span class="missing-if-branch" title="if path not taken" >I</span>if (!value &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >value !== 0)</span> {
-<span class="cstat-no" title="statement not covered" >          return null</span>
-        }
-        return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
-      })
+      build(this.query.equal, equal)
     }
     <span class="missing-if-branch" title="else path not taken" >E</span>if (this.query.notEqual) {
       build(this.query.notEqual, <span class="fstat-no" title="function not covered" >(k</span>ey, value) =&gt; {
@@ -1081,6 +1191,34 @@ class QueryBuilder {
     <span class="missing-if-branch" title="else path not taken" >E</span>if (this.query.notEmpty) {
       build(this.query.notEmpty, <span class="fstat-no" title="function not covered" >ke</span>y =&gt; <span class="cstat-no" title="statement not covered" >`${key}:["" TO *]`)</span>
     }
+    <span class="missing-if-branch" title="else path not taken" >E</span>if (this.query.oneOf) {
+      build(this.query.oneOf, <span class="fstat-no" title="function not covered" >(k</span>ey, value) =&gt; {
+<span class="cstat-no" title="statement not covered" >        if (!Array.isArray(value)) {</span>
+<span class="cstat-no" title="statement not covered" >          if (typeof value === "string") {</span>
+<span class="cstat-no" title="statement not covered" >            value = value.split(",")</span>
+          } else {
+<span class="cstat-no" title="statement not covered" >            return ""</span>
+          }
+        }
+        let orStatement = <span class="cstat-no" title="statement not covered" >`${builder.preprocess(</span>
+          value[0],
+          allPreProcessingOpts
+        )}`
+<span class="cstat-no" title="statement not covered" >        for (let i = <span class="cstat-no" title="statement not covered" >1;</span> i &lt; value.length; i++) {</span>
+<span class="cstat-no" title="statement not covered" >          orStatement += ` OR ${builder.preprocess(</span>
+            value[i],
+            allPreProcessingOpts
+          )}`
+        }
+<span class="cstat-no" title="statement not covered" >        return `${key}:(${orStatement})`</span>
+      })
+    }
+    // make sure table ID is always added as an AND
+    <span class="missing-if-branch" title="else path not taken" >E</span>if (tableId) {
+      query = `(${query})`
+      allOr = false
+      build({ tableId }, equal)
+    }
     return query
   }
 &nbsp;
@@ -1264,7 +1402,7 @@ exports.fullSearch = async (query, params) =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Jul 08 2022 12:33:10 GMT+0000 (Coordinated Universal Time)
+                at Mon Jul 11 2022 09:30:59 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/api/controllers/row/staticFormula.js.html

@@ -538,7 +538,7 @@ exports.finaliseRow = async (
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Fri Jul 08 2022 12:33:10 GMT+0000 (Coordinated Universal Time)
+                at Mon Jul 11 2022 09:30:59 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>