wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-06-09 09:20:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix invalid sql query from findAll with empty sort (#9135)

Browse Source 
* Add test for empty sort for findAll in postgres
* Do not add ORDER BY without order fields

---------

Signed-off-by: Nikolay Marchuk <nikolay.marchuk@hardcoreeng.com>
This commit is contained in:
Nikolay Marchuk 2025-05-30 00:02:56 +07:00 committed by GitHub
parent b6e8fdd409
commit 73f7cfc11b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/postgres/src/__tests__/storage.test.ts
View File

@ -247,6 +247,9 @@ describe('postgres operations', () => {
const sortDesc = await client.findAll(taskPlugin.class.Task, {}, { sort: { name: SortingOrder.Descending } })
expect(sortDesc[0].name).toMatch('my-task-4')
const sortEmpty = await client.findAll(taskPlugin.class.Task, {}, { sort: {} })
expect(sortEmpty).toHaveLength(5)
})
it('check attached', async () => {

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

@ -522,7 +522,11 @@ abstract class PostgresAdapterBase implements DbAdapter {
// todo handle custom sorting
}
}
return `ORDER BY ${res.join(', ')}`
if (res.length > 0) {
return `ORDER BY ${res.join(', ')}`
} else {
return ''
}
}
buildRawQuery<T extends Doc>(
@ -1170,7 +1174,11 @@ abstract class PostgresAdapterBase implements DbAdapter {
// todo handle custom sorting
}
}
return `ORDER BY ${res.join(', ')}`
if (res.length > 0) {
return `ORDER BY ${res.join(', ')}`
} else {
return ''
}
}
private buildQuery<T extends Doc>(