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

Adding ID column special case and fixing build issue.

This commit is contained in:
mike12345567 2024-05-09 13:05:58 +01:00
parent 6b84abda48
commit 04083adaac
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/server/src/sdk/app/tables/external/index.ts vendored
View File

@ -30,12 +30,18 @@ import { populateExternalTableSchemas } from "../validation"
import datasourceSdk from "../../datasources" import datasourceSdk from "../../datasources"
import * as viewSdk from "../../views" import * as viewSdk from "../../views"
const DEFAULT_PRIMARY_COLUMN = "id"
function noPrimaryKey(table: Table) { function noPrimaryKey(table: Table) {
return table.primary == null || table.primary.length === 0 return table.primary == null || table.primary.length === 0
} }
function validate(table: Table, oldTable?: Table) { function validate(table: Table, oldTable?: Table) {
if (!oldTable && table.schema.id && noPrimaryKey(table)) { if (
!oldTable &&
table.schema[DEFAULT_PRIMARY_COLUMN] &&
noPrimaryKey(table)
) {
throw new Error( throw new Error(
"External tables with no `primary` column set will define an `id` column, but we found an `id` column in the supplied schema. Either set a `primary` column or remove the `id` column." "External tables with no `primary` column set will define an `id` column, but we found an `id` column in the supplied schema. Either set a `primary` column or remove the `id` column."
) )
@ -48,6 +54,10 @@ function validate(table: Table, oldTable?: Table) {
const autoSubTypes = Object.values(AutoFieldSubType) const autoSubTypes = Object.values(AutoFieldSubType)
// check for auto columns, they are not allowed // check for auto columns, they are not allowed
for (let [key, column] of Object.entries(table.schema)) { for (let [key, column] of Object.entries(table.schema)) {
// this column is a special case, do not validate it
if (key === DEFAULT_PRIMARY_COLUMN) {
continue
}
// the auto-column type should never be used // the auto-column type should never be used
if (column.type === FieldType.AUTO) { if (column.type === FieldType.AUTO) {
throw new Error( throw new Error(
@ -55,7 +65,10 @@ function validate(table: Table, oldTable?: Table) {
) )
} }
if (column.subtype && autoSubTypes.includes(column.subtype)) { if (
column.subtype &&
autoSubTypes.includes(column.subtype as AutoFieldSubType)
) {
throw new Error( throw new Error(
`Column "${key}" has subtype "${column.subtype}" - this is not supported.` `Column "${key}" has subtype "${column.subtype}" - this is not supported.`
) )
@ -85,11 +98,11 @@ export async function save(
validate(tableToSave, oldTable) validate(tableToSave, oldTable)
if (!oldTable && noPrimaryKey(tableToSave)) { if (!oldTable && noPrimaryKey(tableToSave)) {
tableToSave.primary = ["id"] tableToSave.primary = [DEFAULT_PRIMARY_COLUMN]
tableToSave.schema.id = { tableToSave.schema[DEFAULT_PRIMARY_COLUMN] = {
type: FieldType.NUMBER, type: FieldType.NUMBER,
autocolumn: true, autocolumn: true,
name: "id", name: DEFAULT_PRIMARY_COLUMN,
} }
} }