mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2026-08-07 07:14:49 +00:00
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 <github@erik.michelson.eu>
This commit is contained in:
@@ -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],
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user