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

Fix merge conflict.

This commit is contained in:
mike12345567 2023-06-30 11:35:59 +01:00
parent 6495b55b9d
commit 0d1941f264
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,17 +344,13 @@ export async function save(
setDefaultDisplayColumns(datasource) setDefaultDisplayColumns(datasource)
} }
<<<<<<< HEAD
if (preSaveAction[datasource.source]) { if (preSaveAction[datasource.source]) {
await preSaveAction[datasource.source](datasource) await preSaveAction[datasource.source](datasource)
} }
const dbResp = await db.put(datasource)
=======
const dbResp = await db.put( const dbResp = await db.put(
sdk.tables.populateExternalTableSchemas(datasource) sdk.tables.populateExternalTableSchemas(datasource)
) )
>>>>>>> d4af3bf8029c38e19b95a4051c08fa72741ea142
await events.datasource.created(datasource) await events.datasource.created(datasource)
datasource._rev = dbResp.rev datasource._rev = dbResp.rev