mirror of
https://github.com/directus/directus.git
synced 2026-02-14 17:25:28 -05:00
* Speed query up by reusing existing aliases which reduces table joins * Use subquery in top level m2o to remove duplicates * Fix linting * Apply distinct on primary key field in subqueries * Use distinct instead as there are only primary keys * Apply subquery on top level * Try remove sub sub query * Test if working for all vendors * Add support for _none and _some * Use subquery only when field depth > 1 * Add tests * Use original table names for columns with functions (#14690) * Use original table names for columns with functions * Extract filter function path parsing as shared util * Fix filter function path when adding node * Pass the originalCollectionName into filter functions * Update unit test * Replace functions within deep GraphQL * Fix invalid operator error for _none and _some * Add filter function tests * Revert triggering for all vendors * Simplify aliasMap * Replace functions in filter within GraphQL aggregate query * Add API support for filtering of alias field * Mark schema as optional * Shift logical operators upwards * Separate recursive parseFilter * Rework shifting of logical operators * Error on invalid usage of _none and _some * Use inner join to preserve sort order * Run tests for all vendors * Reuse aliasMap for sort and filter * Sort on top level query * Remove unnecessary limit on wrapper query * Refactor applyQuery options * Remove duplicates from nested multi relational sort * Fix offset in MSSQL requiring OrderBy * Disable schema cache * Use inner query only for nested sort or multi relational filter * Fix MSSQL duplicate order column * Use inner query only for multi relational * Additional integration tests * Order within partition for multi relational sorts * Rename to directus_row_number * Fix unit test * Add base sort and filter tests * Fix Oracle uppercased rowNumber column * Fix unit test * Fix top level query sort with function * Parse functions in inner query * Increase clarity with knex.ref() * Remove sort filter for top level primary key * Fix unit test * Bypass queries with groupBy * Add collection to aliasMap to fix functions in nested sort * Fix multi relational sort with functions * Add tests for filter and sort with functions * Fix accidental deletion of brackets * Fix top level alias filter node interface * Update M2M sort tests * Add M2A tests * Cast m2a primary key as varchar2 for oracle * Enable filtering tests for M2A * Fix prototype polluting assignment in aliasMap * Remove unnecessary currentKey * Simplify code to increase readability Co-authored-by: Brainslug <br41nslug@users.noreply.github.com> * Fix linting and missing 'this' error * Revert optional chaining * Add mysql5 to tests * Fix mysql5 missing rowNumber() * Overcome indexing delays in MySQL5 * Verify MySQL5 sorting is in order as the result count varies between runs * Skip joining when sorting field already exists * Simplify variable assignment Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> * Fix linting * Reduce duplicate logic with vars * Transform _func fields in GraphQL only for valid functions * Fix unit test * Fix unsupported date_part() in CrDB Co-authored-by: Brainslug <br41nslug@users.noreply.github.com> Co-authored-by: Roger Stringer <roger@directus.io> Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> Co-authored-by: Rijk van Zanten <rijkvanzanten@me.com>
253 lines
6.4 KiB
TypeScript
253 lines
6.4 KiB
TypeScript
import { getColumnPath, ColPathProps } from '../../src/utils/get-column-path';
|
|
import { InvalidQueryException } from '../../src/exceptions';
|
|
import { DeepPartial } from '@directus/shared/types';
|
|
import { test, expect } from 'vitest';
|
|
|
|
/*
|
|
{
|
|
path: [ 'author', 'role', 'name' ],
|
|
collection: 'articles',
|
|
aliasMap: {
|
|
author: { alias: 'grenv', collection: 'directus_users' },
|
|
'author.role': { alias: 'ljnsv', collection: 'directus_roles' },
|
|
},
|
|
relations: []
|
|
|
|
ljnsv.name
|
|
|
|
{
|
|
path: [ 'author', 'first_name' ],
|
|
collection: 'articles',
|
|
aliasMap: { author: { alias: 'rnmxt', collection: 'authors' } },
|
|
relations: []
|
|
|
|
rnmxt.first_name
|
|
|
|
{
|
|
path: [ 'item:headings', 'text' ],
|
|
collection: 'pages_sections',
|
|
aliasMap: { 'item:headings': { alias: 'yllus', collection: 'headings' } },
|
|
relations: []
|
|
|
|
yllus.text
|
|
*/
|
|
|
|
test('Throws an error when the field path is not known in relations', () => {
|
|
const input = {
|
|
path: ['author', 'first_name'],
|
|
collection: 'articles',
|
|
aliasMap: {},
|
|
relations: [],
|
|
};
|
|
|
|
expect(() => getColumnPath(input)).toThrowError(InvalidQueryException);
|
|
});
|
|
|
|
test('Throws an error when an a2o is used without a collection scope', () => {
|
|
const input = {
|
|
path: ['item', 'type'],
|
|
collection: 'pages',
|
|
aliasMap: {},
|
|
relations: [
|
|
{
|
|
collection: 'pages',
|
|
field: 'item',
|
|
related_collection: null,
|
|
meta: {
|
|
one_collection_field: 'collection',
|
|
one_allowed_collections: ['paragraphs', 'headings'],
|
|
},
|
|
},
|
|
],
|
|
} as ColPathProps;
|
|
|
|
expect(() => getColumnPath(input)).toThrowError(InvalidQueryException);
|
|
});
|
|
|
|
test('Extracts path scope and returns correct alias for a2o', () => {
|
|
const input: DeepPartial<ColPathProps> = {
|
|
path: ['item:headings', 'text'],
|
|
collection: 'pages',
|
|
aliasMap: { 'item:headings': { alias: 'abcdef', collection: 'headings' } },
|
|
relations: [
|
|
{
|
|
collection: 'pages',
|
|
field: 'item',
|
|
related_collection: null,
|
|
meta: {
|
|
one_collection_field: 'collection',
|
|
one_allowed_collections: ['paragraphs', 'headings'],
|
|
},
|
|
},
|
|
],
|
|
};
|
|
|
|
const result = getColumnPath(input as ColPathProps);
|
|
expect(result.columnPath).toBe('abcdef.text');
|
|
expect(result.targetCollection).toBe('headings');
|
|
});
|
|
|
|
test('Returns correct alias for m2o', () => {
|
|
const input: DeepPartial<ColPathProps> = {
|
|
path: ['author', 'role', 'name'],
|
|
collection: 'articles',
|
|
aliasMap: {
|
|
author: { alias: 'ljnsv', collection: 'directus_users' },
|
|
'author.role': { alias: 'grenv', collection: 'directus_roles' },
|
|
},
|
|
relations: [
|
|
{
|
|
collection: 'articles',
|
|
field: 'author',
|
|
related_collection: 'directus_users',
|
|
meta: null,
|
|
schema: null,
|
|
},
|
|
{
|
|
collection: 'directus_users',
|
|
field: 'role',
|
|
related_collection: 'directus_roles',
|
|
meta: null,
|
|
schema: null,
|
|
},
|
|
],
|
|
};
|
|
|
|
const result = getColumnPath(input as ColPathProps);
|
|
expect(result.columnPath).toBe('grenv.name');
|
|
expect(result.targetCollection).toBe('directus_roles');
|
|
});
|
|
|
|
test('Returns correct alias for o2m', () => {
|
|
const input: DeepPartial<ColPathProps> = {
|
|
path: ['categories', 'category_id', 'name'],
|
|
collection: 'articles',
|
|
aliasMap: {
|
|
categories: { alias: 'aaaa', collection: 'categories_articles' },
|
|
'categories.category_id': { alias: 'bbbb', collection: 'categories' },
|
|
},
|
|
relations: [
|
|
{
|
|
collection: 'categories_articles',
|
|
field: 'category_id',
|
|
related_collection: 'categories',
|
|
meta: null,
|
|
schema: null,
|
|
},
|
|
{
|
|
collection: 'categories_articles',
|
|
field: 'article_id',
|
|
related_collection: 'articles',
|
|
meta: {
|
|
one_field: 'categories',
|
|
},
|
|
schema: null,
|
|
},
|
|
],
|
|
};
|
|
|
|
const result = getColumnPath(input as ColPathProps);
|
|
expect(result.columnPath).toBe('bbbb.name');
|
|
expect(result.targetCollection).toBe('categories');
|
|
});
|
|
|
|
test('Returns correct alias for nested o2m', () => {
|
|
const input: DeepPartial<ColPathProps> = {
|
|
path: ['articles', 'article_id', 'articles', 'article_id', 'name'],
|
|
collection: 'article',
|
|
aliasMap: {
|
|
articles: { alias: 'aaaa', collection: 'article' },
|
|
'articles.article_id': { alias: 'bbbb', collection: 'article' },
|
|
'articles.article_id.articles': { alias: 'cccc', collection: 'article' },
|
|
'articles.article_id.articles.article_id': { alias: 'dddd', collection: 'article' },
|
|
},
|
|
relations: [
|
|
{
|
|
collection: 'articles_o2m',
|
|
field: 'article_id',
|
|
related_collection: 'article',
|
|
meta: {
|
|
many_collection: 'articles_o2m',
|
|
many_field: 'article_id',
|
|
one_collection: 'article',
|
|
one_field: 'articles',
|
|
},
|
|
schema: null,
|
|
},
|
|
],
|
|
};
|
|
|
|
const result = getColumnPath(input as ColPathProps);
|
|
expect(result.columnPath).toBe('dddd.name');
|
|
expect(result.targetCollection).toBe('article');
|
|
});
|
|
|
|
test('Returns correct alias for o2m (& uses the table name if no alias exists)', () => {
|
|
const input: DeepPartial<ColPathProps> = {
|
|
path: ['categories', 'category_id', 'name'],
|
|
collection: 'articles',
|
|
aliasMap: {},
|
|
relations: [
|
|
{
|
|
collection: 'categories_articles',
|
|
field: 'category_id',
|
|
related_collection: 'categories',
|
|
meta: null,
|
|
schema: null,
|
|
},
|
|
{
|
|
collection: 'categories_articles',
|
|
field: 'article_id',
|
|
related_collection: 'articles',
|
|
meta: {
|
|
one_field: 'categories',
|
|
},
|
|
schema: null,
|
|
},
|
|
],
|
|
};
|
|
|
|
const result = getColumnPath(input as ColPathProps);
|
|
expect(result.columnPath).toBe('categories.name');
|
|
expect(result.targetCollection).toBe('categories');
|
|
});
|
|
|
|
test('Returns correct alias when there are multiple joins to the same table', () => {
|
|
const input: DeepPartial<ColPathProps> = {
|
|
path: ['author', 'secondary_role', 'name'],
|
|
collection: 'articles',
|
|
aliasMap: {
|
|
author: { alias: 'ljnsv', collection: 'directus_users' },
|
|
'author.role': { alias: 'grenv', collection: 'directus_roles' },
|
|
'author.secondary_role': { alias: 'psgwn', collection: 'directus_roles' },
|
|
},
|
|
relations: [
|
|
{
|
|
collection: 'articles',
|
|
field: 'author',
|
|
related_collection: 'directus_users',
|
|
meta: null,
|
|
schema: null,
|
|
},
|
|
{
|
|
collection: 'directus_users',
|
|
field: 'role',
|
|
related_collection: 'directus_roles',
|
|
meta: null,
|
|
schema: null,
|
|
},
|
|
{
|
|
collection: 'directus_users',
|
|
field: 'secondary_role',
|
|
related_collection: 'directus_roles',
|
|
meta: null,
|
|
schema: null,
|
|
},
|
|
],
|
|
};
|
|
|
|
const result = getColumnPath(input as ColPathProps);
|
|
expect(result.columnPath).toBe('psgwn.name');
|
|
expect(result.targetCollection).toBe('directus_roles');
|
|
});
|