Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion __tests__/DbTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,23 @@ test ('good', () => {
expect (this.name).toBe('t')

return [ {id: 1} ]
}
},
triggers: [
{
phase : 'BEFORE INSERT',
action : 'FOR EACH ROW',
sql : /*sql*/`
BEGIN
RETURN NEW;
END;
`,
},
{
phase : 'AFTER INSERT',
action : 'FOR EACH ROW',
sql : null,
},
],
})

expect (r.columns.id.type).toBe ('int')
Expand Down
4 changes: 3 additions & 1 deletion __tests__/DbTrigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test ('bad', () => {
expect (() => new DbTrigger ({name: 't', phase: 'BEFORE', sql: 1})).toThrow ()
expect (() => new DbTrigger ({name: 't', phase: true, sql: 'NULL;'})).toThrow ()
expect (() => new DbTrigger ({name: 't', phase: true, sql: function () {return ''}})).toThrow ()

expect (() => new DbTrigger ({name: 't', phase: true, sql: null})).toThrow ()
})

test ('not bad', () => {
Expand All @@ -24,6 +24,7 @@ test ('not bad', () => {
columns: {id: 'int'},
pk: ['id'],
triggers: [
{name: 't', phase: 'BEFORE UPDATE', sql: 'NULL;'},
{name: 't', phase: 'BEFORE UPDATE', sql: 'NULL;'},
{name: 't1', phase: 'AFTER UPDATE', sql: function () {

Expand All @@ -34,6 +35,7 @@ test ('not bad', () => {

return 'NULL;'
}},
{name: 't', phase: 'BEFORE UPDATE', sql: null},
]
})

Expand Down
17 changes: 9 additions & 8 deletions lib/model/DbTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,18 @@ class DbTable extends DbRelation {

for (let i = 0; i < length; i ++) {

const o = triggers [i]
const o = triggers [i]; if (o.sql !== null) {

o.table = this

if (!o.name) o.name = lang.getTriggerName (this, i)

const trigger = new DbTrigger (o)
o.table = this

trigger.setLang (lang)
if (!o.name) o.name = lang.getTriggerName (this, i)

const trigger = new DbTrigger (o)

trigger.setLang (lang)

triggers [i] = trigger
triggers [i] = trigger
}

}

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "doix-db",
"version": "1.0.68",
"version": "1.0.69",
"description": "Shared database related code for doix",
"main": "index.js",
"files": [
Expand Down