WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-28 04:25:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

UBERF-12146: fix queries with lookup conditions (#9495)

Browse Source 
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
This commit is contained in:
Alexey Zinoviev
2025-07-08 16:10:59 +07:00
committed by GitHub
parent 758bb2966a
commit 7b921eeeac
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/postgres/src/storage.ts
+11 -10
View File
@@ -841,15 +841,15 @@ abstract class PostgresAdapterBase implements DbAdapter {
): void {
const baseDomain = parentAlias ?? translateDomain(this.hierarchy.getDomain(clazz))
for (const _key in lookup) {
const key = escape(_key)
if (key === '_id') {
if (_key === '_id') {
this.getReverseLookupValue(baseDomain, lookup, res, parentKey)
continue
}
const value = (lookup as any)[key]
const value = (lookup as any)[_key]
const _class = Array.isArray(value) ? value[0] : value
const nested = Array.isArray(value) ? value[1] : undefined
const domain = translateDomain(this.hierarchy.getDomain(_class))
const key = escape(_key)
if (this.isArrayLookup(clazz, key)) {
this.getArrayLookup(baseDomain, key, _class, res, domain, parentKey)
continue
@@ -945,13 +945,14 @@ abstract class PostgresAdapterBase implements DbAdapter {
joins: JoinProps[]
): string {
const res: string[] = []
for (const key in sort) {
const val = sort[key]
for (const _key in sort) {
const val = sort[_key]
if (val === undefined) {
continue
}
if (typeof val === 'number') {
const attr = this.hierarchy.findAttribute(_class, key)
const attr = this.hierarchy.findAttribute(_class, _key)
const key = escape(_key)
if (attr !== undefined && NumericTypes.includes(attr.type._class)) {
res.push(`(${this.getKey(_class, baseDomain, key, joins)})::numeric ${val === 1 ? 'ASC' : 'DESC'}`)
} else {
@@ -983,15 +984,15 @@ abstract class PostgresAdapterBase implements DbAdapter {
query._class = this.fillClass(_class, query) as any
}
for (const _key in query) {
const key = escape(_key)
if (options?.skipSpace === true && key === 'space') {
if (options?.skipSpace === true && _key === 'space') {
continue
}
if (options?.skipClass === true && key === '_class') {
if (options?.skipClass === true && _key === '_class') {
continue
}
const value = query[key]
const value = query[_key]
if (value === undefined) continue
const key = escape(_key)
const valueType = this.getValueType(_class, key)
const tkey = this.getKey(_class, baseDomain, key, joins, valueType === 'dataArray')
const translated = this.translateQueryValue(vars, tkey, value, valueType)
server/postgres/src/utils.ts
+1 -1
View File
@@ -499,7 +499,7 @@ export function escape<T> (str: T): T {
// Remove all characters except a-z, A-Z, 0-9 and _ .
// Add cyrillic for support old custom attributes
// eslint-disable-next-line no-useless-escape
return str.replace(/[^a-zA-ZА-Яа-яЁё0-9_.:\- ]/g, '') as T
return str.replace(/[^a-zA-ZА-Яа-яЁё0-9_.:\-\$ ]/g, '') as T
}
return str
}