@budibase/server 1.0.49-alpha.2 → 1.0.49-alpha.6

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

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">70.75% </span>
+                <span class="strong">70.7% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>791/1118</span>
+                <span class='fraction'>787/1113</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">46.04% </span>
+                <span class="strong">46.02% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>169/367</span>
+                <span class='fraction'>168/365</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">70.84% </span>
+                <span class="strong">70.8% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>780/1101</span>
+                <span class='fraction'>776/1096</span>
             </div>
         
             
@@ -104,47 +104,47 @@
 
 <tr>
 	<td class="file medium" data-value="application.js"><a href="application.js.html">application.js</a></td>
-	<td data-value="79.51" class="pic medium">
+	<td data-value="79.71" class="pic medium">
 	<div class="chart"><div class="cover-fill" style="width: 79%"></div><div class="cover-empty" style="width: 21%"></div></div>
 	</td>
-	<td data-value="79.51" class="pct medium">79.51%</td>
-	<td data-value="205" class="abs medium">163/205</td>
+	<td data-value="79.71" class="pct medium">79.71%</td>
+	<td data-value="207" class="abs medium">165/207</td>
 	<td data-value="55.12" class="pct medium">55.12%</td>
 	<td data-value="78" class="abs medium">43/78</td>
 	<td data-value="88.46" class="pct high">88.46%</td>
 	<td data-value="26" class="abs high">23/26</td>
-	<td data-value="79.89" class="pct medium">79.89%</td>
-	<td data-value="199" class="abs medium">159/199</td>
+	<td data-value="80.09" class="pct high">80.09%</td>
+	<td data-value="201" class="abs high">161/201</td>
 	</tr>
 
 <tr>
 	<td class="file high" data-value="auth.js"><a href="auth.js.html">auth.js</a></td>
-	<td data-value="82.75" class="pic high">
+	<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="82.75" class="pct high">82.75%</td>
-	<td data-value="29" class="abs high">24/29</td>
+	<td data-value="82.14" class="pct high">82.14%</td>
+	<td data-value="28" class="abs high">23/28</td>
 	<td data-value="50" class="pct medium">50%</td>
 	<td data-value="8" class="abs medium">4/8</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="1" class="abs high">1/1</td>
-	<td data-value="82.75" class="pct high">82.75%</td>
-	<td data-value="29" class="abs high">24/29</td>
+	<td data-value="82.14" class="pct high">82.14%</td>
+	<td data-value="28" class="abs high">23/28</td>
 	</tr>
 
 <tr>
 	<td class="file high" data-value="automation.js"><a href="automation.js.html">automation.js</a></td>
-	<td data-value="89.69" class="pic high">
-	<div class="chart"><div class="cover-fill" style="width: 89%"></div><div class="cover-empty" style="width: 11%"></div></div>
+	<td data-value="90.52" class="pic high">
+	<div class="chart"><div class="cover-fill" style="width: 90%"></div><div class="cover-empty" style="width: 10%"></div></div>
 	</td>
-	<td data-value="89.69" class="pct high">89.69%</td>
-	<td data-value="97" class="abs high">87/97</td>
+	<td data-value="90.52" class="pct high">90.52%</td>
+	<td data-value="95" class="abs high">86/95</td>
 	<td data-value="71.87" class="pct medium">71.87%</td>
 	<td data-value="32" class="abs medium">23/32</td>
 	<td data-value="92.85" class="pct high">92.85%</td>
 	<td data-value="14" class="abs high">13/14</td>
-	<td data-value="89.58" class="pct high">89.58%</td>
-	<td data-value="96" class="abs high">86/96</td>
+	<td data-value="90.42" class="pct high">90.42%</td>
+	<td data-value="94" class="abs high">85/94</td>
 	</tr>
 
 <tr>
@@ -164,17 +164,17 @@
 
 <tr>
 	<td class="file low" data-value="cloud.js"><a href="cloud.js.html">cloud.js</a></td>
