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

Proper fix, making sure that low level handling of JSON column types correctly handles aliasing.

This commit is contained in:
mike12345567 2024-03-19 16:24:15 +00:00
parent 612efba370
commit 6a0e46a0a6
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/server/src/integrations/base/sql.ts
View File

@ -705,10 +705,13 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
if (!this._isJsonColumn(field)) { if (!this._isJsonColumn(field)) {
continue continue
} }
const fullName = `${table.name}.${name}`
for (let row of results) { for (let row of results) {
if (typeof row[fullName] === "string") { const columnNames = Object.keys(row)
row[fullName] = JSON.parse(row[fullName]) const fullColumnName = columnNames.find(
column => column.includes(`.${name}`) || column === name
)
if (fullColumnName && typeof row[fullColumnName] === "string") {
row[fullColumnName] = JSON.parse(row[fullColumnName])
} }
if (typeof row[name] === "string") { if (typeof row[name] === "string") {
row[name] = JSON.parse(row[name]) row[name] = JSON.parse(row[name])

12
packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts
View File

@ -68,16 +68,8 @@ export async function processOutputBBReferences(
return value || undefined return value || undefined
} }
let ids: string[] = [] const ids =
if (typeof value === "string") { typeof value === "string" ? value.split(",").filter(id => !!id) : value
try {
ids = JSON.parse(value)
} catch (err) {
ids = value.split(",").filter(id => !!id)
}
} else if (Array.isArray(value)) {
ids = value
}
switch (subtype) { switch (subtype) {
case FieldSubtype.USER: case FieldSubtype.USER: