@budibase/server 1.0.105 → 1.0.108

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

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">69.79% </span>
+                <span class="strong">68.62% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>104/149</span>
+                <span class='fraction'>105/153</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">63.23% </span>
+                <span class="strong">59.72% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>43/68</span>
+                <span class='fraction'>43/72</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">87.5% </span>
+                <span class="strong">82.35% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>14/16</span>
+                <span class='fraction'>14/17</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">70.13% </span>
+                <span class="strong">68.91% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>101/144</span>
+                <span class='fraction'>102/148</span>
             </div>
         
             
@@ -364,7 +364,16 @@
 <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>
+<a name='L308'></a><a href='#L308'>308</a>
+<a name='L309'></a><a href='#L309'>309</a>
+<a name='L310'></a><a href='#L310'>310</a>
+<a name='L311'></a><a href='#L311'>311</a>
+<a name='L312'></a><a href='#L312'>312</a>
+<a name='L313'></a><a href='#L313'>313</a>
+<a name='L314'></a><a href='#L314'>314</a>
+<a name='L315'></a><a href='#L315'>315</a>
+<a name='L316'></a><a href='#L316'>316</a>
+<a name='L317'></a><a href='#L317'>317</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>
@@ -375,6 +384,8 @@
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</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">15x</span>
@@ -404,10 +415,15 @@
 <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-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-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>
@@ -430,11 +446,13 @@
 <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-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>
@@ -682,6 +700,8 @@ const {
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 const { isSQL } = require("../integrations/utils")
 &nbsp;
+const CONST_CHAR_REGEX = new RegExp("'[^']*'", "g")
+&nbsp;
 class QueryRunner {
   constructor(input, flags = { noRecursiveQuery: false }) {
     this.datasource = input.datasource
@@ -710,17 +730,22 @@ class QueryRunner {
       arrays = <span class="cstat-no" title="statement not covered" >[]</span>
 <span class="cstat-no" title="statement not covered" >    for (let binding of bindings) {</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>
+      const listRegexMatch = <span class="cstat-no" title="statement not covered" >sql.match(</span>
+        new RegExp(`(in|IN|In|iN)( )+[(]?${binding}[)]?`)
+      )
       // 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>
-<span class="cstat-no" title="statement not covered" >      if (charConstMatch) {</span>
-        let [part1, part2] = <span class="cstat-no" title="statement not covered" >charConstMatch[0].split(binding)</span>
+      // start by finding all the instances of const character strings
+      const charConstMatch = <span class="cstat-no" title="statement not covered" >sql.match(CONST_CHAR_REGEX) || []</span>
+      // now look within them to see if a binding is used
+      const charConstBindingMatch = <span class="cstat-no" title="statement not covered" >charConstMatch.find(<span class="fstat-no" title="function not covered" >st</span>ring =&gt;</span>
+<span class="cstat-no" title="statement not covered" >        string.match(new RegExp(`'[^']*${binding}[^']*'`))</span>
+      )
+<span class="cstat-no" title="statement not covered" >      if (charConstBindingMatch) {</span>
+        let [part1, part2] = <span class="cstat-no" title="statement not covered" >charConstBindingMatch.split(binding)</span>
 <span class="cstat-no" title="statement not covered" >        part1 = `'${part1.substring(1)}'`</span>
 <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],
+          charConstBindingMatch,
           integration.getStringConcat([
             part1,
             integration.getBindingIdentifier(),
@@ -736,12 +761,14 @@ class QueryRunner {
           ","
         )
         // 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(",")})`
-        )
+        let replacement = <span class="cstat-no" title="statement not covered" >`${Array.apply(null, Array(value.length))</span>
+          .map(<span class="fstat-no" title="function not covered" >()</span> =&gt; <span class="cstat-no" title="statement not covered" >integration.getBindingIdentifier())</span>
+          .join(",")}`
+        // check if parentheses are needed
+<span class="cstat-no" title="statement not covered" >        if (!listRegexMatch[0].includes(`(${binding})`)) {</span>
+<span class="cstat-no" title="statement not covered" >          replacement = `(${replacement})`</span>
+        }
+<span class="cstat-no" title="statement not covered" >        sql = sql.replace(binding, replacement)</span>
       } else {
 <span class="cstat-no" title="statement not covered" >        sql = sql.replace(binding, integration.getBindingIdentifier())</span>
       }
@@ -985,7 +1012,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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -94,7 +94,7 @@ module.exports.budibaseTempDir = budibaseTempDir
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -130,7 +130,7 @@ exports.resolve = <span class="fstat-no" title="function not covered" >fu</span>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -496,7 +496,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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -385,7 +385,7 @@ exports.getGlobalUsersFromMetadata = async users => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -245,7 +245,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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -547,7 +547,7 @@ exports.convertBookmark = bookmark => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html

@@ -367,7 +367,7 @@ module.exports = InMemoryQueue
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/queue/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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/routing/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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/routing/index.js.html

@@ -139,7 +139,7 @@ exports.createRoutingView = createRoutingView
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/index.html

@@ -110,7 +110,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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/index.js.html

@@ -1081,7 +1081,7 @@ exports.cleanupAttachments = async (table, { row, rows, oldRow, oldTable }) =&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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -181,7 +181,7 @@ exports.processFormulas = (
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -136,7 +136,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -274,7 +274,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -85,7 +85,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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -125,7 +125,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 Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/usageQuota/index.js.html

@@ -343,7 +343,7 @@ exports.update = async (property, usage, opts = { dryRun: false }) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -289,7 +289,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -118,7 +118,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -136,7 +136,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -481,7 +481,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Apr 05 2022 11:15:58 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 06 2022 10:32:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>