-	<td data-value="19.64" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 19%"></div><div class="cover-empty" style="width: 81%"></div></div>
+	<td data-value="18.18" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 18%"></div><div class="cover-empty" style="width: 82%"></div></div>
 	</td>
-	<td data-value="19.64" class="pct low">19.64%</td>
-	<td data-value="56" class="abs low">11/56</td>
+	<td data-value="18.18" class="pct low">18.18%</td>
+	<td data-value="55" class="abs low">10/55</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="23" class="abs low">0/23</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="8" class="abs low">0/8</td>
-	<td data-value="20" class="pct low">20%</td>
-	<td data-value="55" class="abs low">11/55</td>
+	<td data-value="18.51" class="pct low">18.51%</td>
+	<td data-value="54" class="abs low">10/54</td>
 	</tr>
 
 <tr>
@@ -183,28 +183,28 @@
 	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
 	</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="18" class="abs high">18/18</td>
-	<td data-value="75" class="pct medium">75%</td>
-	<td data-value="4" class="abs medium">3/4</td>
+	<td data-value="17" class="abs high">17/17</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="2" class="abs high">2/2</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="2" class="abs high">2/2</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="18" class="abs high">18/18</td>
+	<td data-value="17" class="abs high">17/17</td>
 	</tr>
 
 <tr>
 	<td class="file medium" data-value="datasource.js"><a href="datasource.js.html">datasource.js</a></td>
-	<td data-value="60" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 60%"></div><div class="cover-empty" style="width: 40%"></div></div>
+	<td data-value="59.68" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 59%"></div><div class="cover-empty" style="width: 41%"></div></div>
 	</td>
-	<td data-value="60" class="pct medium">60%</td>
-	<td data-value="130" class="abs medium">78/130</td>
+	<td data-value="59.68" class="pct medium">59.68%</td>
+	<td data-value="129" class="abs medium">77/129</td>
 	<td data-value="37.73" class="pct low">37.73%</td>
 	<td data-value="53" class="abs low">20/53</td>
 	<td data-value="57.89" class="pct medium">57.89%</td>
 	<td data-value="19" class="abs medium">11/19</td>
-	<td data-value="59.68" class="pct medium">59.68%</td>
-	<td data-value="129" class="abs medium">77/129</td>
+	<td data-value="59.37" class="pct medium">59.37%</td>
+	<td data-value="128" class="abs medium">76/128</td>
 	</tr>
 
 <tr>
@@ -333,13 +333,13 @@
 	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
 	</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="23" class="abs high">23/23</td>
+	<td data-value="21" class="abs high">21/21</td>
 	<td data-value="50" class="pct medium">50%</td>
 	<td data-value="2" class="abs medium">1/2</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="4" class="abs high">4/4</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="23" class="abs high">23/23</td>
+	<td data-value="21" class="abs high">21/21</td>
 	</tr>
 
 <tr>
@@ -374,32 +374,32 @@
 
 <tr>
 	<td class="file low" data-value="user.js"><a href="user.js.html">user.js</a></td>
-	<td data-value="32.23" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 32%"></div><div class="cover-empty" style="width: 68%"></div></div>
+	<td data-value="31.66" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 31%"></div><div class="cover-empty" style="width: 69%"></div></div>
 	</td>
-	<td data-value="32.23" class="pct low">32.23%</td>
-	<td data-value="121" class="abs low">39/121</td>
+	<td data-value="31.66" class="pct low">31.66%</td>
+	<td data-value="120" class="abs low">38/120</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="37" class="abs low">0/37</td>
 	<td data-value="31.25" class="pct low">31.25%</td>
 	<td data-value="16" class="abs low">5/16</td>
-	<td data-value="32.5" class="pct low">32.5%</td>
-	<td data-value="120" class="abs low">39/120</td>
+	<td data-value="31.93" class="pct low">31.93%</td>
+	<td data-value="119" class="abs low">38/119</td>
 	</tr>
 
 <tr>
 	<td class="file high" data-value="webhook.js"><a href="webhook.js.html">webhook.js</a></td>
