@budibase/server 0.9.188 → 0.9.190-alpha.2

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

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">52.76% </span>
+                <span class="strong">52.6% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>315/597</span>
+                <span class='fraction'>313/595</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">33.88% </span>
+                <span class="strong">33.46% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>83/245</span>
+                <span class='fraction'>83/248</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">52.82% </span>
+                <span class="strong">52.65% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>309/585</span>
+                <span class='fraction'>307/583</span>
             </div>
         
             
@@ -74,17 +74,17 @@
 </thead>
 <tbody><tr>
 	<td class="file low" data-value="external.js"><a href="external.js.html">external.js</a></td>
-	<td data-value="14.14" class="pic low">
+	<td data-value="14.85" class="pic low">
 	<div class="chart"><div class="cover-fill" style="width: 14%"></div><div class="cover-empty" style="width: 86%"></div></div>
 	</td>
-	<td data-value="14.14" class="pct low">14.14%</td>
-	<td data-value="99" class="abs low">14/99</td>
+	<td data-value="14.85" class="pct low">14.85%</td>
+	<td data-value="101" class="abs low">15/101</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="40" class="abs low">0/40</td>
+	<td data-value="42" class="abs low">0/42</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="13" class="abs low">0/13</td>
-	<td data-value="14.43" class="pct low">14.43%</td>
-	<td data-value="97" class="abs low">14/97</td>
+	<td data-value="15.15" class="pct low">15.15%</td>
+	<td data-value="99" class="abs low">15/99</td>
 	</tr>
 
 <tr>
@@ -94,7 +94,7 @@
 	</td>
 	<td data-value="92.94" class="pct high">92.94%</td>
 	<td data-value="85" class="abs high">79/85</td>
-	<td data-value="94.12" class="pct high">94.12%</td>
+	<td data-value="94.11" class="pct high">94.11%</td>
 	<td data-value="34" class="abs high">32/34</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="11" class="abs high">11/11</td>
@@ -109,20 +109,20 @@
 	</td>
 	<td data-value="82.79" class="pct high">82.79%</td>
 	<td data-value="215" class="abs high">178/215</td>
-	<td data-value="60.94" class="pct medium">60.94%</td>
+	<td data-value="60.93" class="pct medium">60.93%</td>
 	<td data-value="64" class="abs medium">39/64</td>
 	<td data-value="92" class="pct high">92%</td>
 	<td data-value="25" class="abs high">23/25</td>
-	<td data-value="82.78" class="pct high">82.78%</td>
+	<td data-value="82.77" class="pct high">82.77%</td>
 	<td data-value="209" class="abs high">173/209</td>
 	</tr>
 
 <tr>
 	<td class="file low" data-value="internalSearch.js"><a href="internalSearch.js.html">internalSearch.js</a></td>
-	<td data-value="4.67" class="pic low">
+	<td data-value="4.66" class="pic low">
 	<div class="chart"><div class="cover-fill" style="width: 4%"></div><div class="cover-empty" style="width: 96%"></div></div>
 	</td>
-	<td data-value="4.67" class="pct low">4.67%</td>
+	<td data-value="4.66" class="pct low">4.66%</td>
 	<td data-value="150" class="abs low">7/150</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="85" class="abs low">0/85</td>
@@ -134,17 +134,17 @@
 
 <tr>
 	<td class="file medium" data-value="utils.js"><a href="utils.js.html">utils.js</a></td>
-	<td data-value="77.08" class="pic medium">
+	<td data-value="77.27" class="pic medium">
 	<div class="chart"><div class="cover-fill" style="width: 77%"></div><div class="cover-empty" style="width: 23%"></div></div>
 	</td>
-	<td data-value="77.08" class="pct medium">77.08%</td>
-	<td data-value="48" class="abs medium">37/48</td>
-	<td data-value="54.55" class="pct medium">54.55%</td>
-	<td data-value="22" class="abs medium">12/22</td>
-	<td data-value="66.67" class="pct medium">66.67%</td>
+	<td data-value="77.27" class="pct medium">77.27%</td>
+	<td data-value="44" class="abs medium">34/44</td>
+	<td data-value="52.17" class="pct medium">52.17%</td>
+	<td data-value="23" class="abs medium">12/23</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="76.6" class="pct medium">76.6%</td>
-	<td data-value="47" class="abs medium">36/47</td>
+	<td data-value="76.74" class="pct medium">76.74%</td>
+	<td data-value="43" class="abs medium">33/43</td>
 	</tr>
 
 </tbody>
