From 42a21586aaf8091ab59ee386dee7100e857398ec Mon Sep 17 00:00:00 2001 From: Erik Michelson Date: Thu, 14 May 2026 01:09:03 +0200 Subject: [PATCH] fix(revisions): cleanup schedule failed due to ambigous columns in SQL 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 --- backend/src/revisions/revisions.service.spec.ts | 6 +++--- backend/src/revisions/revisions.service.ts | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/src/revisions/revisions.service.spec.ts b/backend/src/revisions/revisions.service.spec.ts index ab3e54478..e36b6b42c 100644 --- a/backend/src/revisions/revisions.service.spec.ts +++ b/backend/src/revisions/revisions.service.spec.ts @@ -563,10 +563,10 @@ describe('RevisionsService', () => { mockSelect( tracker, [ - FieldNameRevision.uuid, + `${TableRevision}"."${FieldNameRevision.uuid}`, `${TableRevision}"."${FieldNameRevision.noteId}`, - FieldNameRevision.content, - FieldNameAlias.alias, + `${TableRevision}"."${FieldNameRevision.content}`, + `${TableAlias}"."${FieldNameAlias.alias}`, ], TableRevision, [FieldNameRevision.noteId, FieldNameAlias.isPrimary], diff --git a/backend/src/revisions/revisions.service.ts b/backend/src/revisions/revisions.service.ts index f23f55045..d1136883c 100644 --- a/backend/src/revisions/revisions.service.ts +++ b/backend/src/revisions/revisions.service.ts @@ -479,16 +479,16 @@ export class RevisionsService { `${TableRevision}.${FieldNameRevision.noteId}`, ) .select( - FieldNameRevision.uuid, + `${TableRevision}.${FieldNameRevision.uuid}`, `${TableRevision}.${FieldNameRevision.noteId}`, - FieldNameRevision.content, - FieldNameAlias.alias, + `${TableRevision}.${FieldNameRevision.content}`, + `${TableAlias}.${FieldNameAlias.alias}`, ) - .whereIn(FieldNameRevision.noteId, uniqueNoteIds) - .andWhere(FieldNameAlias.isPrimary, true) + .whereIn(`${TableRevision}.${FieldNameRevision.noteId}`, uniqueNoteIds) + .andWhere(`${TableAlias}.${FieldNameAlias.isPrimary}`, true) .orderBy([ - { column: FieldNameRevision.noteId }, - { column: FieldNameRevision.createdAt, order: 'ASC' }, + { column: `${TableRevision}.${FieldNameRevision.noteId}` }, + { column: `${TableRevision}.${FieldNameRevision.createdAt}`, order: 'ASC' }, ]); let lastNoteId = -1;