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

Merge branch 'master' into chore/negated-join-filters

This commit is contained in:
Adria Navarro 2024-10-17 08:36:13 +02:00 committed by GitHub
parent b6874f52f6 a5e0a7155e
commit 0f43c8f46c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "node_modules/lerna/schemas/lerna-schema.json", "$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "2.33.0", "version": "2.33.1",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

4
packages/server/src/api/controllers/row/ExternalRequest.ts
View File

@ -173,9 +173,9 @@ export class ExternalRequest<T extends Operation> {
if (!opts.datasource) { if (!opts.datasource) {
if (sdk.views.isView(source)) { if (sdk.views.isView(source)) {
const table = await sdk.views.getTable(source.id) const table = await sdk.views.getTable(source.id)
opts.datasource = await sdk.datasources.get(table.sourceId!) opts.datasource = await sdk.datasources.get(table.sourceId)
} else { } else {
opts.datasource = await sdk.datasources.get(source.sourceId!) opts.datasource = await sdk.datasources.get(source.sourceId)
} }
} }

6
packages/server/src/sdk/app/tables/getters.ts
View File

@ -90,7 +90,11 @@ export async function getExternalTable(
if (!entities[tableName]) { if (!entities[tableName]) {
throw new Error(`Unable to find table named "${tableName}"`) throw new Error(`Unable to find table named "${tableName}"`)
} }
return processTable(entities[tableName]) const table = await processTable(entities[tableName])
if (!table.sourceId) {
table.sourceId = datasourceId
}
return table
} }
export async function getTable(tableId: string): Promise<Table> { export async function getTable(tableId: string): Promise<Table> {