MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase into fix/roles-issue

This commit is contained in:
mike12345567 2021-06-01 17:18:42 +01:00
parent 522ed9706c 391c36ddef
commit 2ab8d3ff22
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/server/src/api/controllers/datasource.js
View File

@ -30,9 +30,9 @@ exports.save = async function (ctx) {
datasource._rev = response.rev datasource._rev = response.rev
// Drain connection pools when configuration is changed // Drain connection pools when configuration is changed
const pool = integrations[datasource.source].pool const source = integrations[datasource.source]
if (pool) { if (source && source.pool) {
await pool.end() await source.pool.end()
} }
ctx.status = 200 ctx.status = 200

2
packages/server/src/middleware/tests/authorized.spec.js
View File

@ -5,7 +5,7 @@ jest.mock("../../environment", () => ({
prod: false, prod: false,
isTest: () => true, isTest: () => true,
isProd: () => this.prod, isProd: () => this.prod,
_set: (key, value) => { _set: function(key, value) {
this.prod = value === "production" this.prod = value === "production"
} }
}) })

2
packages/server/src/middleware/tests/resourceId.spec.js
View File

@ -91,7 +91,7 @@ describe("resourceId middleware", () => {
.mainResource("custom") .mainResource("custom")
.subResource("customSub") .subResource("customSub")
.build() .build()
config = new TestConfiguration(middleware) let config = new TestConfiguration(middleware)
config.setBody({ config.setBody({
custom: "test", custom: "test",
customSub: "subtest" customSub: "subtest"