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

Resolve merge conflicts.

This commit is contained in:
Sam Rose 2024-09-04 16:24:19 +01:00
parent 12db64513b 79de7b2c45
commit e90aff959f
No known key found for this signature in database
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/backend-core/src/sql/sql.ts
View File

@ -913,25 +913,21 @@ class InternalBuilder {
const fieldList: string = relationshipFields const fieldList: string = relationshipFields
.map(field => jsonField(field)) .map(field => jsonField(field))
.join(",") .join(",")
let select: Knex.Raw, limit: number let select: Knex.Raw
switch (sqlClient) { switch (sqlClient) {
case SqlClient.SQL_LITE: case SqlClient.SQL_LITE:
select = this.knex.raw(`json_group_array(json_object(${fieldList}))`) select = this.knex.raw(`json_group_array(json_object(${fieldList}))`)
limit = getBaseLimit()
break break
case SqlClient.POSTGRES: case SqlClient.POSTGRES:
select = this.knex.raw(`json_agg(json_build_object(${fieldList}))`) select = this.knex.raw(`json_agg(json_build_object(${fieldList}))`)
limit = 1
break break
case SqlClient.MY_SQL: case SqlClient.MY_SQL:
case SqlClient.ORACLE: case SqlClient.ORACLE:
select = this.knex.raw(`json_arrayagg(json_object(${fieldList}))`) select = this.knex.raw(`json_arrayagg(json_object(${fieldList}))`)
limit = getBaseLimit()
break break
case SqlClient.MS_SQL: case SqlClient.MS_SQL:
// Cursed, needs some code later instead // Cursed, needs some code later instead
select = this.knex.raw(`*`) select = this.knex.raw(`*`)
limit = getBaseLimit()
break break
default: default:
throw new Error(`JSON relationships not implement for ${this.client}`) throw new Error(`JSON relationships not implement for ${this.client}`)
@ -940,16 +936,12 @@ class InternalBuilder {
// it reduces the result set rather than limiting how much data it filters over // it reduces the result set rather than limiting how much data it filters over
const primaryKey = `${toAlias}.${toPrimary || toKey}` const primaryKey = `${toAlias}.${toPrimary || toKey}`
let subQuery: Knex.QueryBuilder | Knex.Raw = this.knex let subQuery: Knex.QueryBuilder | Knex.Raw = this.knex
.select(select) .select(`${toAlias}.*`)
.from(toTableWithSchema) .from(toTableWithSchema)
.limit(limit) .limit(getBaseLimit())
// add sorting to get consistent order // add sorting to get consistent order
.orderBy(primaryKey) .orderBy(primaryKey)
if (sqlClient === SqlClient.POSTGRES) {
subQuery = subQuery.groupBy(primaryKey)
}
// many-to-many relationship with junction table // many-to-many relationship with junction table
if (throughTable && toPrimary && fromPrimary) { if (throughTable && toPrimary && fromPrimary) {
const throughAlias = aliases?.[throughTable] || throughTable const throughAlias = aliases?.[throughTable] || throughTable
@ -987,7 +979,11 @@ class InternalBuilder {
) )
} }
query = query.select({ [relationship.column]: subQuery }) // @ts-ignore - the from alias syntax isn't in Knex typing
const wrapperQuery = this.knex.select(select).from({
[toAlias]: subQuery,
})
query = query.select({ [relationship.column]: wrapperQuery })
} }
return query return query
} }