@@ -155,7 +155,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 Thu Nov 18 2021 07:07:10 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 25 2021 16:48:05 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

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

@@ -30,7 +30,7 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">94.12% </span>
+                <span class="strong">94.11% </span>
                 <span class="quiet">Branches</span>
                 <span class='fraction'>32/34</span>
             </div>
@@ -481,7 +481,7 @@ exports.fetchEnrichedRow = async function (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 Thu Nov 18 2021 07:07:10 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 25 2021 16:48:05 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

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

@@ -30,7 +30,7 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">60.94% </span>
+                <span class="strong">60.93% </span>
                 <span class="quiet">Branches</span>
                 <span class='fraction'>39/64</span>
             </div>
@@ -44,7 +44,7 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">82.78% </span>
+                <span class="strong">82.77% </span>
                 <span class="quiet">Lines</span>
                 <span class='fraction'>173/209</span>
             </div>
@@ -1119,7 +1119,7 @@ exports.save = async function (ctx) {
   let inputs = ctx.request.body
   inputs.tableId = ctx.params.tableId
 &nbsp;
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (!inputs._rev &amp;&amp; !inputs._id) {
+  if (!inputs._rev &amp;&amp; !inputs._id) {
     inputs._id = generateRowID(inputs.tableId)
   }
 &nbsp;
@@ -1161,12 +1161,12 @@ exports.fetchView = async ctx =&gt; {
   const { calculation, group, field } = ctx.query
   const viewInfo = await getView(db, viewName)
   let response
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (env.SELF_HOSTED) {
+  if (env.SELF_HOSTED) {
     response = await db.query(`database/${viewName}`, {
       include_docs: !calculation,
       group: !!group,
     })
-  } else {
+  } else <span class="missing-if-branch" title="else path not taken" >E</span>{
     const tableId = <span class="cstat-no" title="statement not covered" >viewInfo.meta.tableId</span>
     const data = <span class="cstat-no" title="statement not covered" >await getRawTableData(ctx, db, tableId)</span>
 <span class="cstat-no" title="statement not covered" >    response = await inMemoryViews.runView(viewInfo, calculation, group, data)</span>
@@ -1319,7 +1319,7 @@ exports.search = async ctx =&gt; {
   }
 &nbsp;
   // Enrich search results with relationships
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (response.rows &amp;&amp; response.rows.length) {
+  if (response.rows &amp;&amp; response.rows.length) {
     // enrich with global users if from users table
     <span class="missing-if-branch" title="if path not taken" >I</span>if (tableId === InternalTables.USER_METADATA) {
 <span class="cstat-no" title="statement not covered" >      response.rows = await getGlobalUsersFromMetadata(appId, response.rows)</span>
@@ -1367,10 +1367,10 @@ exports.fetchEnrichedRow = async ctx =&gt; {
     tables = {}
   for (let row of response) {
     const linkedTableId = row.tableId
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (groups[linkedTableId] == null) {
+    if (groups[linkedTableId] == null) {
       groups[linkedTableId] = [row]
       tables[linkedTableId] = await db.get(linkedTableId)
-    } else {
+    } else <span class="missing-if-branch" title="else path not taken" >E</span>{
 <span class="cstat-no" title="statement not covered" >      groups[linkedTableId].push(row)</span>
     }
   }
@@ -1405,7 +1405,7 @@ exports.fetchEnrichedRow = async ctx =&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 Thu Nov 18 2021 07:07:10 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 25 2021 16:48:05 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

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

@@ -23,7 +23,7 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">4.67% </span>
+                <span class="strong">4.66% </span>
                 <span class="quiet">Statements</span>
                 <span class='fraction'>7/150</span>
             </div>
@@ -1228,7 +1228,7 @@ exports.fullSearch = <span class="fstat-no" title="function not covered" >as</sp
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 18 2021 07:07:10 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 25 2021 16:48:05 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

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

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">77.08% </span>
+                <span class="strong">77.27% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>37/48</span>
+                <span class='fraction'>34/44</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">54.55% </span>
+                <span class="strong">52.17% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>12/22</span>
+                <span class='fraction'>12/23</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">66.67% </span>
+                <span class="strong">66.66% </span>
                 <span class="quiet">Functions</span>
                 <span class='fraction'>4/6</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">76.6% </span>
+                <span class="strong">76.74% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>36/47</span>
+                <span class='fraction'>33/43</span>
             </div>
         
             
@@ -142,10 +142,7 @@
 <a name='L83'></a><a href='#L83'>83</a>
 <a name='L84'></a><a href='#L84'>84</a>
 <a name='L85'></a><a href='#L85'>85</a>
-<a name='L86'></a><a href='#L86'>86</a>
-<a name='L87'></a><a href='#L87'>87</a>
-<a name='L88'></a><a href='#L88'>88</a>
-<a name='L89'></a><a href='#L89'>89</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">34x</span>
+<a name='L86'></a><a href='#L86'>86</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">34x</span>
@@ -170,13 +167,6 @@
 <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-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">34x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -216,6 +206,10 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">206x</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-no">&nbsp;</span>
@@ -239,8 +233,8 @@ const CouchDB = require("../../../db")
 const { InternalTables } = require("../../../db/utils")
 const userController = require("../user")
 const { FieldTypes } = require("../../../constants")
-const { integrations } = require("../../../integrations")
 const { processStringSync } = require("@budibase/string-templates")
+const { makeExternalQuery } = require("../../../integrations/base/utils")
 &nbsp;
 validateJs.extend(validateJs.validators.datetime, {
   parse: function (value) {
@@ -252,18 +246,11 @@ validateJs.extend(validateJs.validators.datetime, {
   },
 })
 &nbsp;
-exports.makeExternalQuery = async (appId, json) =&gt; {
+exports.getDatasourceAndQuery = async (appId, json) =&gt; {
   const datasourceId = json.endpoint.datasourceId
   const db = new CouchDB(appId)
   const datasource = await db.get(datasourceId)
-  const Integration = integrations[datasource.source]
-  // query is the opinionated function
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (Integration.prototype.query) {
-    const integration = new Integration(datasource.config)
-    return integration.query(json)
-  } else {
-<span class="cstat-no" title="statement not covered" >    throw "Datasource does not support query."</span>
-  }
+  return makeExternalQuery(datasource, json)
 }
 &nbsp;
 exports.findRow = async (ctx, db, tableId, rowId) =&gt; {
@@ -303,7 +290,11 @@ exports.validate = async ({ appId, tableId, row, table }) =&gt; {
     let res
 &nbsp;
     // Validate.js doesn't seem to handle array
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (table.schema[fieldName].type === FieldTypes.ARRAY) {
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (
+      table.schema[fieldName].type === FieldTypes.ARRAY &amp;&amp;
+<span class="branch-1 cbranch-no" title="branch not covered" >      row[fieldName] </span>&amp;&amp;
+<span class="branch-2 cbranch-no" title="branch not covered" >      row[fieldName].length</span>
+    ) {
 <span class="cstat-no" title="statement not covered" >      row[fieldName].map(<span class="fstat-no" title="function not covered" >va</span>l =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >        if (!constraints.inclusion.includes(val)) {</span>
 <span class="cstat-no" title="statement not covered" >          errors[fieldName] = "Field not in list"</span>
@@ -328,7 +319,7 @@ exports.validate = async ({ appId, tableId, row, table }) =&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 Thu Nov 18 2021 07:07:10 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 25 2021 16:48:05 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/screen.js.html

@@ -180,7 +180,7 @@ exports.save = async ctx => {
   const db = new CouchDB(appId)
   let screen = ctx.request.body
  
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (!screen._id) {
+  if (!screen._id) {
     screen._id = generateScreenID()
   }
   const response = await db.put(screen)
@@ -208,7 +208,7 @@ exports.destroy = async ctx =&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 Thu Nov 18 2021 07:07:10 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 25 2021 16:48:05 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/script.js.html

@@ -23,7 +23,7 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">42.86% </span>
+                <span class="strong">42.85% </span>
                 <span class="quiet">Statements</span>
                 <span class='fraction'>3/7</span>
             </div>
@@ -44,7 +44,7 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">42.86% </span>
+                <span class="strong">42.85% </span>
                 <span class="quiet">Lines</span>
                 <span class='fraction'>3/7</span>
             </div>
@@ -97,7 +97,7 @@ exports.save = <span class="fstat-no" title="function not covered" >as</span>ync
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 18 2021 07:07:10 GMT+0000 (Coordinated Universal Time)
+                at Thu Nov 25 2021 16:48:05 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>