@budibase/server 2.1.43-alpha.4 → 2.1.43-alpha.6

package/dist/api/controllers/row/ExternalRequest.js

@@ -503,7 +503,8 @@ class ExternalRequest {
             for (let [colName, { isMany, rows, tableId }] of Object.entries(related)) {
                 const table = this.getTable(tableId);
                 // if its not the foreign key skip it, nothing to do
-                if (!table || (table.primary && table.primary.indexOf(colName) !== -1)) {
+                if (!table ||
+                    (!isMany && table.primary && table.primary.indexOf(colName) !== -1)) {
                     continue;
                 }
                 for (let row of rows) {

package/dist/integrations/base/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/integrations/microsoftSqlServer.js

@@ -195,15 +195,20 @@ class SqlServerIntegration extends sql_1.default {
                     .filter((constraint) => constraint.CONSTRAINT_TYPE === "PRIMARY KEY")
                     .map((constraint) => constraint.COLUMN_NAME);
                 const autoColumns = columns
-                    .filter((col) => col.IS_COMPUTED || col.IS_IDENTITY)
-                    .map((col) => col.COLUMN_NAME);
+                    .filter(col => col.IS_COMPUTED || col.IS_IDENTITY)
+                    .map(col => col.COLUMN_NAME);
+                const requiredColumns = columns
+                    .filter(col => col.IS_NULLABLE === "NO")
+                    .map(col => col.COLUMN_NAME);
                 let schema = {};
                 for (let def of definition) {
                     const name = def.COLUMN_NAME;
                     if (typeof name !== "string") {
                         continue;
                     }
-                    schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
+                    schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find(col => col === name), name: name, constraints: {
+                            presence: requiredColumns.find(col => col === name),
+                        } }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
                 }
                 tables[tableName] = {
                     _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),

package/dist/integrations/oracle.js

@@ -247,7 +247,9 @@ class OracleIntegration extends sql_1.default {
                     const columnName = oracleColumn.name;
                     let fieldSchema = table.schema[columnName];
                     if (!fieldSchema) {
-                        fieldSchema = Object.assign({ autocolumn: OracleIntegration.isAutoColumn(oracleColumn), name: columnName }, this.internalConvertType(oracleColumn));
+                        fieldSchema = Object.assign({ autocolumn: OracleIntegration.isAutoColumn(oracleColumn), name: columnName, constraints: {
+                                presence: false,
+                            } }, this.internalConvertType(oracleColumn));
                         table.schema[columnName] = fieldSchema;
                     }
                     // iterate each constraint on the column
@@ -255,6 +257,11 @@ class OracleIntegration extends sql_1.default {
                         if (oracleConstraint.type === OracleContraintTypes.PRIMARY) {
                             table.primary.push(columnName);
                         }
+                        else if (oracleConstraint.type === OracleContraintTypes.NOT_NULL_OR_CHECK) {
+                            table.schema[columnName].constraints = {
+                                presence: true,
+                            };
+                        }
                     });
                 });
             });

package/dist/integrations/postgres.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
 const sql_1 = __importDefault(require("./base/sql"));
+const utilities_1 = require("../utilities");
 const { Client, types } = require("pg");
-const { escapeDangerousCharacters } = require("../utilities");
 // Return "date" and "timestamp" types as plain strings.
 // This lets us reference the original stored timezone.
 // types is undefined when running in a test env for some reason.
@@ -163,7 +163,7 @@ class PostgresIntegration extends sql_1.default {
                 const matches = query.sql.match(JSON_REGEX);
                 if (matches && matches.length > 0) {
                     for (let match of matches) {
-                        const escaped = escapeDangerousCharacters(match);
+                        const escaped = (0, utilities_1.escapeDangerousCharacters)(match);
                         query.sql = query.sql.replace(match, escaped);
                     }
                 }
@@ -227,11 +227,14 @@ class PostgresIntegration extends sql_1.default {
                     const identity = !!(column.identity_generation ||
                         column.identity_start ||
                         column.identity_increment);
+                    const constraints = {
+                        presence: column.is_nullable === "NO",
+                    };
                     const hasDefault = typeof column.column_default === "string" &&
                         column.column_default.startsWith("nextval");
                     const isGenerated = column.is_generated && column.is_generated !== "NEVER";
                     const isAuto = hasDefault || identity || isGenerated;
-                    tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
+                    tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName, constraints }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
                 }
                 const final = (0, utils_1.finaliseExternalTables)(tables, entities);
                 this.tables = final.tables;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.1.43-alpha.3",
+    "version": "2.1.43-alpha.5",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.1.43-alpha.3",
-        "@budibase/client": "2.1.43-alpha.3",
-        "@budibase/pro": "2.1.43-alpha.3",
-        "@budibase/string-templates": "2.1.43-alpha.3",
-        "@budibase/types": "2.1.43-alpha.3",
+        "@budibase/backend-core": "2.1.43-alpha.5",
+        "@budibase/client": "2.1.43-alpha.5",
+        "@budibase/pro": "2.1.43-alpha.5",
+        "@budibase/string-templates": "2.1.43-alpha.5",
+        "@budibase/types": "2.1.43-alpha.5",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",