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

Merge pull request #7213 from Budibase/fix/executequery-datasources 

fixing wrong filter, excluding just bb_internal
This commit is contained in:
NEOLPAR 2022-08-10 16:44:00 +01:00 committed by GitHub
parent ee781eaf51 60e61f1107
commit 39a33290d2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
View File

@ -3,7 +3,7 @@
import { datasources, integrations, queries } from "stores/backend" import { datasources, integrations, queries } from "stores/backend"
import BindingBuilder from "components/integration/QueryBindingBuilder.svelte" import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
import IntegrationQueryEditor from "components/integration/index.svelte" import IntegrationQueryEditor from "components/integration/index.svelte"
import { IntegrationTypes } from "constants/backend" import { BUDIBASE_DATASOURCE_ID } from "constants/backend"
export let parameters export let parameters
export let bindings = [] export let bindings = []
@ -12,11 +12,9 @@
$: datasource = $datasources.list.find( $: datasource = $datasources.list.find(
ds => ds._id === parameters.datasourceId ds => ds._id === parameters.datasourceId
) )
// Executequery action just works on PostgreSQL and MongoDB datasources // Executequery must exclude budibase datasource
$: executeQueryDatasources = $datasources.list.filter( $: executeQueryDatasources = $datasources.list.filter(
x => x => x._id !== BUDIBASE_DATASOURCE_ID
x.source === IntegrationTypes.POSTGRES ||
x.source === IntegrationTypes.MONGODB
) )
function fetchQueryDefinition(query) { function fetchQueryDefinition(query) {

2
packages/builder/src/constants/backend/index.js
View File

@ -163,6 +163,8 @@ export const SWITCHABLE_TYPES = [
...ALLOWABLE_NUMBER_TYPES, ...ALLOWABLE_NUMBER_TYPES,
] ]
export const BUDIBASE_DATASOURCE_ID = "bb_internal"
export const IntegrationTypes = { export const IntegrationTypes = {
POSTGRES: "POSTGRES", POSTGRES: "POSTGRES",
MONGODB: "MONGODB", MONGODB: "MONGODB",