@budibase/server 0.9.188 → 0.9.190-alpha.2

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

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">66.88% </span>
+                <span class="strong">66.85% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>103/154</span>
+                <span class='fraction'>117/175</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">44.3% </span>
+                <span class="strong">45.55% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>35/79</span>
+                <span class='fraction'>41/90</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">69.57% </span>
+                <span class="strong">62.96% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>16/23</span>
+                <span class='fraction'>17/27</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">67.55% </span>
+                <span class="strong">67.44% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>102/151</span>
+                <span class='fraction'>116/172</span>
             </div>
         
             
@@ -375,7 +375,48 @@
 <a name='L316'></a><a href='#L316'>316</a>
 <a name='L317'></a><a href='#L317'>317</a>
 <a name='L318'></a><a href='#L318'>318</a>
-<a name='L319'></a><a href='#L319'>319</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">34x</span>
+<a name='L319'></a><a href='#L319'>319</a>
+<a name='L320'></a><a href='#L320'>320</a>
+<a name='L321'></a><a href='#L321'>321</a>
+<a name='L322'></a><a href='#L322'>322</a>
+<a name='L323'></a><a href='#L323'>323</a>
+<a name='L324'></a><a href='#L324'>324</a>
+<a name='L325'></a><a href='#L325'>325</a>
+<a name='L326'></a><a href='#L326'>326</a>
+<a name='L327'></a><a href='#L327'>327</a>
+<a name='L328'></a><a href='#L328'>328</a>
+<a name='L329'></a><a href='#L329'>329</a>
+<a name='L330'></a><a href='#L330'>330</a>
+<a name='L331'></a><a href='#L331'>331</a>
+<a name='L332'></a><a href='#L332'>332</a>
+<a name='L333'></a><a href='#L333'>333</a>
+<a name='L334'></a><a href='#L334'>334</a>
+<a name='L335'></a><a href='#L335'>335</a>
+<a name='L336'></a><a href='#L336'>336</a>
+<a name='L337'></a><a href='#L337'>337</a>
+<a name='L338'></a><a href='#L338'>338</a>
+<a name='L339'></a><a href='#L339'>339</a>
+<a name='L340'></a><a href='#L340'>340</a>
+<a name='L341'></a><a href='#L341'>341</a>
+<a name='L342'></a><a href='#L342'>342</a>
+<a name='L343'></a><a href='#L343'>343</a>
+<a name='L344'></a><a href='#L344'>344</a>
+<a name='L345'></a><a href='#L345'>345</a>
+<a name='L346'></a><a href='#L346'>346</a>
+<a name='L347'></a><a href='#L347'>347</a>
+<a name='L348'></a><a href='#L348'>348</a>
+<a name='L349'></a><a href='#L349'>349</a>
+<a name='L350'></a><a href='#L350'>350</a>
+<a name='L351'></a><a href='#L351'>351</a>
+<a name='L352'></a><a href='#L352'>352</a>
+<a name='L353'></a><a href='#L353'>353</a>
+<a name='L354'></a><a href='#L354'>354</a>
+<a name='L355'></a><a href='#L355'>355</a>
+<a name='L356'></a><a href='#L356'>356</a>
+<a name='L357'></a><a href='#L357'>357</a>
+<a name='L358'></a><a href='#L358'>358</a>
+<a name='L359'></a><a href='#L359'>359</a>
+<a name='L360'></a><a href='#L360'>360</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-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -450,11 +491,16 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">100x</span>
-<span class="cline-any cline-yes">100x</span>
+<span class="cline-any cline-yes">99x</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>
+<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-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -485,8 +531,7 @@
 <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-yes">100x</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">34x</span>
@@ -611,12 +656,12 @@
 <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-yes">28x</span>
-<span class="cline-any cline-yes">28x</span>
+<span class="cline-any cline-yes">30x</span>
+<span class="cline-any cline-yes">30x</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-yes">28x</span>
+<span class="cline-any cline-yes">30x</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>
@@ -693,6 +738,43 @@
 <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-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">34x</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">34x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">99x</span>
