mirror of
https://github.com/omnivore-app/omnivore.git
synced 2026-03-11 08:54:26 +00:00
fix rebase conflicts
This commit is contained in:
parent
2f7c18b363
commit
0faafa0786
1 changed files with 3 additions and 5 deletions
|
|
@ -647,17 +647,15 @@ export const buildQuery = (
|
|||
args.useFolders
|
||||
)
|
||||
}
|
||||
queryBuilder.where('library_item.user_id = :userId', { userId })
|
||||
|
||||
// add select
|
||||
selects.forEach((select) => {
|
||||
queryBuilder.addSelect(select.column, select.alias)
|
||||
})
|
||||
queryBuilder.select(selects.map((select) => select.column))
|
||||
|
||||
if (args.includeContent) {
|
||||
queryBuilder.addSelect('library_item.readableContent')
|
||||
}
|
||||
|
||||
queryBuilder.where('library_item.user_id = :userId', { userId })
|
||||
|
||||
if (!args.includePending) {
|
||||
queryBuilder.andWhere("library_item.state <> 'PROCESSING'")
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue