wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-16 21:35:10 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

QFIX: PG query (#7758)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2025-01-22 19:22:50 +07:00 committed by GitHub
parent 5ace5b744b
commit 82a9204076
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/postgres/src/storage.ts
View File

@ -80,6 +80,7 @@ import {
createTables, createTables,
DBCollectionHelper, DBCollectionHelper,
type DBDoc, type DBDoc,
dbExtra,
getDBClient, getDBClient,
getPrepare, getPrepare,
inferType, inferType,
@ -673,7 +674,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
sqlChunks.push(secJoin) sqlChunks.push(secJoin)
} }
if (joins.length > 0) { if (joins.length > 0) {
sqlChunks.push(this.buildJoinString(joins)) sqlChunks.push(this.buildJoinString(vars, joins))
} }
sqlChunks.push(`WHERE ${this.buildQuery(vars, _class, domain, query, joins, options)}`) sqlChunks.push(`WHERE ${this.buildQuery(vars, _class, domain, query, joins, options)}`)
@ -699,7 +700,9 @@ abstract class PostgresAdapterBase implements DbAdapter {
const finalSql: string = [select, ...sqlChunks].join(' ') const finalSql: string = [select, ...sqlChunks].join(' ')
fquery = finalSql fquery = finalSql
const result = await connection.unsafe(finalSql, vars.getValues(), getPrepare()) const result = dbExtra?.useCF
? await connection.unsafe(vars.injectVars(finalSql), undefined, { prepare: false })
: await connection.unsafe(finalSql, vars.getValues(), getPrepare())
if ( if (
options?.lookup === undefined && options?.lookup === undefined &&
options?.domainLookup === undefined && options?.domainLookup === undefined &&
@ -934,19 +937,19 @@ abstract class PostgresAdapterBase implements DbAdapter {
} }
} }
private buildJoinString (value: JoinProps[]): string { private buildJoinString (vars: ValuesVariables, value: JoinProps[]): string {
const res: string[] = [] const res: string[] = []
for (const val of value) { for (const val of value) {
if (val.isReverse) continue if (val.isReverse) continue
if (val.table === DOMAIN_MODEL) continue if (val.table === DOMAIN_MODEL) continue
res.push( res.push(
`LEFT JOIN ${val.table} AS ${val.toAlias} ON ${val.fromAlias}.${val.fromField} = ${val.toAlias}."${val.toField}" AND ${val.toAlias}."workspaceId" = '${this.workspaceId.name}'` `LEFT JOIN ${val.table} AS ${val.toAlias} ON ${val.fromAlias}.${val.fromField} = ${val.toAlias}."${val.toField}" AND ${val.toAlias}."workspaceId" = ${vars.add(this.workspaceId.name, '::uuid')}`
) )
if (val.classes !== undefined) { if (val.classes !== undefined) {
if (val.classes.length === 1) { if (val.classes.length === 1) {
res.push(`AND ${val.toAlias}._class = '${val.classes[0]}'`) res.push(`AND ${val.toAlias}._class = ${vars.add(val.classes[0], '::text')}`)
} else { } else {
res.push(`AND ${val.toAlias}._class IN (${val.classes.map((c) => `'${c}'`).join(', ')})`) res.push(`AND ${val.toAlias}._class = ANY (${vars.addArray(val.classes, '::text[]')})`)
} }
} }
} }
@ -1251,7 +1254,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
} }
private translateQueryValue (vars: ValuesVariables, tkey: string, value: any, type: ValueType): string | undefined { private translateQueryValue (vars: ValuesVariables, tkey: string, value: any, type: ValueType): string | undefined {
const tkeyData = tkey.includes('data->') || tkey.includes('data#>>') const tkeyData = tkey.includes('data') && (tkey.includes('->') || tkey.includes('#>>'))
if (tkeyData && (Array.isArray(value) || (typeof value !== 'object' && typeof value !== 'string'))) { if (tkeyData && (Array.isArray(value) || (typeof value !== 'object' && typeof value !== 'string'))) {
value = Array.isArray(value) ? value.map((it) => (it == null ? null : `${it}`)) : `${value}` value = Array.isArray(value) ? value.map((it) => (it == null ? null : `${it}`)) : `${value}`
} }