kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(frontend): fix DB studio when columns have space in their names (#3126)

Browse Source
This commit is contained in:
Faton Ramadani
2024-02-01 14:08:26 +01:00
committed by GitHub
parent b9d5506793
commit 8a8a30c5ec
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/lib/components/apps/components/display/dbtable/utils.ts
View File

@@ -13,7 +13,7 @@ export function makeQuery(
const filteredColumns = tableMetadata
.filter((x) => x != undefined)
.map((column) => `${column?.field}::text`)
.map((column) => `"${column?.field}"::text`)
let selectClause = filteredColumns.join(', ')
@@ -22,8 +22,8 @@ export function makeQuery(
.map(
(column) =>
`
(CASE WHEN $4 = '${column.field}' AND $5 IS false THEN ${column.field}::text END),
(CASE WHEN $4 = '${column.field}' AND $5 IS true THEN ${column.field}::text END) DESC`
(CASE WHEN $4 = '${column.field}' AND $5 IS false THEN "${column.field}"::text END),
(CASE WHEN $4 = '${column.field}' AND $5 IS true THEN "${column.field}"::text END) DESC`
)
.join(',\n')}`
@@ -34,11 +34,11 @@ export function makeQuery(
-- $4 orderBy
-- $5 is_desc
SELECT ${selectClause} FROM ${table} WHERE `
SELECT ${selectClause} FROM "${table}" WHERE `
if (whereClause) {
query += ` ${whereClause} AND `
}
query += ` ($3 = '' OR ${table}::text ILIKE '%' || $3 || '%')`
query += ` ($3 = '' OR "${table}"::text ILIKE '%' || $3 || '%')`
query += ` ORDER BY ${orderBy}`
query += ` LIMIT $1::INT OFFSET $2::INT`