@budibase/server 1.0.5 → 1.0.7

package/dist/utilities/csvParser.js

@@ -103,8 +103,11 @@ function transform({ schema, csvString, existingTable }) {
         if (existingTable) {
             schema = updateSchema({ schema, existingTable });
         }
-        for (let key of Object.keys(schema)) {
-            colParser[key] = PARSERS[schema[key].type] || schema[key].type;
+        for (let [key, field] of Object.entries(schema)) {
+            // don't import data to auto columns
+            if (!field.autocolumn) {
+                colParser[key] = PARSERS[field.type] || field.type;
+            }
         }
         try {
             const data = yield csv({ colParser }).fromString(csvString);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -69,9 +69,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/auth": "^1.0.5",
-    "@budibase/client": "^1.0.5",
-    "@budibase/string-templates": "^1.0.5",
+    "@budibase/auth": "^1.0.7",
+    "@budibase/client": "^1.0.7",
+    "@budibase/string-templates": "^1.0.7",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -158,5 +158,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "efd95a26f3d22461c435914b2d8f9fd6bf8842b9"
+  "gitHead": "3212d2f447662c13b5949c564161b697e4efc11a"
 }

package/scripts/integrations/oracle/oracle.md

@@ -84,7 +84,7 @@ The `HR` schema is populated with dummy data by default in oracle for testing pu
 To connect to the HR schema first update the user password and unlock the account by performing
 ```sql
 ALTER USER hr ACCOUNT UNLOCK;
-ALTER USER hr IDENTIFIED BY hr
+ALTER USER hr IDENTIFIED BY hr;
 ```
 You should now be able to connect to the hr schema using the credentials hr/hr
 

package/src/api/controllers/table/utils.js

@@ -75,6 +75,7 @@ exports.handleDataImport = async (appId, user, table, dataImport) => {
   if (!dataImport || !dataImport.csvString) {
     return table
   }
+
   const db = new CouchDB(appId)
   // Populate the table with rows imported from CSV in a bulk update
   const data = await csvParser.transform({

package/src/api/controllers/view/index.js

@@ -5,6 +5,7 @@ const exporters = require("./exporters")
 const { saveView, getView, getViews, deleteView } = require("./utils")
 const { fetchView } = require("../row")
 const { getTable } = require("../table/utils")
+const { FieldTypes } = require("../../../constants")
 
 exports.fetch = async ctx => {
   const db = new CouchDB(ctx.appId)
@@ -77,6 +78,7 @@ exports.exportView = async ctx => {
   }
 
   await fetchView(ctx)
+  let rows = ctx.body
 
   let schema = view && view.meta && view.meta.schema
   if (!schema) {
@@ -85,11 +87,23 @@ exports.exportView = async ctx => {
     schema = table.schema
   }
 
+  // remove any relationships
+  const relationships = Object.entries(schema)
+    .filter(entry => entry[1].type === FieldTypes.LINK)
+    .map(entry => entry[0])
+  // iterate relationship columns and remove from and row and schema
+  relationships.forEach(column => {
+    rows.forEach(row => {
+      delete row[column]
+    })
+    delete schema[column]
+  })
+
   // make sure no "undefined" entries appear in the CSV
   if (format === exporters.ExportFormats.CSV) {
     const schemaKeys = Object.keys(schema)
     for (let key of schemaKeys) {
-      for (let row of ctx.body) {
+      for (let row of rows) {
         if (row[key] == null) {
           row[key] = ""
         }
@@ -103,5 +117,5 @@ exports.exportView = async ctx => {
   const filename = `${viewName}.${format}`
   // send down the file
   ctx.attachment(filename)
-  ctx.body = apiFileReturn(exporter(headers, ctx.body))
+  ctx.body = apiFileReturn(exporter(headers, rows))
 }

package/src/integrations/oracle.ts

@@ -381,7 +381,7 @@ module OracleModule {
       }`
       const attributes: ConnectionAttributes = {
         user: this.config.user,
-        password: this.config.user,
+        password: this.config.password,
         connectString,
       }
       return oracledb.getConnection(attributes)

package/src/utilities/csvParser.js

@@ -102,8 +102,11 @@ async function transform({ schema, csvString, existingTable }) {
     schema = updateSchema({ schema, existingTable })
   }
 
-  for (let key of Object.keys(schema)) {
-    colParser[key] = PARSERS[schema[key].type] || schema[key].type
+  for (let [key, field] of Object.entries(schema)) {
+    // don't import data to auto columns
+    if (!field.autocolumn) {
+      colParser[key] = PARSERS[field.type] || field.type
+    }
   }
 
   try {