diff --git a/.github/workflows/close-featurebranch.yml b/.github/workflows/close-featurebranch.yml
index 0ec3b43598..5f232b2f26 100644
--- a/.github/workflows/close-featurebranch.yml
+++ b/.github/workflows/close-featurebranch.yml
@@ -14,7 +14,7 @@ jobs:
- uses: passeidireto/trigger-external-workflow-action@main
env:
PAYLOAD_BRANCH: ${{ github.head_ref }}
- PAYLOAD_PR_NUMBER: ${{ github.ref }}
+ PAYLOAD_PR_NUMBER: ${{ github.event.pull_request.number }}
with:
repository: budibase/budibase-deploys
event: featurebranch-qa-close
diff --git a/lerna.json b/lerna.json
index 14d073465f..7ee8f6695e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
{
- "version": "2.11.5-alpha.1",
+ "version": "2.11.5-alpha.3",
"npmClient": "yarn",
"packages": [
"packages/*"
diff --git a/packages/backend-core/src/plugin/utils.ts b/packages/backend-core/src/plugin/utils.ts
index f73ded0659..8974a9f5a2 100644
--- a/packages/backend-core/src/plugin/utils.ts
+++ b/packages/backend-core/src/plugin/utils.ts
@@ -6,6 +6,7 @@ import {
AutomationStepIdArray,
AutomationIOType,
AutomationCustomIOType,
+ DatasourceFeature,
} from "@budibase/types"
import joi from "joi"
@@ -67,9 +68,27 @@ function validateDatasource(schema: any) {
version: joi.string().optional(),
schema: joi.object({
docs: joi.string(),
+ plus: joi.boolean().optional(),
+ isSQL: joi.boolean().optional(),
+ auth: joi
+ .object({
+ type: joi.string().required(),
+ })
+ .optional(),
+ features: joi
+ .object(
+ Object.fromEntries(
+ Object.values(DatasourceFeature).map(key => [
+ key,
+ joi.boolean().optional(),
+ ])
+ )
+ )
+ .optional(),
+ relationships: joi.boolean().optional(),
+ description: joi.string().required(),
friendlyName: joi.string().required(),
type: joi.string().allow(...DATASOURCE_TYPES),
- description: joi.string().required(),
datasource: joi.object().pattern(joi.string(), fieldValidator).required(),
query: joi
.object()
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
index 21ed68ce68..74b044e75e 100644
--- a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -20,7 +20,9 @@
const getSortableFields = schema => {
return Object.entries(schema || {})
- .filter(entry => !UNSORTABLE_TYPES.includes(entry[1].type))
+ .filter(
+ entry => !UNSORTABLE_TYPES.includes(entry[1].type) && entry[1].sortable
+ )
.map(entry => entry[0])
}
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
index 9654b27b50..06b739e858 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
@@ -62,7 +62,14 @@
{/if}
- {getSubtitle(datasource)}
+
+ {@const subtitle = getSubtitle(datasource)}
+ {#if subtitle}
+ {subtitle}
+ {:else}
+ {Object.values(datasource.config).join(" / ")}
+ {/if}
+
diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js
index 7d2db44d6a..00384a6b1c 100644
--- a/packages/builder/src/stores/backend/datasources.js
+++ b/packages/builder/src/stores/backend/datasources.js
@@ -136,6 +136,7 @@ export function createDatasourcesStore() {
config,
name: `${integration.friendlyName}${nameModifier}`,
plus: integration.plus && integration.name !== IntegrationTypes.REST,
+ isSQL: integration.isSQL,
}
if (await checkDatasourceValidity(integration, datasource)) {
diff --git a/packages/shared-core/src/helpers/integrations.ts b/packages/shared-core/src/helpers/integrations.ts
index b8c220c6a5..5cc8de880f 100644
--- a/packages/shared-core/src/helpers/integrations.ts
+++ b/packages/shared-core/src/helpers/integrations.ts
@@ -14,5 +14,5 @@ export function isSQL(datasource: Datasource): boolean {
SourceName.MYSQL,
SourceName.ORACLE,
]
- return SQL.indexOf(datasource.source) !== -1
+ return SQL.indexOf(datasource.source) !== -1 || datasource.isSQL === true
}
diff --git a/packages/types/src/documents/app/datasource.ts b/packages/types/src/documents/app/datasource.ts
index 855006ea4c..67035a2e72 100644
--- a/packages/types/src/documents/app/datasource.ts
+++ b/packages/types/src/documents/app/datasource.ts
@@ -9,6 +9,7 @@ export interface Datasource extends Document {
// the config is defined by the schema
config?: Record
plus?: boolean
+ isSQL?: boolean
entities?: {
[key: string]: Table
}
diff --git a/packages/types/src/sdk/datasources.ts b/packages/types/src/sdk/datasources.ts
index d6a0d4a7c8..0e06b8fae0 100644
--- a/packages/types/src/sdk/datasources.ts
+++ b/packages/types/src/sdk/datasources.ts
@@ -140,6 +140,7 @@ export interface DatasourceConfig {
export interface Integration {
docs: string
plus?: boolean
+ isSQL?: boolean
auth?: { type: string }
features?: Partial>
relationships?: boolean