directus 9.7.1 → 9.9.1

package/dist/database/helpers/fn/dialects/mssql.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FnHelperMSSQL = void 0;
+const types_1 = require("../types");
+class FnHelperMSSQL extends types_1.FnHelper {
+    year(table, column) {
+        return this.knex.raw('DATEPART(year, ??.??)', [table, column]);
+    }
+    month(table, column) {
+        return this.knex.raw('DATEPART(month, ??.??)', [table, column]);
+    }
+    week(table, column) {
+        return this.knex.raw('DATEPART(week, ??.??)', [table, column]);
+    }
+    day(table, column) {
+        return this.knex.raw('DATEPART(day, ??.??)', [table, column]);
+    }
+    weekday(table, column) {
+        return this.knex.raw('DATEPART(weekday, ??.??)', [table, column]);
+    }
+    hour(table, column) {
+        return this.knex.raw('DATEPART(hour, ??.??)', [table, column]);
+    }
+    minute(table, column) {
+        return this.knex.raw('DATEPART(minute, ??.??)', [table, column]);
+    }
+    second(table, column) {
+        return this.knex.raw('DATEPART(second, ??.??)', [table, column]);
+    }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            return this.knex.raw(`(SELECT COUNT(*) FROM OPENJSON(??.??, '$'))`, [table, column]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
+}
+exports.FnHelperMSSQL = FnHelperMSSQL;

package/dist/database/helpers/{date/dialects/postgres.d.ts → fn/dialects/mysql.d.ts}

@@ -1,6 +1,6 @@
-import { DateHelper } from '../types';
+import { FnHelper } from '../types';
 import { Knex } from 'knex';
-export declare class DateHelperPostgres extends DateHelper {
+export declare class FnHelperMySQL extends FnHelper {
     year(table: string, column: string): Knex.Raw;
     month(table: string, column: string): Knex.Raw;
     week(table: string, column: string): Knex.Raw;
@@ -9,4 +9,5 @@ export declare class DateHelperPostgres extends DateHelper {
     hour(table: string, column: string): Knex.Raw;
     minute(table: string, column: string): Knex.Raw;
     second(table: string, column: string): Knex.Raw;
+    count(table: string, column: string): Knex.Raw;
 }

package/dist/database/helpers/fn/dialects/mysql.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FnHelperMySQL = void 0;
+const types_1 = require("../types");
+class FnHelperMySQL extends types_1.FnHelper {
+    year(table, column) {
+        return this.knex.raw('YEAR(??.??)', [table, column]);
+    }
+    month(table, column) {
+        return this.knex.raw('MONTH(??.??)', [table, column]);
+    }
+    week(table, column) {
+        return this.knex.raw('WEEK(??.??)', [table, column]);
+    }
+    day(table, column) {
+        return this.knex.raw('DAYOFMONTH(??.??)', [table, column]);
+    }
+    weekday(table, column) {
+        return this.knex.raw('DAYOFWEEK(??.??)', [table, column]);
+    }
+    hour(table, column) {
+        return this.knex.raw('HOUR(??.??)', [table, column]);
+    }
+    minute(table, column) {
+        return this.knex.raw('MINUTE(??.??)', [table, column]);
+    }
+    second(table, column) {
+        return this.knex.raw('SECOND(??.??)', [table, column]);
+    }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            return this.knex.raw('JSON_LENGTH(??.??)', [table, column]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
+}
+exports.FnHelperMySQL = FnHelperMySQL;

package/dist/database/helpers/fn/dialects/oracle.d.ts

@@ -0,0 +1,13 @@
+import { FnHelper } from '../types';
+import { Knex } from 'knex';
+export declare class FnHelperOracle extends FnHelper {
+    year(table: string, column: string): Knex.Raw;
+    month(table: string, column: string): Knex.Raw;
+    week(table: string, column: string): Knex.Raw;
+    day(table: string, column: string): Knex.Raw;
+    weekday(table: string, column: string): Knex.Raw;
+    hour(table: string, column: string): Knex.Raw;
+    minute(table: string, column: string): Knex.Raw;
+    second(table: string, column: string): Knex.Raw;
+    count(table: string, column: string): Knex.Raw<any>;
+}

package/dist/database/helpers/fn/dialects/oracle.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FnHelperOracle = void 0;
+const types_1 = require("../types");
+class FnHelperOracle extends types_1.FnHelper {
+    year(table, column) {
+        return this.knex.raw("TO_CHAR(??.??, 'IYYY')", [table, column]);
+    }
+    month(table, column) {
+        return this.knex.raw("TO_CHAR(??.??, 'MM')", [table, column]);
+    }
+    week(table, column) {
+        return this.knex.raw("TO_CHAR(??.??, 'IW')", [table, column]);
+    }
+    day(table, column) {
+        return this.knex.raw("TO_CHAR(??.??, 'DD')", [table, column]);
+    }
+    weekday(table, column) {
+        return this.knex.raw("TO_CHAR(??.??, 'D')", [table, column]);
+    }
+    hour(table, column) {
+        return this.knex.raw("TO_CHAR(??.??, 'HH24')", [table, column]);
+    }
+    minute(table, column) {
+        return this.knex.raw("TO_CHAR(??.??, 'MI')", [table, column]);
+    }
+    second(table, column) {
+        return this.knex.raw("TO_CHAR(??.??, 'SS')", [table, column]);
+    }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            return this.knex.raw("json_value(??.??, '$.size()')", [table, column]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
+}
+exports.FnHelperOracle = FnHelperOracle;

package/dist/database/helpers/fn/dialects/postgres.d.ts

@@ -0,0 +1,13 @@
+import { FnHelper } from '../types';
+import { Knex } from 'knex';
+export declare class FnHelperPostgres extends FnHelper {
+    year(table: string, column: string): Knex.Raw;
+    month(table: string, column: string): Knex.Raw;
+    week(table: string, column: string): Knex.Raw;
+    day(table: string, column: string): Knex.Raw;
+    weekday(table: string, column: string): Knex.Raw;
+    hour(table: string, column: string): Knex.Raw;
+    minute(table: string, column: string): Knex.Raw;
+    second(table: string, column: string): Knex.Raw;
+    count(table: string, column: string): Knex.Raw;
+}

package/dist/database/helpers/{date → fn}/dialects/postgres.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DateHelperPostgres = void 0;
+exports.FnHelperPostgres = void 0;
 const types_1 = require("../types");
-class DateHelperPostgres extends types_1.DateHelper {
+class FnHelperPostgres extends types_1.FnHelper {
     year(table, column) {
         return this.knex.raw('EXTRACT(YEAR FROM ??.??)', [table, column]);
     }
@@ -27,5 +27,20 @@ class DateHelperPostgres extends types_1.DateHelper {
     second(table, column) {
         return this.knex.raw('EXTRACT(SECOND FROM ??.??)', [table, column]);
     }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            const { dbType } = this.schema.collections[table].fields[column];
+            return this.knex.raw(dbType === 'jsonb' ? 'jsonb_array_length(??.??)' : 'json_array_length(??.??)', [
+                table,
+                column,
+            ]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
 }
-exports.DateHelperPostgres = DateHelperPostgres;
+exports.FnHelperPostgres = FnHelperPostgres;

package/dist/database/helpers/fn/dialects/sqlite.d.ts

@@ -0,0 +1,13 @@
+import { FnHelper } from '../types';
+import { Knex } from 'knex';
+export declare class FnHelperSQLite extends FnHelper {
+    year(table: string, column: string): Knex.Raw;
+    month(table: string, column: string): Knex.Raw;
+    week(table: string, column: string): Knex.Raw;
+    day(table: string, column: string): Knex.Raw;
+    weekday(table: string, column: string): Knex.Raw;
+    hour(table: string, column: string): Knex.Raw;
+    minute(table: string, column: string): Knex.Raw;
+    second(table: string, column: string): Knex.Raw;
+    count(table: string, column: string): Knex.Raw<any>;
+}

package/dist/database/helpers/fn/dialects/sqlite.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FnHelperSQLite = void 0;
+const types_1 = require("../types");
+class FnHelperSQLite extends types_1.FnHelper {
+    year(table, column) {
+        return this.knex.raw("CAST(strftime('%Y', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    month(table, column) {
+        return this.knex.raw("CAST(strftime('%m', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    week(table, column) {
+        return this.knex.raw("CAST(strftime('%W', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    day(table, column) {
+        return this.knex.raw("CAST(strftime('%d', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    weekday(table, column) {
+        return this.knex.raw("CAST(strftime('%w', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    hour(table, column) {
+        return this.knex.raw("CAST(strftime('%H', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    minute(table, column) {
+        return this.knex.raw("CAST(strftime('%M', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    second(table, column) {
+        return this.knex.raw("CAST(strftime('%S', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            return this.knex.raw(`json_array_length(??.??, '$')`, [table, column]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
+}
+exports.FnHelperSQLite = FnHelperSQLite;

package/dist/database/helpers/fn/index.d.ts

@@ -0,0 +1,7 @@
+export { FnHelperPostgres as postgres } from './dialects/postgres';
+export { FnHelperPostgres as redshift } from './dialects/postgres';
+export { FnHelperPostgres as cockroachdb } from './dialects/postgres';
+export { FnHelperOracle as oracle } from './dialects/oracle';
+export { FnHelperSQLite as sqlite } from './dialects/sqlite';
+export { FnHelperMySQL as mysql } from './dialects/mysql';
+export { FnHelperMSSQL as mssql } from './dialects/mssql';

package/dist/database/helpers/fn/index.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mssql = exports.mysql = exports.sqlite = exports.oracle = exports.cockroachdb = exports.redshift = exports.postgres = void 0;
+var postgres_1 = require("./dialects/postgres");
+Object.defineProperty(exports, "postgres", { enumerable: true, get: function () { return postgres_1.FnHelperPostgres; } });
+var postgres_2 = require("./dialects/postgres");
+Object.defineProperty(exports, "redshift", { enumerable: true, get: function () { return postgres_2.FnHelperPostgres; } });
+var postgres_3 = require("./dialects/postgres");
+Object.defineProperty(exports, "cockroachdb", { enumerable: true, get: function () { return postgres_3.FnHelperPostgres; } });
+var oracle_1 = require("./dialects/oracle");
+Object.defineProperty(exports, "oracle", { enumerable: true, get: function () { return oracle_1.FnHelperOracle; } });
+var sqlite_1 = require("./dialects/sqlite");
+Object.defineProperty(exports, "sqlite", { enumerable: true, get: function () { return sqlite_1.FnHelperSQLite; } });
+var mysql_1 = require("./dialects/mysql");
+Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return mysql_1.FnHelperMySQL; } });
+var mssql_1 = require("./dialects/mssql");
+Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return mssql_1.FnHelperMSSQL; } });

package/dist/database/helpers/fn/types.d.ts

@@ -0,0 +1,18 @@
+import { SchemaOverview } from '@directus/shared/types';
+import { Knex } from 'knex';
+import { DatabaseHelper } from '../types';
+export declare abstract class FnHelper extends DatabaseHelper {
+    protected knex: Knex;
+    protected schema: SchemaOverview;
+    constructor(knex: Knex, schema: SchemaOverview);
+    abstract year(table: string, column: string): Knex.Raw;
+    abstract month(table: string, column: string): Knex.Raw;
+    abstract week(table: string, column: string): Knex.Raw;
+    abstract day(table: string, column: string): Knex.Raw;
+    abstract weekday(table: string, column: string): Knex.Raw;
+    abstract hour(table: string, column: string): Knex.Raw;
+    abstract minute(table: string, column: string): Knex.Raw;
+    abstract second(table: string, column: string): Knex.Raw;
+    abstract count(table: string, column: string): Knex.Raw;
+    protected _relationalCount(table: string, column: string): Knex.Raw;
+}

package/dist/database/helpers/fn/types.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FnHelper = void 0;
+const types_1 = require("../types");
+class FnHelper extends types_1.DatabaseHelper {
+    constructor(knex, schema) {
+        super(knex);
+        this.knex = knex;
+        this.schema = schema;
+        this.schema = schema;
+    }
+    _relationalCount(table, column) {
+        const relation = this.schema.relations.find((relation) => { var _a; return relation.related_collection === table && ((_a = relation === null || relation === void 0 ? void 0 : relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === column; });
+        const currentPrimary = this.schema.collections[table].primary;
+        if (!relation) {
+            throw new Error(`Field ${table}.${column} isn't a nested relational collection`);
+        }
+        return this.knex.raw('(' +
+            this.knex
+                .count('*')
+                .from(relation.collection)
+                .where(relation.field, '=', this.knex.raw(`??.??`, [table, currentPrimary]))
+                .toQuery() +
+            ')');
+    }
+}
+exports.FnHelper = FnHelper;

package/dist/database/helpers/index.d.ts

@@ -1,10 +1,13 @@
+import { SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import * as dateHelpers from './date';
+import * as fnHelpers from './fn';
 import * as geometryHelpers from './geometry';
 import * as schemaHelpers from './schema';
 export declare function getHelpers(database: Knex): {
-    date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.sqlite | dateHelpers.mysql | dateHelpers.mssql;
+    date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.mysql | dateHelpers.mssql | dateHelpers.sqlite;
     st: geometryHelpers.postgres | geometryHelpers.redshift | geometryHelpers.oracle | geometryHelpers.sqlite | geometryHelpers.mysql | geometryHelpers.mssql;
     schema: schemaHelpers.postgres | schemaHelpers.cockroachdb | schemaHelpers.oracle;
 };
+export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.postgres | fnHelpers.oracle | fnHelpers.sqlite | fnHelpers.mysql | fnHelpers.mssql;
 export declare type Helpers = ReturnType<typeof getHelpers>;

package/dist/database/helpers/index.js

@@ -19,9 +19,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHelpers = void 0;
+exports.getFunctions = exports.getHelpers = void 0;
 const __1 = require("..");
 const dateHelpers = __importStar(require("./date"));
+const fnHelpers = __importStar(require("./fn"));
 const geometryHelpers = __importStar(require("./geometry"));
 const schemaHelpers = __importStar(require("./schema"));
 function getHelpers(database) {
@@ -33,3 +34,8 @@ function getHelpers(database) {
     };
 }
 exports.getHelpers = getHelpers;
+function getFunctions(database, schema) {
+    const client = (0, __1.getDatabaseClient)(database);
+    return new fnHelpers[client](database, schema);
+}
+exports.getFunctions = getFunctions;

package/dist/database/migrations/20220308A-add-bookmark-icon-and-color.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220308A-add-bookmark-icon-and-color.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_presets', (table) => {
+        table.string('icon', 30).notNullable().defaultTo('bookmark_outline');
+        table.string('color').nullable();
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_presets', (table) => {
+        table.dropColumn('icon');
+        table.dropColumn('color');
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220322A-rename-field-typecast-flags.js

@@ -31,7 +31,9 @@ async function up(knex) {
                 }
             });
             if (updateRequired) {
-                await knex('directus_fields').update({ special: parsedSpecial }).where({ id });
+                await knex('directus_fields')
+                    .update({ special: parsedSpecial.join(',') })
+                    .where({ id });
             }
         }
     }
@@ -65,7 +67,9 @@ async function down(knex) {
                 }
             });
             if (updateRequired) {
-                await knex('directus_fields').update({ special: parsedSpecial }).where({ id });
+                await knex('directus_fields')
+                    .update({ special: parsedSpecial.join(',') })
+                    .where({ id });
             }
         }
     }

package/dist/database/migrations/20220323A-add-field-validation.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220323A-add-field-validation.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_fields', (table) => {
+        table.json('validation');
+        table.text('validation_message');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_fields', (table) => {
+        table.dropColumn('validation');
+        table.dropColumn('validation_message');
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220325A-fix-typecast-flags.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(_knex: Knex): Promise<void>;

package/dist/database/migrations/20220325A-fix-typecast-flags.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const utils_1 = require("@directus/shared/utils");
+const lodash_1 = require("lodash");
+async function up(knex) {
+    const fields = await knex
+        .select('id', 'special')
+        .from('directus_fields')
+        .whereNotNull('special')
+        .orWhere('special', '<>', '');
+    for (const { id, special } of fields) {
+        let parsedSpecial;
+        try {
+            if (special.includes('{')) {
+                // Fix invalid data in Postgres
+                parsedSpecial = (0, utils_1.toArray)(special.replace(/{/g, '').replace(/}/g, '').replace(/"/g, ''));
+            }
+            else {
+                parsedSpecial = (0, utils_1.toArray)(special);
+            }
+        }
+        catch {
+            continue;
+        }
+        if (parsedSpecial && (0, lodash_1.isArray)(parsedSpecial)) {
+            // Perform the update again in case it was not performed prior
+            parsedSpecial = parsedSpecial.map((special) => {
+                switch (special) {
+                    case 'boolean':
+                    case 'csv':
+                    case 'json':
+                        return 'cast-' + special;
+                    default:
+                        return special;
+                }
+            });
+            const parsedSpecialString = parsedSpecial.join(',');
+            if (parsedSpecialString !== special) {
+                await knex('directus_fields').update({ special: parsedSpecialString }).where({ id });
+            }
+        }
+    }
+}
+exports.up = up;
+async function down(_knex) {
+    // Do nothing
+}
+exports.down = down;

package/dist/database/migrations/20220325B-add-default-language.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220325B-add-default-language.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const helpers_1 = require("../helpers");
+async function up(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.string('default_language').notNullable().defaultTo('en-US');
+    });
+    await helper.changeToString('directus_users', 'language', {
+        nullable: true,
+        default: null,
+        length: 255,
+    });
+}
+exports.up = up;
+async function down(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.dropColumn('default_language');
+    });
+    await helper.changeToString('directus_users', 'language', {
+        nullable: true,
+        default: 'en-US',
+        length: 255,
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220402A-remove-default-value-panel-icon.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220402A-remove-default-value-panel-icon.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const helpers_1 = require("../helpers");
+async function up(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToString('directus_panels', 'icon', {
+        nullable: true,
+        default: null,
+        length: 30,
+    });
+}
+exports.up = up;
+async function down(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToString('directus_panels', 'icon', {
+        nullable: true,
+        default: 'insert_chart',
+        length: 30,
+    });
+}
+exports.down = down;

package/dist/database/run-ast.js

@@ -107,7 +107,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
         if (!child.relation)
             continue;
         if (child.type === 'm2o') {
-            columnsToSelectInternal.push(child.fieldKey);
+            columnsToSelectInternal.push(child.relation.field);
         }
         if (child.type === 'a2o') {
             columnsToSelectInternal.push(child.relation.field);
@@ -126,7 +126,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
     const columnsToSelect = [...new Set(columnsToSelectInternal)];
     const fieldNodes = columnsToSelect.map((column) => {
         var _a;
-        return (_a = children.find((childNode) => childNode.type === 'field' && childNode.fieldKey === column)) !== null && _a !== void 0 ? _a : {
+        return (_a = children.find((childNode) => childNode.type === 'field' && (childNode.fieldKey === column || childNode.name === column))) !== null && _a !== void 0 ? _a : {
             type: 'field',
             name: column,
             fieldKey: column,
@@ -151,7 +151,7 @@ function getColumnPreprocessor(knex, schema, table) {
         if (field.type.startsWith('geometry')) {
             return helpers.st.asText(table, field.field);
         }
-        return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias);
+        return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias, schema);
     };
 }
 function getDBQuery(schema, knex, table, fieldNodes, query) {
@@ -221,7 +221,7 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
         for (const parentItem of parentItems) {
             const itemChild = nestedItems.find((nestedItem) => {
                 return (nestedItem[schema.collections[nestedNode.relation.related_collection].primary] ==
-                    parentItem[nestedNode.fieldKey]);
+                    parentItem[nestedNode.relation.field]);
             });
             parentItem[nestedNode.fieldKey] = itemChild || null;
         }
@@ -244,7 +244,9 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
             if (nestedNode.query.offset && nestedNode.query.offset >= 0) {
                 parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(nestedNode.query.offset);
             }
-            parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(0, (_a = nestedNode.query.limit) !== null && _a !== void 0 ? _a : 100);
+            if (nestedNode.query.limit !== -1) {
+                parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(0, (_a = nestedNode.query.limit) !== null && _a !== void 0 ? _a : 100);
+            }
             parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].sort((a, b) => {
                 // This is pre-filled in get-ast-from-query
                 const sortField = nestedNode.query.sort[0];

package/dist/database/system-data/fields/activity.yaml

@@ -46,19 +46,19 @@ fields:
     width: half
 
   - field: comment
-    display: formatted-text
+    display: formatted-value
     display_options:
-      subdued: true
+      color: 'var(--foreground-subdued)'
     width: half
 
   - field: user_agent
-    display: formatted-text
+    display: formatted-value
     display_options:
       font: monospace
     width: half
 
   - field: ip
-    display: formatted-text
+    display: formatted-value
     display_options:
       font: monospace
     width: half

package/dist/database/system-data/fields/collections.yaml

@@ -193,7 +193,7 @@ fields:
 
   - field: item_duplication_fields
     special:
-      - json
+      - cast-json
     interface: system-field-tree
     options:
       collectionField: collection