From 139065180381729629c93c83e2a3b183e698b1a6 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Mon, 8 Nov 2021 15:14:02 +0530 Subject: [PATCH] fix: fix the conditional, apply to default too, early exit in column creation --- backends/database.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backends/database.js b/backends/database.js index 59503c3d..fe339284 100644 --- a/backends/database.js +++ b/backends/database.js @@ -113,6 +113,12 @@ module.exports = class Database extends Observable { buildColumnForTable(table, field) { let columnType = this.getColumnType(field); + if (!columnType) { + // In case columnType is "Table" + // childTable links are handled using the childTable's "parent" field + return; + } + let column = table[columnType](field.fieldname); // primary key @@ -121,12 +127,12 @@ module.exports = class Database extends Observable { } // default value - if (field.default) { + if (!!field.default && !(field.default instanceof Function)) { column.defaultTo(field.default); } // required - if (field.required && !field.required instanceof Function) { + if (!!field.required && !(field.required instanceof Function)) { column.notNullable(); }