@budibase/server 1.0.93 → 1.0.96

package/coverage/lcov-report/integrations/tests/TestConfiguration.js.html

@@ -64,7 +64,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/integrations/tests/index.html

@@ -95,7 +95,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/middleware/appInfo.js.html

@@ -121,7 +121,7 @@ exports.middleware =
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/authorized.js.html

@@ -382,7 +382,7 @@ module.exports =
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/builder.js.html

@@ -298,7 +298,7 @@ module.exports = async (ctx, permType) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/currentapp.js.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">83.63% </span>
+                <span class="strong">82.14% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>46/55</span>
+                <span class='fraction'>46/56</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">83.63% </span>
+                <span class="strong">82.14% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>46/55</span>
+                <span class='fraction'>46/56</span>
             </div>
         
             
@@ -172,7 +172,8 @@
 <a name='L113'></a><a href='#L113'>113</a>
 <a name='L114'></a><a href='#L114'>114</a>
 <a name='L115'></a><a href='#L115'>115</a>
-<a name='L116'></a><a href='#L116'>116</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L116'></a><a href='#L116'>116</a>
+<a name='L117'></a><a href='#L117'>117</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>
@@ -260,6 +261,7 @@
 <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-yes">190x</span>
@@ -288,7 +290,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const {
-  getAppId,
+  getAppIdFromCtx,
   setCookie,
   getCookie,
   clearCookie,
@@ -306,7 +308,7 @@ const { doInAppContext } = require("@budibase/backend-core/context")
 &nbsp;
 module.exports = async (ctx, next) =&gt; {
   // try to get the appID from the request
-  let requestAppId = getAppId(ctx)
+  let requestAppId = await getAppIdFromCtx(ctx)
   // get app cookie if it exists
   let appCookie = null
   try {
@@ -360,21 +362,22 @@ module.exports = async (ctx, next) =&gt; {
   }
 &nbsp;
   return doInAppContext(appId, async () =&gt; {
-    let noCookieSet = false
+    let skipCookie = false
     // if the user not in the right tenant then make sure they have no permissions
     // need to judge this only based on the request app ID,
     <span class="missing-if-branch" title="if path not taken" >I</span>if (
       env.MULTI_TENANCY &amp;&amp;
 <span class="branch-1 cbranch-no" title="branch not covered" >      ctx.user </span>&amp;&amp;
 <span class="branch-2 cbranch-no" title="branch not covered" >      requestAppId </span>&amp;&amp;
-<span class="branch-3 cbranch-no" title="branch not covered" >      !isUserInAppTenant(requestAppId)</span>
+<span class="branch-3 cbranch-no" title="branch not covered" >      !isUserInAppTenant(requestAppId, ctx.user)</span>
     ) {
       // don't error, simply remove the users rights (they are a public user)
 <span class="cstat-no" title="statement not covered" >      delete ctx.user.builder</span>
 <span class="cstat-no" title="statement not covered" >      delete ctx.user.admin</span>
 <span class="cstat-no" title="statement not covered" >      delete ctx.user.roles</span>
+<span class="cstat-no" title="statement not covered" >      ctx.isAuthenticated = false</span>
 <span class="cstat-no" title="statement not covered" >      roleId = BUILTIN_ROLE_IDS.PUBLIC</span>
-<span class="cstat-no" title="statement not covered" >      noCookieSet = true</span>
+<span class="cstat-no" title="statement not covered" >      skipCookie = true</span>
     }
 &nbsp;
     ctx.appId = appId
@@ -394,7 +397,7 @@ module.exports = async (ctx, next) =&gt; {
       (requestAppId !== appId ||
         appCookie == null ||
         appCookie.appId !== requestAppId) &amp;&amp;
-      !noCookieSet
+      !skipCookie
     ) {
       setCookie(ctx, { appId }, Cookies.CurrentApp)
     }
@@ -409,7 +412,7 @@ module.exports = async (ctx, next) =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/index.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">81.85% </span>
+                <span class="strong">81.56% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>230/281</span>
+                <span class='fraction'>230/282</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">82.73% </span>
+                <span class="strong">82.43% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>230/278</span>
+                <span class='fraction'>230/279</span>
             </div>
         
             
@@ -119,17 +119,17 @@
 
 <tr>
 	<td class="file high" data-value="currentapp.js"><a href="currentapp.js.html">currentapp.js</a></td>
-	<td data-value="83.63" class="pic high">
-	<div class="chart"><div class="cover-fill" style="width: 83%"></div><div class="cover-empty" style="width: 17%"></div></div>
+	<td data-value="82.14" class="pic high">
+	<div class="chart"><div class="cover-fill" style="width: 82%"></div><div class="cover-empty" style="width: 18%"></div></div>
 	</td>
-	<td data-value="83.63" class="pct high">83.63%</td>
-	<td data-value="55" class="abs high">46/55</td>
+	<td data-value="82.14" class="pct high">82.14%</td>
+	<td data-value="56" class="abs high">46/56</td>
 	<td data-value="76.74" class="pct medium">76.74%</td>
 	<td data-value="43" class="abs medium">33/43</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="2" class="abs high">2/2</td>
-	<td data-value="83.63" class="pct high">83.63%</td>
-	<td data-value="55" class="abs high">46/55</td>
+	<td data-value="82.14" class="pct high">82.14%</td>
+	<td data-value="56" class="abs high">46/56</td>
 	</tr>
 
 <tr>
@@ -230,7 +230,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/joi-validator.js.html

@@ -148,7 +148,7 @@ module.exports.params = schema => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/publicApi.js.html

@@ -100,11 +100,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></td><td class="text"><pre class="prettyprint lang-js">const { Headers } = require("@budibase/backend-core/constants")
-const { getAppId } = require("@budibase/backend-core/utils")
+const { getAppIdFromCtx } = require("@budibase/backend-core/utils")
 &nbsp;
 module.exports = function ({ requiresAppId } = <span class="branch-0 cbranch-no" title="branch not covered" >{})</span> {
   return async (ctx, next) =&gt; {
-    const appId = getAppId(ctx)
+    const appId = await getAppIdFromCtx(ctx)
     <span class="missing-if-branch" title="if path not taken" >I</span>if (requiresAppId &amp;&amp; !appId) {
 <span class="cstat-no" title="statement not covered" >      ctx.throw(</span>
         400,
@@ -127,7 +127,7 @@ module.exports = function ({ requiresAppId } = <span class="branch-0 cbranch-no"
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/resourceId.js.html

@@ -247,7 +247,7 @@ module.exports.bodySubResource = (main, sub) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/selfhost.js.html

@@ -94,7 +94,7 @@ module.exports = async (ctx, next) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/usageQuota.js.html

@@ -556,7 +556,7 @@ const POST_CREATE = {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/middleware/utils.js.html

@@ -85,7 +85,7 @@ exports.isWebhookEndpoint = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/threads/automation.js.html

@@ -487,7 +487,7 @@ module.exports = (input, callback) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/threads/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">80% </span>
+                <span class="strong">76.12% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>220/275</span>
+                <span class='fraction'>220/289</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">63.47% </span>
+                <span class="strong">61.34% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>73/115</span>
+                <span class='fraction'>73/119</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">92.5% </span>
+                <span class="strong">90.24% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>37/40</span>
+                <span class='fraction'>37/41</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">80.37% </span>
+                <span class="strong">76.67% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>217/270</span>
+                <span class='fraction'>217/283</span>
             </div>
         
             
@@ -55,7 +55,7 @@
             Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
         </p>
     </div>
-    <div class='status-line high'></div>
+    <div class='status-line medium'></div>
     <div class="pad1">
 <table class="coverage-summary">
 <thead>
@@ -104,17 +104,17 @@
 
 <tr>
 	<td class="file medium" data-value="query.js"><a href="query.js.html">query.js</a></td>
-	<td data-value="77.03" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 77%"></div><div class="cover-empty" style="width: 23%"></div></div>
+	<td data-value="69.79" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 69%"></div><div class="cover-empty" style="width: 31%"></div></div>
 	</td>
-	<td data-value="77.03" class="pct medium">77.03%</td>
-	<td data-value="135" class="abs medium">104/135</td>
-	<td data-value="67.18" class="pct medium">67.18%</td>
-	<td data-value="64" class="abs medium">43/64</td>
-	<td data-value="93.33" class="pct high">93.33%</td>
-	<td data-value="15" class="abs high">14/15</td>
-	<td data-value="77.09" class="pct medium">77.09%</td>
-	<td data-value="131" class="abs medium">101/131</td>
+	<td data-value="69.79" class="pct medium">69.79%</td>
+	<td data-value="149" class="abs medium">104/149</td>
+	<td data-value="63.23" class="pct medium">63.23%</td>
+	<td data-value="68" class="abs medium">43/68</td>
+	<td data-value="87.5" class="pct high">87.5%</td>
+	<td data-value="16" class="abs high">14/16</td>
+	<td data-value="70.13" class="pct medium">70.13%</td>
+	<td data-value="144" class="abs medium">101/144</td>
 	</tr>
 
 <tr>
@@ -140,7 +140,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/threads/index.js.html

@@ -262,7 +262,7 @@ module.exports.ThreadType = ThreadType
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/threads/query.js.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">77.03% </span>
+                <span class="strong">69.79% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>104/135</span>
+                <span class='fraction'>104/149</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">67.18% </span>
+                <span class="strong">63.23% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>43/64</span>
+                <span class='fraction'>43/68</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.33% </span>
+                <span class="strong">87.5% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>14/15</span>
+                <span class='fraction'>14/16</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">77.09% </span>
+                <span class="strong">70.13% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>101/131</span>
+                <span class='fraction'>101/144</span>
             </div>
         
             
@@ -332,7 +332,39 @@
 <a name='L273'></a><a href='#L273'>273</a>
 <a name='L274'></a><a href='#L274'>274</a>
 <a name='L275'></a><a href='#L275'>275</a>
-<a name='L276'></a><a href='#L276'>276</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2x</span>
+<a name='L276'></a><a href='#L276'>276</a>
+<a name='L277'></a><a href='#L277'>277</a>
+<a name='L278'></a><a href='#L278'>278</a>
+<a name='L279'></a><a href='#L279'>279</a>
+<a name='L280'></a><a href='#L280'>280</a>
+<a name='L281'></a><a href='#L281'>281</a>
+<a name='L282'></a><a href='#L282'>282</a>
+<a name='L283'></a><a href='#L283'>283</a>
+<a name='L284'></a><a href='#L284'>284</a>
+<a name='L285'></a><a href='#L285'>285</a>
+<a name='L286'></a><a href='#L286'>286</a>
+<a name='L287'></a><a href='#L287'>287</a>
+<a name='L288'></a><a href='#L288'>288</a>
+<a name='L289'></a><a href='#L289'>289</a>
+<a name='L290'></a><a href='#L290'>290</a>
+<a name='L291'></a><a href='#L291'>291</a>
+<a name='L292'></a><a href='#L292'>292</a>
+<a name='L293'></a><a href='#L293'>293</a>
+<a name='L294'></a><a href='#L294'>294</a>
+<a name='L295'></a><a href='#L295'>295</a>
+<a name='L296'></a><a href='#L296'>296</a>
+<a name='L297'></a><a href='#L297'>297</a>
+<a name='L298'></a><a href='#L298'>298</a>
+<a name='L299'></a><a href='#L299'>299</a>
+<a name='L300'></a><a href='#L300'>300</a>
+<a name='L301'></a><a href='#L301'>301</a>
+<a name='L302'></a><a href='#L302'>302</a>
+<a name='L303'></a><a href='#L303'>303</a>
+<a name='L304'></a><a href='#L304'>304</a>
+<a name='L305'></a><a href='#L305'>305</a>
+<a name='L306'></a><a href='#L306'>306</a>
+<a name='L307'></a><a href='#L307'>307</a>
+<a name='L308'></a><a href='#L308'>308</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
@@ -370,6 +402,8 @@
 <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-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -383,11 +417,41 @@
 <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>
+<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-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-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-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-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-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-neutral">&nbsp;</span>
@@ -642,10 +706,12 @@ class QueryRunner {
       return fields
     }
     const bindings = <span class="cstat-no" title="statement not covered" >findHBSBlocks(sql)</span>
-    let variables = <span class="cstat-no" title="statement not covered" >[]</span>
+    let variables = <span class="cstat-no" title="statement not covered" >[],</span>
+      arrays = <span class="cstat-no" title="statement not covered" >[]</span>
 <span class="cstat-no" title="statement not covered" >    for (let binding of bindings) {</span>
-      let variable = <span class="cstat-no" title="statement not covered" >integration.getBindingIdentifier()</span>
-<span class="cstat-no" title="statement not covered" >      variables.push(binding)</span>
+      // look for array/list operations in the SQL statement, which will need handled later
+      const listRegex = <span class="cstat-no" title="statement not covered" >new RegExp(`(in|IN|In|iN)( )+${binding}`)</span>
+      const listRegexMatch = <span class="cstat-no" title="statement not covered" >sql.match(listRegex)</span>
       // check if the variable was used as part of a string concat e.g. 'Hello {{binding}}'
       const charConstRegex = <span class="cstat-no" title="statement not covered" >new RegExp(`'[^']*${binding}[^']*'`)</span>
       const charConstMatch = <span class="cstat-no" title="statement not covered" >sql.match(charConstRegex)</span>
@@ -655,15 +721,45 @@ class QueryRunner {
 <span class="cstat-no" title="statement not covered" >        part2 = `'${part2.substring(0, part2.length - 1)}'`</span>
 <span class="cstat-no" title="statement not covered" >        sql = sql.replace(</span>
           charConstMatch[0],
-          integration.getStringConcat([part1, variable, part2])
+          integration.getStringConcat([
+            part1,
+            integration.getBindingIdentifier(),
+            part2,
+          ])
+        )
+      }
+      // generate SQL parameterised array
+      else <span class="cstat-no" title="statement not covered" >if (listRegexMatch) {</span>
+<span class="cstat-no" title="statement not covered" >        arrays.push(binding)</span>
+        // determine the length of the array
+        const value = <span class="cstat-no" title="statement not covered" >this.enrichQueryFields([binding], parameters)[0].split(</span>
+          ","
+        )
+        // build a string like ($1, $2, $3)
+<span class="cstat-no" title="statement not covered" >        sql = sql.replace(</span>
+          binding,
+          `(${Array.apply(null, Array(value.length))
+            .map(<span class="fstat-no" title="function not covered" >()</span> =&gt; <span class="cstat-no" title="statement not covered" >integration.getBindingIdentifier())</span>
+            .join(",")})`
         )
       } else {
-<span class="cstat-no" title="statement not covered" >        sql = sql.replace(binding, variable)</span>
+<span class="cstat-no" title="statement not covered" >        sql = sql.replace(binding, integration.getBindingIdentifier())</span>
       }
+<span class="cstat-no" title="statement not covered" >      variables.push(binding)</span>
     }
     // replicate the knex structure
 <span class="cstat-no" title="statement not covered" >    fields.sql = sql</span>
 <span class="cstat-no" title="statement not covered" >    fields.bindings = this.enrichQueryFields(variables, parameters)</span>
+    // check for arrays in the data
+    let updated = <span class="cstat-no" title="statement not covered" >[]</span>
+<span class="cstat-no" title="statement not covered" >    for (let i = <span class="cstat-no" title="statement not covered" >0;</span> i &lt; variables.length; i++) {</span>
+<span class="cstat-no" title="statement not covered" >      if (arrays.includes(variables[i])) {</span>
+<span class="cstat-no" title="statement not covered" >        updated = updated.concat(fields.bindings[i].split(","))</span>
+      } else {
+<span class="cstat-no" title="statement not covered" >        updated.push(fields.bindings[i])</span>
+      }
+    }
+<span class="cstat-no" title="statement not covered" >    fields.bindings = updated</span>
 <span class="cstat-no" title="statement not covered" >    return fields</span>
   }
 &nbsp;
@@ -889,7 +985,7 @@ module.exports = (input, callback) =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/threads/utils.js.html

@@ -298,7 +298,7 @@ exports.hasExtraData = response => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/bcrypt.js.html

@@ -109,7 +109,7 @@ const SALT_ROUNDS = <span class="cstat-no" title="statement not covered" >env.SA
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 25 2022 12:04:27 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>