mirror of
https://github.com/directus/directus.git
synced 2026-04-25 03:00:53 -04: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>
98 lines
3.0 KiB
TypeScript
98 lines
3.0 KiB
TypeScript
import { Relation, SchemaOverview } from '@directus/shared/types';
|
|
import { getRelationInfo } from './get-relation-info';
|
|
import { InvalidQueryException } from '../exceptions';
|
|
|
|
export type AliasMap = { [key: string]: { alias: string; collection: string } };
|
|
|
|
export type ColPathProps = {
|
|
path: string[];
|
|
collection: string;
|
|
aliasMap: AliasMap;
|
|
relations: Relation[];
|
|
schema?: SchemaOverview;
|
|
};
|
|
|
|
export type ColPathResult = {
|
|
columnPath: string;
|
|
targetCollection: string;
|
|
addNestedPkField?: string;
|
|
};
|
|
|
|
/**
|
|
* Converts a Directus field list path to the correct SQL names based on the constructed alias map.
|
|
* For example: ['author', 'role', 'name'] -> 'ljnsv.name'
|
|
* Also returns the target collection of the column: 'directus_roles'
|
|
* If the last filter path is an alias field, a nested PK is appended to the path
|
|
*/
|
|
export function getColumnPath({ path, collection, aliasMap, relations, schema }: ColPathProps) {
|
|
return followRelation(path);
|
|
|
|
function followRelation(
|
|
pathParts: string[],
|
|
parentCollection: string = collection,
|
|
parentFields?: string,
|
|
addNestedPkField?: string
|
|
): ColPathResult {
|
|
/**
|
|
* For A2M fields, the path can contain an optional collection scope <field>:<scope>
|
|
*/
|
|
const pathRoot = pathParts[0].split(':')[0];
|
|
const { relation, relationType } = getRelationInfo(relations, parentCollection, pathRoot);
|
|
|
|
if (!relation) {
|
|
throw new InvalidQueryException(`"${parentCollection}.${pathRoot}" is not a relational field`);
|
|
}
|
|
|
|
const alias = parentFields ? aliasMap[`${parentFields}.${pathParts[0]}`]?.alias : aliasMap[pathParts[0]]?.alias;
|
|
const remainingParts = pathParts.slice(1);
|
|
|
|
let parent: string;
|
|
|
|
if (relationType === 'a2o') {
|
|
const pathScope = pathParts[0].split(':')[1];
|
|
|
|
if (!pathScope) {
|
|
throw new InvalidQueryException(`You have to provide a collection scope when sorting on a many-to-any item`);
|
|
}
|
|
|
|
parent = pathScope;
|
|
} else if (relationType === 'm2o') {
|
|
parent = relation.related_collection!;
|
|
} else {
|
|
parent = relation.collection;
|
|
}
|
|
|
|
// Top level alias field
|
|
if (schema && !((remainingParts[0] ?? parent).includes('(') && (remainingParts[0] ?? parent).includes(')'))) {
|
|
if (remainingParts.length === 0) {
|
|
remainingParts.push(schema.collections[parent].primary);
|
|
addNestedPkField = schema.collections[parent].primary;
|
|
}
|
|
// Nested level alias field
|
|
else if (remainingParts.length === 1 && schema.collections[parent].fields[remainingParts[0]].type === 'alias') {
|
|
remainingParts.push(schema.collections[relation!.related_collection!].primary);
|
|
addNestedPkField = schema.collections[relation!.related_collection!].primary;
|
|
}
|
|
}
|
|
|
|
if (remainingParts.length === 1) {
|
|
return {
|
|
columnPath: `${alias || parent}.${remainingParts[0]}`,
|
|
targetCollection: parent,
|
|
addNestedPkField,
|
|
};
|
|
}
|
|
|
|
if (remainingParts.length) {
|
|
return followRelation(
|
|
remainingParts,
|
|
parent,
|
|
`${parentFields ? parentFields + '.' : ''}${pathParts[0]}`,
|
|
addNestedPkField
|
|
);
|
|
}
|
|
|
|
return { columnPath: '', targetCollection: '', addNestedPkField };
|
|
}
|
|
}
|