github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pass knex instance to applyFilter

Browse Source 
This fixes a regression introduced in #786.
When using a SQLite database, items could not be updated any more.
This is due to knex by default only allowing a single connection for
SQLite databases and the item update operation using applyFilter inside
a transaction which tries to use a different knex instance to connect to
the database.
This commit is contained in:
Nicola Krumschmidt
2020-10-28 00:33:53 +01:00
parent e61429fc66
commit 8b601c5b60
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/src/utils/apply-query.ts
View File

@@ -1,11 +1,17 @@
import { QueryBuilder } from 'knex';
import { Query, Filter } from '../types';
import database, { schemaInspector } from '../database';
import { schemaInspector } from '../database';
import Knex from 'knex';
import { clone, isPlainObject } from 'lodash';
export default async function applyQuery(collection: string, dbQuery: QueryBuilder, query: Query) {
export default async function applyQuery(
knex: Knex,
collection: string,
dbQuery: QueryBuilder,
query: Query
) {
if (query.filter) {
await applyFilter(dbQuery, query.filter, collection);
await applyFilter(knex, dbQuery, query.filter, collection);
}
if (query.sort) {
@@ -46,8 +52,13 @@ export default async function applyQuery(collection: string, dbQuery: QueryBuild
}
}
export async function applyFilter(rootQuery: QueryBuilder, rootFilter: Filter, collection: string) {
const relations = await database.select('*').from('directus_relations');
export async function applyFilter(
knex: Knex,
rootQuery: QueryBuilder,
rootFilter: Filter,
collection: string
) {
const relations = await knex.select('*').from('directus_relations');
addWhereClauses(rootQuery, rootFilter, collection);
addJoins(rootQuery, rootFilter, collection);