@budibase/server 1.0.49-alpha.4 → 1.0.49-alpha.8

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

@@ -190,7 +190,7 @@ exports.generateQueryPreviewValidation = () => {
             <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 19:12:04 GMT+0000 (Coordinated Universal Time)
+                at Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>

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

@@ -155,8 +155,7 @@
 <a name='L96'></a><a href='#L96'>96</a>
 <a name='L97'></a><a href='#L97'>97</a>
 <a name='L98'></a><a href='#L98'>98</a>
-<a name='L99'></a><a href='#L99'>99</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">38x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L99'></a><a href='#L99'>99</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>
@@ -167,6 +166,7 @@
 <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-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -253,8 +253,7 @@
 <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></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 {
   Role,
   getRole,
   isBuiltin,
@@ -265,6 +264,7 @@ const {
   getUserMetadataParams,
   InternalTables,
 } = require("../../db/utils")
+const { getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 const UpdateRolesOptions = {
   CREATED: "created",
@@ -295,15 +295,15 @@ async function updateRolesOnUserTable(db, roleId, updateOption) {
 }
 &nbsp;
 exports.fetch = async function (ctx) {
-  ctx.body = await getAllRoles(ctx.appId)
+  ctx.body = await getAllRoles()
 }
 &nbsp;
 exports.find = async function (ctx) {
-  ctx.body = await getRole(ctx.appId, ctx.params.roleId)
+  ctx.body = await getRole(ctx.params.roleId)
 }
 &nbsp;
 exports.save = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   let { _id, name, inherits, permissionId } = ctx.request.body
   if (!_id) {
     _id = generateRoleID()
@@ -324,7 +324,7 @@ exports.save = async function (ctx) {
 }
 &nbsp;
 exports.destroy = async function (ctx) {
-  const db = new CouchDB(ctx.appId)
+  const db = getAppDB()
   const roleId = ctx.params.roleId
   <span class="missing-if-branch" title="if path not taken" >I</span>if (isBuiltin(roleId)) {
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Cannot delete builtin role.")</span>
@@ -358,7 +358,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 19:12:04 GMT+0000 (Coordinated Universal Time)
+                at Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -149,8 +149,7 @@
 <a name='L90'></a><a href='#L90'>90</a>
 <a name='L91'></a><a href='#L91'>91</a>
 <a name='L92'></a><a href='#L92'>92</a>
-<a name='L93'></a><a href='#L93'>93</a>
-<a name='L94'></a><a href='#L94'>94</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">23x</span>
+<a name='L93'></a><a href='#L93'>93</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">23x</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>
@@ -195,7 +194,6 @@
 <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">3x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -284,12 +282,11 @@ Routing.prototype.addScreenId = function (fullpath, roleId, screenId) {
 &nbsp;
 /**
  * Gets the full routing structure by querying the routing view and processing the result into the tree.
- * @param {string} appId The application to produce the routing structure for.
  * @returns {Promise&lt;object&gt;} The routing structure, this is the full structure designed for use in the builder,
  * if the client routing is required then the updateRoutingStructureForUserRole should be used.
  */
-async function getRoutingStructure(appId) {
-  const screenRoutes = await getRoutingInfo(appId)
+async function getRoutingStructure() {
+  const screenRoutes = await getRoutingInfo()
   const routing = new Routing()
 &nbsp;
   for (let screenRoute of screenRoutes) {
@@ -302,13 +299,13 @@ async function getRoutingStructure(appId) {
 }
 &nbsp;
 exports.fetch = async ctx =&gt; {
-  ctx.body = await getRoutingStructure(ctx.appId)
+  ctx.body = await getRoutingStructure()
 }
 &nbsp;
 exports.clientFetch = async ctx =&gt; {
-  const routing = await getRoutingStructure(ctx.appId)
+  const routing = await getRoutingStructure()
   let roleId = ctx.user.role._id
-  const roleIds = await getUserRoleHierarchy(ctx.appId, roleId)
+  const roleIds = await getUserRoleHierarchy(roleId)
   for (let topLevel of Object.values(routing.routes)) {
     for (let subpathKey of Object.keys(topLevel.subpaths)) {
       let found = false
@@ -343,7 +340,7 @@ exports.clientFetch = 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 19:12:04 GMT+0000 (Coordinated Universal Time)
+                at Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">14.85% </span>
+                <span class="strong">16.12% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>15/101</span>
+                <span class='fraction'>15/93</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">15.15% </span>
+                <span class="strong">16.48% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>15/99</span>
+                <span class='fraction'>15/91</span>
             </div>
         
             
@@ -257,38 +257,7 @@
 <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>
-<a name='L217'></a><a href='#L217'>217</a>
-<a name='L218'></a><a href='#L218'>218</a>
-<a name='L219'></a><a href='#L219'>219</a>
-<a name='L220'></a><a href='#L220'>220</a>
-<a name='L221'></a><a href='#L221'>221</a>
-<a name='L222'></a><a href='#L222'>222</a>
-<a name='L223'></a><a href='#L223'>223</a>
-<a name='L224'></a><a href='#L224'>224</a>
-<a name='L225'></a><a href='#L225'>225</a>
-<a name='L226'></a><a href='#L226'>226</a>
-<a name='L227'></a><a href='#L227'>227</a>
-<a name='L228'></a><a href='#L228'>228</a>
-<a name='L229'></a><a href='#L229'>229</a>
-<a name='L230'></a><a href='#L230'>230</a>
-<a name='L231'></a><a href='#L231'>231</a>
-<a name='L232'></a><a href='#L232'>232</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L201'></a><a href='#L201'>201</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>
@@ -318,15 +287,12 @@
 <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-yes">39x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -339,7 +305,6 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -355,19 +320,12 @@
 <span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">39x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-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>
@@ -377,12 +335,6 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-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>
@@ -394,7 +346,6 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -410,7 +361,6 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -450,11 +400,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -474,18 +419,12 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-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-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>
@@ -516,7 +455,6 @@
 <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 {
@@ -530,9 +468,9 @@ const {
   breakRowIdField,
 } = require("../../../integrations/utils")
 const ExternalRequest = require("./ExternalRequest")
-const CouchDB = require("../../../db")
+const { getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
-async function <span class="fstat-no" title="function not covered" >handleRequest(</span>appId, operation, tableId, opts = <span class="branch-0 cbranch-no" title="branch not covered" >{})</span> {
+async function <span class="fstat-no" title="function not covered" >handleRequest(</span>operation, tableId, opts = <span class="branch-0 cbranch-no" title="branch not covered" >{})</span> {
   // make sure the filters are cleaned up, no empty strings for equals, fuzzy or string
 <span class="cstat-no" title="statement not covered" >  if (opts &amp;&amp; opts.filters) {</span>
 <span class="cstat-no" title="statement not covered" >    for (let filterField of NoEmptyFilterStrings) {</span>
@@ -546,31 +484,27 @@ async function <span class="fstat-no" title="function not covered" >handleReques
       }
     }
   }
-<span class="cstat-no" title="statement not covered" >  return new ExternalRequest(appId, operation, tableId, opts.datasource).run(</span>
-    opts
-  )
+<span class="cstat-no" title="statement not covered" >  return new ExternalRequest(operation, tableId, opts.datasource).run(opts)</span>
 }
 &nbsp;
 exports.handleRequest = handleRequest
 &nbsp;
 exports.patch = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
-  const appId = <span class="cstat-no" title="statement not covered" >ctx.appId</span>
   const inputs = <span class="cstat-no" title="statement not covered" >ctx.request.body</span>
   const tableId = <span class="cstat-no" title="statement not covered" >ctx.params.tableId</span>
   const id = <span class="cstat-no" title="statement not covered" >breakRowIdField(inputs._id)</span>
   // don't save the ID to db
 <span class="cstat-no" title="statement not covered" >  delete inputs._id</span>
-<span class="cstat-no" title="statement not covered" >  return handleRequest(appId, DataSourceOperation.UPDATE, tableId, {</span>
+<span class="cstat-no" title="statement not covered" >  return handleRequest(DataSourceOperation.UPDATE, tableId, {</span>
     id,
     row: inputs,
   })
 }
 &nbsp;
 exports.save = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
-  const appId = <span class="cstat-no" title="statement not covered" >ctx.appId</span>
   const inputs = <span class="cstat-no" title="statement not covered" >ctx.request.body</span>
   const tableId = <span class="cstat-no" title="statement not covered" >ctx.params.tableId</span>
-<span class="cstat-no" title="statement not covered" >  return handleRequest(appId, DataSourceOperation.CREATE, tableId, {</span>
+<span class="cstat-no" title="statement not covered" >  return handleRequest(DataSourceOperation.CREATE, tableId, {</span>
     row: inputs,
   })
 }
@@ -584,49 +518,35 @@ exports.fetchView = <span class="fstat-no" title="function not covered" >as</spa
 }
 &nbsp;
 exports.fetch = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
-  const appId = <span class="cstat-no" title="statement not covered" >ctx.appId</span>
   const tableId = <span class="cstat-no" title="statement not covered" >ctx.params.tableId</span>
-<span class="cstat-no" title="statement not covered" >  return handleRequest(appId, DataSourceOperation.READ, tableId)</span>
+<span class="cstat-no" title="statement not covered" >  return handleRequest(DataSourceOperation.READ, tableId)</span>
 }
 &nbsp;
 exports.find = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
-  const appId = <span class="cstat-no" title="statement not covered" >ctx.appId</span>
   const id = <span class="cstat-no" title="statement not covered" >ctx.params.rowId</span>
   const tableId = <span class="cstat-no" title="statement not covered" >ctx.params.tableId</span>
-  const response = <span class="cstat-no" title="statement not covered" >await handleRequest(</span>
-    appId,
-    DataSourceOperation.READ,
-    tableId,
-    {
-      id,
-    }
-  )
+  const response = <span class="cstat-no" title="statement not covered" >await handleRequest(DataSourceOperation.READ, tableId, {</span>
+    id,
+  })
 <span class="cstat-no" title="statement not covered" >  return response ? response[0] : response</span>
 }
 &nbsp;
 exports.destroy = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
-  const appId = <span class="cstat-no" title="statement not covered" >ctx.appId</span>
   const tableId = <span class="cstat-no" title="statement not covered" >ctx.params.tableId</span>
   const id = <span class="cstat-no" title="statement not covered" >ctx.request.body._id</span>
-  const { row } = <span class="cstat-no" title="statement not covered" >await handleRequest(</span>
-    appId,
-    DataSourceOperation.DELETE,
-    tableId,
-    {
-      id,
-    }
-  )
+  const { row } = <span class="cstat-no" title="statement not covered" >await handleRequest(DataSourceOperation.DELETE, tableId, {</span>
+    id,
+  })
 <span class="cstat-no" title="statement not covered" >  return { response: { ok: true }, row }</span>
 }
 &nbsp;
 exports.bulkDestroy = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
-  const appId = <span class="cstat-no" title="statement not covered" >ctx.appId</span>
   const { rows } = <span class="cstat-no" title="statement not covered" >ctx.request.body</span>
   const tableId = <span class="cstat-no" title="statement not covered" >ctx.params.tableId</span>
   let promises = <span class="cstat-no" title="statement not covered" >[]</span>
 <span class="cstat-no" title="statement not covered" >  for (let row of rows) {</span>
 <span class="cstat-no" title="statement not covered" >    promises.push(</span>
-      handleRequest(appId, DataSourceOperation.DELETE, tableId, {
+      handleRequest(DataSourceOperation.DELETE, tableId, {
         id: breakRowIdField(row._id),
       })
     )
@@ -636,7 +556,6 @@ exports.bulkDestroy = <span class="fstat-no" title="function not covered" >as</s
 }
 &nbsp;
 exports.search = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
-  const appId = <span class="cstat-no" title="statement not covered" >ctx.appId</span>
   const tableId = <span class="cstat-no" title="statement not covered" >ctx.params.tableId</span>
   const { paginate, query, ...params } = <span class="cstat-no" title="statement not covered" >ctx.request.body</span>
   let { bookmark, limit } = <span class="cstat-no" title="statement not covered" >params</span>
@@ -666,26 +585,21 @@ exports.search = <span class="fstat-no" title="function not covered" >as</span>y
       [params.sort]: direction,
     }
   }
-  const rows = <span class="cstat-no" title="statement not covered" >await handleRequest(appId, DataSourceOperation.READ, tableId, {</span>
+  const rows = <span class="cstat-no" title="statement not covered" >await handleRequest(DataSourceOperation.READ, tableId, {</span>
     filters: query,
     sort,
     paginate: paginateObj,
   })
   let hasNextPage = <span class="cstat-no" title="statement not covered" >false</span>
 <span class="cstat-no" title="statement not covered" >  if (paginate &amp;&amp; rows.length === limit) {</span>
-    const nextRows = <span class="cstat-no" title="statement not covered" >await handleRequest(</span>
-      appId,
-      DataSourceOperation.READ,
-      tableId,
-      {
-        filters: query,
-        sort,
-        paginate: {
-          limit: 1,
-          page: bookmark * limit + 1,
-        },
-      }
-    )
+    const nextRows = <span class="cstat-no" title="statement not covered" >await handleRequest(DataSourceOperation.READ, tableId, {</span>
+      filters: query,
+      sort,
+      paginate: {
+        limit: 1,
+        page: bookmark * limit + 1,
+      },
+    })
 <span class="cstat-no" title="statement not covered" >    hasNextPage = nextRows.length &gt; 0</span>
   }
   // need wrapper object for bookmarks etc when paginating
@@ -698,25 +612,19 @@ exports.validate = <span class="fstat-no" title="function not covered" >as</span
 }
 &nbsp;
 exports.fetchEnrichedRow = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
-  const appId = <span class="cstat-no" title="statement not covered" >ctx.appId</span>
   const id = <span class="cstat-no" title="statement not covered" >ctx.params.rowId</span>
   const tableId = <span class="cstat-no" title="statement not covered" >ctx.params.tableId</span>
   const { datasourceId, tableName } = <span class="cstat-no" title="statement not covered" >breakExternalTableId(tableId)</span>
-  const db = <span class="cstat-no" title="statement not covered" >new CouchDB(appId)</span>
+  const db = <span class="cstat-no" title="statement not covered" >getAppDB()</span>
   const datasource = <span class="cstat-no" title="statement not covered" >await db.get(datasourceId)</span>
 <span class="cstat-no" title="statement not covered" >  if (!datasource || !datasource.entities) {</span>
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Datasource has not been configured for plus API.")</span>
   }
   const tables = <span class="cstat-no" title="statement not covered" >datasource.entities</span>
-  const response = <span class="cstat-no" title="statement not covered" >await handleRequest(</span>
-    appId,
-    DataSourceOperation.READ,
-    tableId,
-    {
-      id,
-      datasource,
-    }
-  )
+  const response = <span class="cstat-no" title="statement not covered" >await handleRequest(DataSourceOperation.READ, tableId, {</span>
+    id,
+    datasource,
+  })
   const table = <span class="cstat-no" title="statement not covered" >tables[tableName]</span>
   const row = <span class="cstat-no" title="statement not covered" >response[0]</span>
   // this seems like a lot of work, but basically we need to dig deeper for the enrich
@@ -735,7 +643,6 @@ exports.fetchEnrichedRow = <span class="fstat-no" title="function not covered" >
     // don't support composite keys right now
     const linkedIds = <span class="cstat-no" title="statement not covered" >links.map(<span class="fstat-no" title="function not covered" >li</span>nk =&gt; <span class="cstat-no" title="statement not covered" >breakRowIdField(link._id)[0])</span></span>
 <span class="cstat-no" title="statement not covered" >    row[fieldName] = await handleRequest(</span>
-      appId,
       DataSourceOperation.READ,
       linkedTableId,
       {
@@ -757,7 +664,7 @@ exports.fetchEnrichedRow = <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 19:12:04 GMT+0000 (Coordinated Universal Time)
+                at Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>