-	<td data-value="91.37" class="pic high">
+	<td data-value="91.66" class="pic high">
 	<div class="chart"><div class="cover-fill" style="width: 91%"></div><div class="cover-empty" style="width: 9%"></div></div>
 	</td>
-	<td data-value="91.37" class="pct high">91.37%</td>
-	<td data-value="58" class="abs high">53/58</td>
+	<td data-value="91.66" class="pct high">91.66%</td>
+	<td data-value="60" class="abs high">55/60</td>
 	<td data-value="40" class="pct low">40%</td>
 	<td data-value="10" class="abs low">4/10</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="7" class="abs high">7/7</td>
-	<td data-value="91.22" class="pct high">91.22%</td>
-	<td data-value="57" class="abs high">52/57</td>
+	<td data-value="91.52" class="pct high">91.52%</td>
+	<td data-value="59" class="abs high">54/59</td>
 	</tr>
 
 </tbody>
@@ -410,7 +410,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 Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -100,7 +100,7 @@ exports.find = 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 Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -163,11 +163,11 @@
   EMPTY_LAYOUT,
   BASE_LAYOUT_PROP_IDS,
 } = require("../../constants/layouts")
-const CouchDB = require("../../db")
 const { generateLayoutID, getScreenParams } = require("../../db/utils")
