@budibase/server 0.9.185-alpha.1 → 0.9.185-alpha.13

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

@@ -30,7 +30,7 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">30.77% </span>
+                <span class="strong">30.76% </span>
                 <span class="quiet">Branches</span>
                 <span class='fraction'>4/13</span>
             </div>
@@ -181,7 +181,7 @@ exports.endUserPing = <span class="fstat-no" title="function not covered" >as</s
             <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 Nov 15 2021 14:40:16 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -205,7 +205,7 @@ exports.update = async function (ctx) {
  
   try {
     const mainDoc = await getBuilderMainDoc()
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (mainDoc.apiKeys == null) {
+    if (mainDoc.apiKeys == null) {
       mainDoc.apiKeys = {}
     }
     mainDoc.apiKeys[key] = value
@@ -226,7 +226,7 @@ exports.update = 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 Mon Nov 15 2021 14:40:16 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.09% </span>
+                <span class="strong">78.49% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>139/178</span>
+                <span class='fraction'>146/186</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">57.35% </span>
+                <span class="strong">56.94% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>39/68</span>
+                <span class='fraction'>41/72</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.98% </span>
+                <span class="strong">79.34% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>139/176</span>
+                <span class='fraction'>146/184</span>
             </div>
         
             
@@ -464,7 +464,17 @@
 <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></td><td class="line-coverage quiet"><span class="cline-any cline-yes">33x</span>
+<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></td><td class="line-coverage quiet"><span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -511,6 +521,8 @@
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -722,6 +734,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">178x</span>
 <span class="cline-any cline-yes">178x</span>
+<span class="cline-any cline-yes">178x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">33x</span>
@@ -783,8 +796,12 @@
 <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">11x</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">11x</span>
+<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-yes">11x</span>
@@ -855,6 +872,9 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">178x</span>
@@ -918,6 +938,8 @@ const {
 } = require("../../utilities/fileSystem/clientLibrary")
 const { getTenantId, isMultiTenant } = require("@budibase/auth/tenancy")
 const { syncGlobalUsers } = require("./user")
+const { app: appCache } = require("@budibase/auth/cache")
+const { cleanupAutomations } = require("../../automations/utils")
 &nbsp;
 const URL_REGEX_SLASH = /\/|\\/g
 &nbsp;
@@ -1019,10 +1041,10 @@ exports.fetch = async ctx =&gt; {
   const apps = await getAllApps(CouchDB, { dev, all })
 &nbsp;
   // get the locks for all the dev apps
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (dev || <span class="branch-1 cbranch-no" title="branch not covered" >all)</span> {
+  if (dev || <span class="branch-1 cbranch-no" title="branch not covered" >all)</span> {
     const locks = await getAllLocks()
     for (let app of apps) {
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (app.status !== "development") {
+      if (app.status !== "development") {
         continue
       }
       const lock = <span class="cstat-no" title="statement not covered" >locks.find(<span class="fstat-no" title="function not covered" >lo</span>ck =&gt; <span class="cstat-no" title="statement not covered" >lock.appId === app.appId)</span></span>
@@ -1118,7 +1140,7 @@ exports.create = async ctx =&gt; {
 &nbsp;
   // Only create the default home screens and layout if we aren't importing
   // an app
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (useTemplate !== "true") {
+  if (useTemplate !== "true") {
     await createEmptyAppPackage(ctx, newApplication)
   }
 &nbsp;
@@ -1127,6 +1149,7 @@ exports.create = async ctx =&gt; {
     await createApp(appId)
   }
 &nbsp;
+  await appCache.invalidateAppMetadata(appId, newApplication)
   ctx.status = 200
   ctx.body = newApplication
 }
@@ -1190,8 +1213,12 @@ exports.delete = async ctx =&gt; {
   if (!env.isTest() &amp;&amp; !ctx.query.unpublish) {
     await deleteApp(ctx.params.appId)
   }
+  <span class="missing-if-branch" title="if path not taken" >I</span>if (ctx.query &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >ctx.query.unpublish)</span> {
+<span class="cstat-no" title="statement not covered" >    await cleanupAutomations(ctx.params.appId)</span>
+  }
   // make sure the app/role doesn't stick around after the app has been deleted
   await removeAppFromUserRoles(ctx, ctx.params.appId)
+  await appCache.invalidateAppMetadata(ctx.params.appId)
 &nbsp;
   ctx.status = 200
   ctx.body = result
@@ -1252,7 +1279,7 @@ const updateAppPackage = async (ctx, appPackage, appId) =&gt; {
   const application = await db.get(DocumentTypes.APP_METADATA)
 &nbsp;
   const newAppPackage = { ...application, ...appPackage, url }
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (appPackage._rev !== application._rev) {
+  if (appPackage._rev !== application._rev) {
     newAppPackage._rev = application._rev
   }
 &nbsp;
@@ -1260,7 +1287,10 @@ const updateAppPackage = async (ctx, appPackage, appId) =&gt; {
   // Redis, shouldn't ever store it
   delete newAppPackage.lockedBy
 &nbsp;
-  return await db.put(newAppPackage)
+  const response = await db.put(newAppPackage)
+  // remove any cached metadata, so that it will be updated
+  await appCache.invalidateAppMetadata(appId)
+  return response
 }
 &nbsp;
 const createEmptyAppPackage = async (ctx, app) =&gt; {
@@ -1285,7 +1315,7 @@ const createEmptyAppPackage = async (ctx, app) =&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 Nov 15 2021 14:40:16 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -23,7 +23,7 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">85.19% </span>
+                <span class="strong">85.18% </span>
                 <span class="quiet">Statements</span>
                 <span class='fraction'>23/27</span>
             </div>
@@ -44,7 +44,7 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">85.19% </span>
+                <span class="strong">85.18% </span>
                 <span class="quiet">Lines</span>
                 <span class='fraction'>23/27</span>
             </div>
@@ -186,7 +186,7 @@ exports.fetchSelf = async ctx =&gt; {
   // this shouldn't be returned by the app self
   delete user.roles
 &nbsp;
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (appId) {
+  if (appId) {
     const db = new CouchDB(appId)
     // remove the full roles structure
     delete user.roles
@@ -205,7 +205,7 @@ exports.fetchSelf = async ctx =&gt; {
 <span class="cstat-no" title="statement not covered" >        response = {}</span>
       }
       // user has a role of some sort, return them
-      else <span class="missing-if-branch" title="else path not taken" >E</span>if (err.status === 404) {
+      else if (err.status === 404) {
         const metadata = {
           ...user,
           _id: userId,
@@ -213,12 +213,12 @@ exports.fetchSelf = async ctx =&gt; {
         const dbResp = await db.put(metadata)
         user._rev = dbResp.rev
         response = user
-      } else {
+      } else <span class="missing-if-branch" title="else path not taken" >E</span>{
 <span class="cstat-no" title="statement not covered" >        response = user</span>
       }
       ctx.body = response
     }
-  } else {
+  } else <span class="missing-if-branch" title="else path not taken" >E</span>{
 <span class="cstat-no" title="statement not covered" >    ctx.body = user</span>
   }
 }
@@ -229,7 +229,7 @@ exports.fetchSelf = 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 Mon Nov 15 2021 14:40:16 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -30,14 +30,14 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">71.88% </span>
+                <span class="strong">71.87% </span>
                 <span class="quiet">Branches</span>
                 <span class='fraction'>23/32</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">92.86% </span>
+                <span class="strong">92.85% </span>
                 <span class="quiet">Functions</span>
                 <span class='fraction'>13/14</span>
             </div>
@@ -736,7 +736,7 @@ exports.test = 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 Mon Nov 15 2021 14:40:16 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -91,7 +91,7 @@ exports.exportAppDump = 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 Mon Nov 15 2021 14:40:16 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -397,7 +397,7 @@ exports.importApps = <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 Mon Nov 15 2021 14:40:16 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -114,11 +114,11 @@
 <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">45x</span>
+<span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">44x</span>
-<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">45x</span>
+<span class="cline-any cline-yes">45x</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>
@@ -169,7 +169,7 @@ exports.fetchAppComponentDefinitions = 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 Mon Nov 15 2021 14:40:16 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">50% </span>
+                <span class="strong">44.44% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>48/96</span>
+                <span class='fraction'>48/108</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">25% </span>
+                <span class="strong">19.44% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>7/28</span>
+                <span class='fraction'>7/36</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">57.14% </span>
+                <span class="strong">50% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>8/14</span>
+                <span class='fraction'>8/16</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">48.94% </span>
+                <span class="strong">43.92% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>46/94</span>
+                <span class='fraction'>47/107</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 medium'></div>
+    <div class='status-line low'></div>
     <pre><table class="coverage">
 <tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
 <a name='L2'></a><a href='#L2'>2</a>
@@ -236,7 +236,43 @@
 <a name='L177'></a><a href='#L177'>177</a>
 <a name='L178'></a><a href='#L178'>178</a>
 <a name='L179'></a><a href='#L179'>179</a>
-<a name='L180'></a><a href='#L180'>180</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">33x</span>
+<a name='L180'></a><a href='#L180'>180</a>
+<a name='L181'></a><a href='#L181'>181</a>
+<a name='L182'></a><a href='#L182'>182</a>
+<a name='L183'></a><a href='#L183'>183</a>
+<a name='L184'></a><a href='#L184'>184</a>
+<a name='L185'></a><a href='#L185'>185</a>
+<a name='L186'></a><a href='#L186'>186</a>
+<a name='L187'></a><a href='#L187'>187</a>
+<a name='L188'></a><a href='#L188'>188</a>
+<a name='L189'></a><a href='#L189'>189</a>
+<a name='L190'></a><a href='#L190'>190</a>
+<a name='L191'></a><a href='#L191'>191</a>
+<a name='L192'></a><a href='#L192'>192</a>
+<a name='L193'></a><a href='#L193'>193</a>
+<a name='L194'></a><a href='#L194'>194</a>
+<a name='L195'></a><a href='#L195'>195</a>
+<a name='L196'></a><a href='#L196'>196</a>
+<a name='L197'></a><a href='#L197'>197</a>
+<a name='L198'></a><a href='#L198'>198</a>
+<a name='L199'></a><a href='#L199'>199</a>
+<a name='L200'></a><a href='#L200'>200</a>
+<a name='L201'></a><a href='#L201'>201</a>
+<a name='L202'></a><a href='#L202'>202</a>
+<a name='L203'></a><a href='#L203'>203</a>
+<a name='L204'></a><a href='#L204'>204</a>
+<a name='L205'></a><a href='#L205'>205</a>
+<a name='L206'></a><a href='#L206'>206</a>
+<a name='L207'></a><a href='#L207'>207</a>
+<a name='L208'></a><a href='#L208'>208</a>
+<a name='L209'></a><a href='#L209'>209</a>
+<a name='L210'></a><a href='#L210'>210</a>
+<a name='L211'></a><a href='#L211'>211</a>
+<a name='L212'></a><a href='#L212'>212</a>
+<a name='L213'></a><a href='#L213'>213</a>
+<a name='L214'></a><a href='#L214'>214</a>
+<a name='L215'></a><a href='#L215'>215</a>
+<a name='L216'></a><a href='#L216'>216</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">33x</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>
@@ -358,9 +394,17 @@
 <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-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-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-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
@@ -382,6 +426,23 @@
 <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>
+<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-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-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -413,6 +474,17 @@
 <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-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>
 <span class="cline-any cline-no">&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 CouchDB = require("../../db")
@@ -424,7 +496,7 @@ const {
   BudibaseInternalDB,
   getTableParams,
 } = require("../../db/utils")
-const { BuildSchemaErrors } = require("../../constants")
+const { BuildSchemaErrors, InvalidColumns } = require("../../constants")
 const { integrations } = require("../../integrations")
 const { getDatasourceAndQuery } = require("./row/utils")
 &nbsp;
@@ -518,7 +590,7 @@ exports.save = async function (ctx) {
   datasource._rev = dbResp.rev
 &nbsp;
   // Drain connection pools when configuration is changed
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (datasource.source) {
+  if (datasource.source) {
     const source = integrations[datasource.source]
     <span class="missing-if-branch" title="if path not taken" >I</span>if (source &amp;&amp; source.pool) {
 <span class="cstat-no" title="statement not covered" >      await source.pool.end()</span>
@@ -536,8 +608,16 @@ exports.destroy = async function (ctx) {
   const db = new CouchDB(ctx.appId)
 &nbsp;
   // Delete all queries for the datasource
-  const rows = await db.allDocs(getQueryParams(ctx.params.datasourceId, null))
-  await db.bulkDocs(rows.rows.map(row =&gt; ({ ...row.doc, _deleted: true })))
+  const queries = await db.allDocs(
+    getQueryParams(ctx.params.datasourceId, null)
+  )
+  await db.bulkDocs(
+    queries.rows.map(row =&gt; ({
+      _id: row.id,
+      _rev: row.value.rev,
+      _deleted: true,
+    }))
+  )
 &nbsp;
   // delete the datasource
   await db.remove(ctx.params.datasourceId, ctx.params.revId)
@@ -561,6 +641,23 @@ exports.query = async function (ctx) {
   }
 }
 &nbsp;
+function <span class="fstat-no" title="function not covered" >getErrorTables(</span>errors, errorType) {
+<span class="cstat-no" title="statement not covered" >  return Object.entries(errors)</span>
+    .filter(<span class="fstat-no" title="function not covered" >en</span>try =&gt; <span class="cstat-no" title="statement not covered" >entry[1] === errorType)</span>
+    .map(<span class="fstat-no" title="function not covered" >([</span>name]) =&gt; <span class="cstat-no" title="statement not covered" >name)</span>
+}
+&nbsp;
+function <span class="fstat-no" title="function not covered" >updateError(</span>error, newError, tables) {
+<span class="cstat-no" title="statement not covered" >  if (!error) {</span>
+<span class="cstat-no" title="statement not covered" >    error = ""</span>
+  }
+<span class="cstat-no" title="statement not covered" >  if (error.length &gt; 0) {</span>
+<span class="cstat-no" title="statement not covered" >    error += "\n"</span>
+  }
+<span class="cstat-no" title="statement not covered" >  error += `${newError} ${tables.join(", ")}`</span>
+<span class="cstat-no" title="statement not covered" >  return error</span>
+}
+&nbsp;
 const buildSchemaHelper = <span class="fstat-no" title="function not covered" >as</span>ync datasource =&gt; {
   const Connector = <span class="cstat-no" title="statement not covered" >integrations[datasource.source]</span>
 &nbsp;
@@ -585,12 +682,23 @@ const buildSchemaHelper = <span class="fstat-no" title="function not covered" >a
   const errors = <span class="cstat-no" title="statement not covered" >connector.schemaErrors</span>
   let error = <span class="cstat-no" title="statement not covered" >null</span>
 <span class="cstat-no" title="statement not covered" >  if (errors &amp;&amp; Object.keys(errors).length &gt; 0) {</span>
-    const noKeyTables = <span class="cstat-no" title="statement not covered" >Object.entries(errors)</span>
-      .filter(<span class="fstat-no" title="function not covered" >en</span>try =&gt; <span class="cstat-no" title="statement not covered" >entry[1] === BuildSchemaErrors.NO_KEY)</span>
-      .map(<span class="fstat-no" title="function not covered" >([</span>name]) =&gt; <span class="cstat-no" title="statement not covered" >name)</span>
-<span class="cstat-no" title="statement not covered" >    error = `No primary key constraint found for the following: ${noKeyTables.join(</span>
-      ", "
-    )}`
+    const noKey = <span class="cstat-no" title="statement not covered" >getErrorTables(errors, BuildSchemaErrors.NO_KEY)</span>
+    const invalidCol = <span class="cstat-no" title="statement not covered" >getErrorTables(errors, BuildSchemaErrors.INVALID_COLUMN)</span>
+<span class="cstat-no" title="statement not covered" >    if (noKey.length) {</span>
+<span class="cstat-no" title="statement not covered" >      error = updateError(</span>
+        error,
+        "No primary key constraint found for the following:",
+        noKey
+      )
+    }
+<span class="cstat-no" title="statement not covered" >    if (invalidCol.length) {</span>
+      const invalidCols = <span class="cstat-no" title="statement not covered" >Object.values(InvalidColumns).join(", ")</span>
+<span class="cstat-no" title="statement not covered" >      error = updateError(</span>
+        error,
+        `Cannot use columns ${invalidCols} found in following:`,
+        invalidCol
+      )
+    }
   }
 <span class="cstat-no" title="statement not covered" >  return { tables: connector.tables, error }</span>
 }
@@ -601,7 +709,7 @@ const buildSchemaHelper = <span class="fstat-no" title="function not covered" >a
             <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 Nov 15 2021 14:40:16 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>