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

Use existing merge

This commit is contained in:
Adria Navarro 2023-05-16 10:50:27 +02:00
parent a676e42b1f
commit 5e7d839cb1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/server/src/api/controllers/datasource.ts
View File

@ -25,7 +25,6 @@ import {
DatasourcePlus, DatasourcePlus,
} from "@budibase/types" } from "@budibase/types"
import sdk from "../../sdk" import sdk from "../../sdk"
import _ from "lodash"
function getErrorTables(errors: any, errorType: string) { function getErrorTables(errors: any, errorType: string) {
return Object.entries(errors) return Object.entries(errors)
@ -128,10 +127,14 @@ export async function verify(
ctx: UserCtx<VerifyDatasourceRequest, VerifyDatasourceResponse> ctx: UserCtx<VerifyDatasourceRequest, VerifyDatasourceResponse>
) { ) {
const { datasource } = ctx.request.body const { datasource } = ctx.request.body
const existingDatasource = await sdk.datasources.get(datasource._id!)
const { config } = await sdk.datasources.get(datasource._id!) const enrichedDatasource = sdk.datasources.mergeConfigs(
datasource,
existingDatasource
)
const connector = await getConnector(_.merge(datasource, { config })) const connector = await getConnector(enrichedDatasource)
if (!connector.testConnection) { if (!connector.testConnection) {
ctx.throw(400, "Connection information verification not supported") ctx.throw(400, "Connection information verification not supported")
} }