+<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</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">4x</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></td><td class="text"><pre class="prettyprint lang-js">const CouchDB = require("../../../db")
 const csvParser = require("../../../utilities/csvParser")
 const {
@@ -703,7 +785,7 @@ const {
 const { isEqual } = require("lodash/fp")
 const { AutoFieldSubTypes, FieldTypes } = require("../../../constants")
 const { inputProcessing } = require("../../../utilities/rowProcessor")
-const { USERS_TABLE_SCHEMA } = require("../../../constants")
+const { USERS_TABLE_SCHEMA, SwitchableTypes } = require("../../../constants")
 const {
   isExternalTable,
   breakExternalTableId,
@@ -729,10 +811,10 @@ exports.checkForColumnUpdates = async (db, oldTable, updatedTable) =&gt; {
       })
     )
     updatedRows = rows.rows.map(({ doc }) =&gt; {
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (rename) {
+      if (rename) {
         doc[rename.updated] = doc[rename.old]
         delete doc[rename.old]
-      } else <span class="cstat-no" title="statement not covered" >if (deletedColumns.length !== 0) {</span>
+      } else <span class="cstat-no" title="statement not covered" ><span class="missing-if-branch" title="else path not taken" >E</span>if (deletedColumns.length !== 0) {</span>
 <span class="cstat-no" title="statement not covered" >        deletedColumns.forEach(<span class="fstat-no" title="function not covered" >co</span>lName =&gt; <span class="cstat-no" title="statement not covered" >delete doc[colName])</span></span>
       }
       return doc
@@ -767,43 +849,47 @@ exports.makeSureTableUpToDate = (table, tableToSave) =&gt; {
 }
 &nbsp;
 exports.handleDataImport = async (appId, user, table, dataImport) =&gt; {
+  if (!dataImport || !dataImport.csvString) {
+    return table
+  }
   const db = new CouchDB(appId)
-  if (dataImport &amp;&amp; dataImport.csvString) {
-    // Populate the table with rows imported from CSV in a bulk update
-    const data = await csvParser.transform(dataImport)
+  // Populate the table with rows imported from CSV in a bulk update
+  const data = await csvParser.transform({
+    ...dataImport,
+    existingTable: table,
+  })
 &nbsp;
-    let finalData = []
-    for (let i = 0; i &lt; data.length; i++) {
-      let row = data[i]
-      row._id = generateRowID(table._id)
-      row.tableId = table._id
-      const processed = inputProcessing(user, table, row, {
-        noAutoRelationships: true,
-      })
-      table = processed.table
-      row = processed.row
+  let finalData = []
+  for (let i = 0; i &lt; data.length; i++) {
+    let row = data[i]
+    row._id = generateRowID(table._id)
+    row.tableId = table._id
+    const processed = inputProcessing(user, table, row, {
+      noAutoRelationships: true,
+    })
+    table = processed.table
+    row = processed.row
 &nbsp;
-      for (let [fieldName, schema] of Object.entries(table.schema)) {
-        // check whether the options need to be updated for inclusion as part of the data import
-        <span class="missing-if-branch" title="if path not taken" >I</span>if (
-          schema.type === FieldTypes.OPTIONS &amp;&amp;
-          (<span class="branch-1 cbranch-no" title="branch not covered" >!schema.constraints.inclusion </span>||
-<span class="branch-2 cbranch-no" title="branch not covered" >            schema.constraints.inclusion.indexOf(row[fieldName]) === -1)</span>
-        ) {
-<span class="cstat-no" title="statement not covered" >          schema.constraints.inclusion = [</span>
-            ...schema.constraints.inclusion,
-            row[fieldName],
-          ]
-        }
+    for (let [fieldName, schema] of Object.entries(table.schema)) {
+      // check whether the options need to be updated for inclusion as part of the data import
+      <span class="missing-if-branch" title="if path not taken" >I</span>if (
+        schema.type === FieldTypes.OPTIONS &amp;&amp;
+        (<span class="branch-1 cbranch-no" title="branch not covered" >!schema.constraints.inclusion </span>||
+<span class="branch-2 cbranch-no" title="branch not covered" >          schema.constraints.inclusion.indexOf(row[fieldName]) === -1)</span>
+      ) {
+<span class="cstat-no" title="statement not covered" >        schema.constraints.inclusion = [</span>
+          ...schema.constraints.inclusion,
+          row[fieldName],
+        ]
       }
-&nbsp;
-      finalData.push(row)
     }
 &nbsp;
-    await db.bulkDocs(finalData)
-    let response = await db.put(table)
-    table._rev = response._rev
+    finalData.push(row)
   }
+&nbsp;
+  await db.bulkDocs(finalData)
+  let response = await db.put(table)
+  table._rev = response._rev
   return table
 }
 &nbsp;
@@ -824,7 +910,7 @@ exports.handleSearchIndexes = async (appId, table) =&gt; {
       )
 &nbsp;
       // if index fields have changed, delete the original index
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (!isEqual(currentFields, table.indexes)) {
+      if (!isEqual(currentFields, table.indexes)) {
         await db.deleteIndex(existingIndex)
         // create/recreate the index with fields
         await db.createIndex({
@@ -856,7 +942,7 @@ exports.checkStaticTables = table =&gt; {
   if (table._id === InternalTables.USER_METADATA) {
     for (let [key, schema] of Object.entries(USERS_TABLE_SCHEMA.schema)) {
       // check if the schema exists on the table to be created/updated
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (table.schema[key] == null) {
+      if (table.schema[key] == null) {
         table.schema[key] = schema
       }
     }
@@ -868,7 +954,7 @@ class TableSaveFunctions {
   constructor({ db, ctx, oldTable, dataImport }) {
     this.db = db
     this.ctx = ctx
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (this.ctx &amp;&amp; this.ctx.user) {
+    if (this.ctx &amp;&amp; this.ctx.user) {
       this.appId = this.ctx.appId
     }
     this.oldTable = oldTable
@@ -1010,6 +1096,43 @@ exports.checkForViewUpdates = async (db, table, rename, deletedColumns) =&gt; {
   }
 }
 &nbsp;
+exports.generateForeignKey = <span class="fstat-no" title="function not covered" >(c</span>olumn, relatedTable) =&gt; {
+<span class="cstat-no" title="statement not covered" >  return `fk_${relatedTable.name}_${column.fieldName}`</span>
+}
+&nbsp;
+exports.generateJunctionTableName = <span class="fstat-no" title="function not covered" >(c</span>olumn, table, relatedTable) =&gt; {
+<span class="cstat-no" title="statement not covered" >  return `jt_${table.name}_${relatedTable.name}_${column.name}_${column.fieldName}`</span>
+}
+&nbsp;
+exports.foreignKeyStructure = <span class="fstat-no" title="function not covered" >(k</span>eyName, meta = <span class="branch-0 cbranch-no" title="branch not covered" >null)</span> =&gt; {
+  const structure = <span class="cstat-no" title="statement not covered" >{</span>
+    type: FieldTypes.NUMBER,
+    constraints: {},
+    name: keyName,
+  }
+<span class="cstat-no" title="statement not covered" >  if (meta) {</span>
+<span class="cstat-no" title="statement not covered" >    structure.meta = meta</span>
+  }
+<span class="cstat-no" title="statement not covered" >  return structure</span>
+}
+&nbsp;
+exports.hasTypeChanged = (table, oldTable) =&gt; {
+  if (!oldTable) {
+    return false
+  }
+  for (let [key, field] of Object.entries(oldTable.schema)) {
+    const oldType = field.type
+    if (!table.schema[key]) {
+      continue
+    }
+    const newType = table.schema[key].type
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (oldType !== newType &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >SwitchableTypes.indexOf(oldType) === -1)</span> {
+<span class="cstat-no" title="statement not covered" >      return true</span>
+    }
+  }
+  return false
+}
+&nbsp;
 exports.TableSaveFunctions = TableSaveFunctions
 &nbsp;</pre></td></tr></table></pre>
 
@@ -1018,7 +1141,7 @@ exports.TableSaveFunctions = TableSaveFunctions
             <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/templates.js.html

@@ -30,7 +30,7 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">71.43% </span>
+                <span class="strong">71.42% </span>
                 <span class="quiet">Branches</span>
                 <span class='fraction'>5/7</span>
             </div>
@@ -155,10 +155,10 @@ exports.fetch = async function (ctx) {
 <span class="cstat-no" title="statement not covered" >    error = true</span>
   }
   // if there is an error, simply return no templates
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (!error &amp;&amp; response) {
+  if (!error &amp;&amp; response) {
     const json = await response.json()
     ctx.body = Object.values(json.templates[type])
-  } else {
+  } else <span class="missing-if-branch" title="else path not taken" >E</span>{
 <span class="cstat-no" title="statement not covered" >    ctx.body = []</span>
   }
 }
@@ -181,7 +181,7 @@ exports.downloadTemplate = 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>