homelab/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2026-08-07 07:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(revisions): cleanup schedule failed due to ambigous columns in SQL

Browse Source 
The generated SQL from Knex contained ambigous column names, resulting
in failure in the real-world since these queries were rejected by the
SQLite library. This patch fixes the problem by properly making all
column names explicit.

Signed-off-by: Erik Michelson <github@erik.michelson.eu>
This commit is contained in:
Erik Michelson
2026-05-14 01:09:03 +02:00
parent d38b99887d
commit 42a21586aa
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/revisions/revisions.service.spec.ts
+3 -3
View File
@@ -563,10 +563,10 @@ describe('RevisionsService', () => {
mockSelect( mockSelect(
tracker, tracker,
[ [
FieldNameRevision.uuid, `${TableRevision}"."${FieldNameRevision.uuid}`,
`${TableRevision}"."${FieldNameRevision.noteId}`, `${TableRevision}"."${FieldNameRevision.noteId}`,
FieldNameRevision.content, `${TableRevision}"."${FieldNameRevision.content}`,
FieldNameAlias.alias, `${TableAlias}"."${FieldNameAlias.alias}`,
], ],
TableRevision, TableRevision,
[FieldNameRevision.noteId, FieldNameAlias.isPrimary], [FieldNameRevision.noteId, FieldNameAlias.isPrimary],
backend/src/revisions/revisions.service.ts
+7 -7
View File
@@ -479,16 +479,16 @@ export class RevisionsService {
`${TableRevision}.${FieldNameRevision.noteId}`, `${TableRevision}.${FieldNameRevision.noteId}`,
) )
.select( .select(
FieldNameRevision.uuid, `${TableRevision}.${FieldNameRevision.uuid}`,
`${TableRevision}.${FieldNameRevision.noteId}`, `${TableRevision}.${FieldNameRevision.noteId}`,
FieldNameRevision.content, `${TableRevision}.${FieldNameRevision.content}`,
FieldNameAlias.alias, `${TableAlias}.${FieldNameAlias.alias}`,
) )
.whereIn(FieldNameRevision.noteId, uniqueNoteIds) .whereIn(`${TableRevision}.${FieldNameRevision.noteId}`, uniqueNoteIds)
.andWhere(FieldNameAlias.isPrimary, true) .andWhere(`${TableAlias}.${FieldNameAlias.isPrimary}`, true)
.orderBy([ .orderBy([
{ column: FieldNameRevision.noteId }, { column: `${TableRevision}.${FieldNameRevision.noteId}` },
{ column: FieldNameRevision.createdAt, order: 'ASC' }, { column: `${TableRevision}.${FieldNameRevision.createdAt}`, order: 'ASC' },
]); ]);
let lastNoteId = -1; let lastNoteId = -1;