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

Budibase · Oct 17, 2024 · 0f43c8f · 0f43c8f
2 parents b6874f5 + a5e0a71
commit 0f43c8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
- "version": "2.33.0",
+ "version": "2.33.1",
  "npmClient": "yarn",
  "packages": [
  "packages/*",

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -173,9 +173,9 @@ export class ExternalRequest<T extends Operation> {
  if (!opts.datasource) {
  if (sdk.views.isView(source)) {
  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 {
- opts.datasource = await sdk.datasources.get(source.sourceId!)
+ opts.datasource = await sdk.datasources.get(source.sourceId)
  }
  }
 

diff --git a/packages/server/src/sdk/app/tables/getters.ts b/packages/server/src/sdk/app/tables/getters.ts
@@ -90,7 +90,11 @@ export async function getExternalTable(
  if (!entities[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> {