+const { getAppDB } = require("@budibase/backend-core/context")
  
 exports.save = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   let layout = ctx.request.body
  
   <span class="missing-if-branch" title="if path not taken" >I</span>if (!layout.props) {
@@ -187,7 +187,7 @@ exports.save = async function (ctx) {
 }
 &nbsp;
 exports.destroy = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   const layoutId = ctx.params.layoutId,
     layoutRev = ctx.params.layoutRev
 &nbsp;
@@ -217,7 +217,7 @@ exports.destroy = 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 Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -98,12 +98,7 @@
 <a name='L39'></a><a href='#L39'>39</a>
 <a name='L40'></a><a href='#L40'>40</a>
 <a name='L41'></a><a href='#L41'>41</a>
-<a name='L42'></a><a href='#L42'>42</a>
-<a name='L43'></a><a href='#L43'>43</a>
-<a name='L44'></a><a href='#L44'>44</a>
-<a name='L45'></a><a href='#L45'>45</a>
-<a name='L46'></a><a href='#L46'>46</a>
-<a name='L47'></a><a href='#L47'>47</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">23x</span>
+<a name='L42'></a><a href='#L42'>42</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">23x</span>
@@ -122,11 +117,6 @@
 <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">23x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -150,9 +140,9 @@
 <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 { MetadataTypes } = require("../../constants")
-const CouchDB = require("../../db")
 const { generateMetadataID } = require("../../db/utils")
 const { saveEntityMetadata, deleteEntityMetadata } = require("../../utilities")
+const { getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 exports.getTypes = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
 <span class="cstat-no" title="statement not covered" >  ctx.body = {</span>
@@ -165,17 +155,12 @@ exports.saveMetadata = async ctx =&gt; {
   <span class="missing-if-branch" title="if path not taken" >I</span>if (type === MetadataTypes.AUTOMATION_TEST_HISTORY) {
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Cannot save automation history type")</span>
   }
-  ctx.body = await saveEntityMetadata(
-    ctx.appId,
-    type,
-    entityId,
-    ctx.request.body
-  )
+  ctx.body = await saveEntityMetadata(type, entityId, ctx.request.body)
 }
 &nbsp;
 exports.deleteMetadata = async ctx =&gt; {
   const { type, entityId } = ctx.params
-  await deleteEntityMetadata(ctx.appId, type, entityId)
+  await deleteEntityMetadata(type, entityId)
   ctx.body = {
     message: "Metadata deleted successfully",
   }
@@ -183,7 +168,7 @@ exports.deleteMetadata = async ctx =&gt; {
 &nbsp;
 exports.getMetadata = async ctx =&gt; {
   const { type, entityId } = ctx.params
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   const id = generateMetadataID(type, entityId)
   try {
     ctx.body = await db.get(id)
@@ -202,7 +187,7 @@ exports.getMetadata = 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 Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -103,7 +103,7 @@ exports.fetchDefinitions = <span class="fstat-no" title="function not covered" >
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -240,12 +240,12 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">38x</span>
-<span class="cline-any cline-yes">38x</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">38x</span>
 <span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -415,12 +415,12 @@ const {
   getBuiltinRoles,
 } = require("@budibase/backend-core/roles")
 const { getRoleParams } = require("../../db/utils")
-const CouchDB = require("../../db")
 const {
   CURRENTLY_SUPPORTED_LEVELS,
   getBasePermissions,
 } = require("../../utilities/security")
 const { removeFromArray } = require("../../utilities")
+const { getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 const PermissionUpdateType = {
   REMOVE: "remove",
@@ -444,7 +444,7 @@ async function updatePermissionOnRole(
   { roleId, resourceId, level },
   updateType
 ) {
-  const db = new CouchDB(appId)
+  const db = getAppDB()
   const remove = updateType === PermissionUpdateType.REMOVE
   const isABuiltin = isBuiltin(roleId)
   const dbRoleId = getDBRoleID(roleId)
@@ -515,7 +515,7 @@ exports.fetchLevels = function (ctx) {
 }
 &nbsp;
 exports.fetch = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   const roles = await getAllDBRoles(db)
   let permissions = {}
   // create an object with structure role ID -&gt; resource ID -&gt; level
@@ -542,7 +542,7 @@ exports.fetch = async function (ctx) {
 &nbsp;
 exports.getResourcePerms = async function (ctx) {
   const resourceId = ctx.params.resourceId
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   const body = await db.allDocs(
     getRoleParams(null, {
       include_docs: true,
@@ -589,7 +589,7 @@ exports.removePermission = 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 Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">81.55% </span>
+                <span class="strong">81.73% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>84/103</span>
+                <span class='fraction'>85/104</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">81.37% </span>
+                <span class="strong">81.55% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>83/102</span>
+                <span class='fraction'>84/103</span>
             </div>
         
             
@@ -74,17 +74,17 @@
 </thead>
 <tbody><tr>
 	<td class="file high" data-value="index.js"><a href="index.js.html">index.js</a></td>
-	<td data-value="80" class="pic high">
+	<td data-value="80.2" class="pic high">
 	<div class="chart"><div class="cover-fill" style="width: 80%"></div><div class="cover-empty" style="width: 20%"></div></div>
 	</td>
-	<td data-value="80" class="pct high">80%</td>
-	<td data-value="95" class="abs high">76/95</td>
+	<td data-value="80.2" class="pct high">80.2%</td>
+	<td data-value="96" class="abs high">77/96</td>
 	<td data-value="65.51" class="pct medium">65.51%</td>
 	<td data-value="29" class="abs medium">19/29</td>
 	<td data-value="85.71" class="pct high">85.71%</td>
 	<td data-value="14" class="abs high">12/14</td>
-	<td data-value="79.78" class="pct medium">79.78%</td>
-	<td data-value="94" class="abs medium">75/94</td>
+	<td data-value="80" class="pct high">80%</td>
+	<td data-value="95" class="abs high">76/95</td>
 	</tr>
 
 <tr>
@@ -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 Mon Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">80% </span>
+                <span class="strong">80.2% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>76/95</span>
+                <span class='fraction'>77/96</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">79.78% </span>
+                <span class="strong">80% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>75/94</span>
+                <span class='fraction'>76/95</span>
             </div>
         
             
@@ -267,8 +267,8 @@
 <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></td><td class="line-coverage quiet"><span class="cline-any cline-yes">39x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L211'></a><a href='#L211'>211</a>
+<a name='L212'></a><a href='#L212'>212</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>
@@ -279,6 +279,7 @@
 <span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -454,6 +455,7 @@
 <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>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -477,8 +479,7 @@
 <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-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const CouchDB = require("../../../db")
-const {
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const {
   generateQueryID,
   getQueryParams,
   isProdAppID,
@@ -489,6 +490,7 @@ const { save: saveDatasource } = require("../datasource")
 const { RestImporter } = require("./import")
 const { invalidateDynamicVariables } = require("../../../threads/utils")
 const environment = require("../../../environment")
+const { getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 const Runner = new Thread(ThreadType.QUERY, {
   timeoutMs: environment.QUERY_THREAD_TIMEOUT || 10000,
@@ -507,7 +509,7 @@ function enrichQueries(input) {
 }
 &nbsp;
 exports.fetch = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
 &nbsp;
   const body = await db.allDocs(
     getQueryParams(null, {
@@ -548,7 +550,7 @@ exports.import = <span class="fstat-no" title="function not covered" >as</span>y
 <span class="cstat-no" title="statement not covered" >    datasourceId = body.datasourceId</span>
   }
 &nbsp;
-  const importResult = <span class="cstat-no" title="statement not covered" >await importer.importQueries(ctx.appId, datasourceId)</span>
+  const importResult = <span class="cstat-no" title="statement not covered" >await importer.importQueries(datasourceId)</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  ctx.body = {</span>
     ...importResult,
@@ -558,7 +560,7 @@ exports.import = <span class="fstat-no" title="function not covered" >as</span>y
 }
 &nbsp;
 exports.save = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   const query = ctx.request.body
 &nbsp;
   if (!query._id) {
@@ -573,7 +575,7 @@ exports.save = async function (ctx) {
 }
 &nbsp;
 exports.find = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   const query = enrichQueries(await db.get(ctx.params.queryId))
   // remove properties that could be dangerous in real app
   if (isProdAppID(ctx.appId)) {
@@ -584,7 +586,7 @@ exports.find = async function (ctx) {
 }
 &nbsp;
 exports.preview = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
 &nbsp;
   const datasource = await db.get(ctx.request.body.datasourceId)
   // preview may not have a queryId as it hasn't been saved, but if it does
@@ -615,7 +617,7 @@ exports.preview = async function (ctx) {
 }
 &nbsp;
 async function execute(ctx, opts = <span class="branch-0 cbranch-no" title="branch not covered" >{ rowsOnly: false })</span> {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
 &nbsp;
   const query = await db.get(ctx.params.queryId)
   const datasource = await db.get(query.datasourceId)
@@ -660,7 +662,8 @@ exports.executeV2 = <span class="fstat-no" title="function not covered" >as</spa
 <span class="cstat-no" title="statement not covered" >  return execute(ctx, { rowsOnly: false })</span>
 }
 &nbsp;
-const removeDynamicVariables = async (db, queryId) =&gt; {
+const removeDynamicVariables = async queryId =&gt; {
+  const db = getAppDB()
   const query = await db.get(queryId)
   const datasource = await db.get(query.datasourceId)
   const dynamicVariables = datasource.config.dynamicVariables
@@ -681,8 +684,8 @@ const removeDynamicVariables = async (db, queryId) =&gt; {
 }
 &nbsp;
 exports.destroy = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
-  await removeDynamicVariables(db, ctx.params.queryId)
+  const db = getAppDB()
+  await removeDynamicVariables(ctx.params.queryId)
   await db.remove(ctx.params.queryId, ctx.params.revId)
   ctx.message = `Query deleted.`
   ctx.status = 200
@@ -694,7 +697,7 @@ exports.destroy = 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 Jan 31 2022 16:54:35 GMT+0000 (Coordinated Universal Time)
+                at Tue Feb 01 2022 16:32:19 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>