accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2024-11-10 07:40:55 +00:00
Code Issues Releases Activity

fix: fix the conditional, apply to default too, early exit in column creation

Browse Source
This commit is contained in:
18alantom 2021-11-08 15:14:02 +05:30
parent 9f3bd96053
commit 1390651803
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backends/database.js
View File

@ -113,6 +113,12 @@ module.exports = class Database extends Observable {
buildColumnForTable(table, field) { buildColumnForTable(table, field) {
let columnType = this.getColumnType(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); let column = table[columnType](field.fieldname);
// primary key // primary key
@ -121,12 +127,12 @@ module.exports = class Database extends Observable {
} }
// default value // default value
if (field.default) { if (!!field.default && !(field.default instanceof Function)) {
column.defaultTo(field.default); column.defaultTo(field.default);
} }
// required // required
if (field.required && !field.required instanceof Function) { if (!!field.required && !(field.required instanceof Function)) {
column.notNullable(); column.notNullable();
} }