directus 9.12.0 → 9.13.0

package/dist/controllers/files.js

@@ -32,7 +32,7 @@ const multipartHandler = (req, res, next) => {
             'content-type': 'application/octet-stream',
         };
     }
-    const busboy = new busboy_1.default({ headers });
+    const busboy = (0, busboy_1.default)({ headers });
     const savedFiles = [];
     const service = new services_1.FilesService({ accountability: req.accountability, schema: req.schema });
     const existingPrimaryKey = req.params.pk || undefined;
@@ -57,7 +57,7 @@ const multipartHandler = (req, res, next) => {
         }
         payload[fieldname] = fieldValue;
     });
-    busboy.on('file', async (fieldname, fileStream, filename, encoding, mimetype) => {
+    busboy.on('file', async (_fieldname, fileStream, { filename, mimeType }) => {
         if (!filename) {
             return busboy.emit('error', new exceptions_1.InvalidPayloadException(`File is missing filename`));
         }
@@ -68,7 +68,7 @@ const multipartHandler = (req, res, next) => {
         const payloadWithRequiredFields = {
             ...payload,
             filename_download: filename,
-            type: mimetype,
+            type: mimeType,
             storage: payload.storage || disk,
         };
         // Clear the payload for the next to-be-uploaded file
@@ -85,7 +85,7 @@ const multipartHandler = (req, res, next) => {
     busboy.on('error', (error) => {
         next(error);
     });
-    busboy.on('finish', () => {
+    busboy.on('close', () => {
         tryDone();
     });
     req.pipe(busboy);
@@ -204,7 +204,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/flows.js

@@ -94,7 +94,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/folders.js

@@ -84,7 +84,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/items.js

@@ -105,7 +105,10 @@ router.patch('/:collection', collection_exists_1.default, (0, validate_batch_1.v
         return next();
     }
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/notifications.js

@@ -84,7 +84,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/operations.js

@@ -75,7 +75,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/panels.js

@@ -75,7 +75,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/permissions.js

@@ -86,7 +86,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/presets.js

@@ -84,7 +84,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/roles.js

@@ -75,7 +75,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/shares.js

@@ -149,7 +149,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/users.js

@@ -138,7 +138,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {
@@ -251,7 +254,7 @@ router.post('/me/tfa/generate/', (0, async_handler_1.default)(async (req, res, n
     return next();
 }), respond_1.respond);
 router.post('/me/tfa/enable/', (0, async_handler_1.default)(async (req, _res, next) => {
-    var _a;
+    var _a, _b;
     if (!((_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user)) {
         throw new exceptions_1.InvalidCredentialsException();
     }
@@ -261,6 +264,33 @@ router.post('/me/tfa/enable/', (0, async_handler_1.default)(async (req, _res, ne
     if (!req.body.otp) {
         throw new exceptions_1.InvalidPayloadException(`"otp" is required`);
     }
+    // Override permissions only when enforce TFA is enabled in role
+    if (req.accountability.role) {
+        const rolesService = new services_1.RolesService({
+            schema: req.schema,
+        });
+        const role = (await rolesService.readOne(req.accountability.role));
+        if (role && role.enforce_tfa) {
+            const existingPermission = await ((_b = req.accountability.permissions) === null || _b === void 0 ? void 0 : _b.find((p) => p.collection === 'directus_users' && p.action === 'update'));
+            if (existingPermission) {
+                existingPermission.fields = ['tfa_secret'];
+                existingPermission.permissions = { id: { _eq: req.accountability.user } };
+                existingPermission.presets = null;
+                existingPermission.validation = null;
+            }
+            else {
+                (req.accountability.permissions || (req.accountability.permissions = [])).push({
+                    action: 'update',
+                    collection: 'directus_users',
+                    fields: ['tfa_secret'],
+                    permissions: { id: { _eq: req.accountability.user } },
+                    presets: null,
+                    role: req.accountability.role,
+                    validation: null,
+                });
+            }
+        }
+    }
     const service = new services_1.TFAService({
         accountability: req.accountability,
         schema: req.schema,
@@ -269,13 +299,40 @@ router.post('/me/tfa/enable/', (0, async_handler_1.default)(async (req, _res, ne
     return next();
 }), respond_1.respond);
 router.post('/me/tfa/disable', (0, async_handler_1.default)(async (req, _res, next) => {
-    var _a;
+    var _a, _b;
     if (!((_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user)) {
         throw new exceptions_1.InvalidCredentialsException();
     }
     if (!req.body.otp) {
         throw new exceptions_1.InvalidPayloadException(`"otp" is required`);
     }
+    // Override permissions only when enforce TFA is enabled in role
+    if (req.accountability.role) {
+        const rolesService = new services_1.RolesService({
+            schema: req.schema,
+        });
+        const role = (await rolesService.readOne(req.accountability.role));
+        if (role && role.enforce_tfa) {
+            const existingPermission = await ((_b = req.accountability.permissions) === null || _b === void 0 ? void 0 : _b.find((p) => p.collection === 'directus_users' && p.action === 'update'));
+            if (existingPermission) {
+                existingPermission.fields = ['tfa_secret'];
+                existingPermission.permissions = { id: { _eq: req.accountability.user } };
+                existingPermission.presets = null;
+                existingPermission.validation = null;
+            }
+            else {
+                (req.accountability.permissions || (req.accountability.permissions = [])).push({
+                    action: 'update',
+                    collection: 'directus_users',
+                    fields: ['tfa_secret'],
+                    permissions: { id: { _eq: req.accountability.user } },
+                    presets: null,
+                    role: req.accountability.role,
+                    validation: null,
+                });
+            }
+        }
+    }
     const service = new services_1.TFAService({
         accountability: req.accountability,
         schema: req.schema,
@@ -287,4 +344,19 @@ router.post('/me/tfa/disable', (0, async_handler_1.default)(async (req, _res, ne
     await service.disableTFA(req.accountability.user);
     return next();
 }), respond_1.respond);
+router.post('/:pk/tfa/disable', (0, async_handler_1.default)(async (req, _res, next) => {
+    var _a;
+    if (!((_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user)) {
+        throw new exceptions_1.InvalidCredentialsException();
+    }
+    if (!req.accountability.admin || !req.params.pk) {
+        throw new exceptions_1.ForbiddenException();
+    }
+    const service = new services_1.TFAService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    await service.disableTFA(req.params.pk);
+    return next();
+}), respond_1.respond);
 exports.default = router;

package/dist/controllers/utils.js

@@ -82,10 +82,10 @@ router.post('/import/:collection', collection_exists_1.default, (0, async_handle
             'content-type': 'application/octet-stream',
         };
     }
-    const busboy = new busboy_1.default({ headers });
-    busboy.on('file', async (fieldname, fileStream, filename, encoding, mimetype) => {
+    const busboy = (0, busboy_1.default)({ headers });
+    busboy.on('file', async (_fieldname, fileStream, { mimeType }) => {
         try {
-            await service.import(req.params.collection, mimetype, fileStream);
+            await service.import(req.params.collection, mimeType, fileStream);
         }
         catch (err) {
             return next(err);

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

@@ -4,6 +4,9 @@ exports.DateHelperSQLite = void 0;
 const types_1 = require("../types");
 class DateHelperSQLite extends types_1.DateHelper {
     parse(date) {
+        if (!date) {
+            return date;
+        }
         // Return the time as string
         if (date.length <= 8 && date.includes(':')) {
             return date;

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

@@ -1,13 +1,13 @@
-import { FnHelper } from '../types';
+import { FnHelper, FnHelperOptions } 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;
+    year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    month(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    week(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    day(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    weekday(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    hour(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    minute(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    second(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     count(table: string, column: string): Knex.Raw<any>;
 }

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

@@ -2,30 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FnHelperOracle = void 0;
 const types_1 = require("../types");
+const parseLocaltime = (columnType) => {
+    if (columnType === 'timestamp') {
+        return ` AT TIME ZONE 'UTC'`;
+    }
+    return '';
+};
 class FnHelperOracle extends types_1.FnHelper {
-    year(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'IYYY')", [table, column]);
+    year(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'IYYY')`, [table, column]);
     }
-    month(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'MM')", [table, column]);
+    month(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'MM')`, [table, column]);
     }
-    week(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'IW')", [table, column]);
+    week(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'IW')`, [table, column]);
     }
-    day(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'DD')", [table, column]);
+    day(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'DD')`, [table, column]);
     }
-    weekday(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'D')", [table, column]);
+    weekday(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'D')`, [table, column]);
     }
-    hour(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'HH24')", [table, column]);
+    hour(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'HH24')`, [table, column]);
     }
-    minute(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'MI')", [table, column]);
+    minute(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'MI')`, [table, column]);
     }
-    second(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'SS')", [table, column]);
+    second(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'SS')`, [table, column]);
     }
     count(table, column) {
         var _a, _b, _c, _d, _e;

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

@@ -1,13 +1,13 @@
-import { FnHelper } from '../types';
+import { FnHelper, FnHelperOptions } 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;
+    year(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    month(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    week(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    day(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    weekday(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    hour(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    minute(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    second(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
     count(table: string, column: string): Knex.Raw<any>;
 }

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

@@ -2,30 +2,60 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FnHelperSQLite = void 0;
 const types_1 = require("../types");
+const parseLocaltime = (columnType) => {
+    if (columnType === 'timestamp') {
+        return '';
+    }
+    return `, 'localtime'`;
+};
 class FnHelperSQLite extends types_1.FnHelper {
-    year(table, column) {
-        return this.knex.raw("CAST(strftime('%Y', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    year(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%Y', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    month(table, column) {
-        return this.knex.raw("CAST(strftime('%m', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    month(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%m', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    week(table, column) {
-        return this.knex.raw("CAST(strftime('%W', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    week(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%W', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    day(table, column) {
-        return this.knex.raw("CAST(strftime('%d', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    day(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%d', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    weekday(table, column) {
-        return this.knex.raw("CAST(strftime('%w', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    weekday(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%w', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    hour(table, column) {
-        return this.knex.raw("CAST(strftime('%H', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    hour(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%H', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    minute(table, column) {
-        return this.knex.raw("CAST(strftime('%M', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    minute(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%M', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    second(table, column) {
-        return this.knex.raw("CAST(strftime('%S', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    second(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%S', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
     count(table, column) {
         var _a, _b, _c, _d, _e;

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

@@ -1,18 +1,21 @@
 import { SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { DatabaseHelper } from '../types';
+export declare type FnHelperOptions = {
+    type?: string;
+};
 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;
+    abstract year(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract month(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract week(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract day(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract weekday(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract hour(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract minute(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract second(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract count(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
     protected _relationalCount(table: string, column: string): Knex.Raw;
 }

package/dist/database/helpers/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/database/index.js

@@ -64,6 +64,8 @@ function getDatabase() {
                 // Ignore warnings about returning not being supported in some DBs
                 if (msg.startsWith('.returning()'))
                     return;
+                if (msg.endsWith('does not currently support RETURNING clause'))
+                    return;
                 // Ignore warning about MySQL not supporting TRX for DDL
                 if (msg.startsWith('Transaction was implicitly committed, do not mix transactions and DDL with MySQL'))
                     return;

package/dist/database/migrations/20210225A-add-relations-sort-field.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-const parse_json_1 = require("../../utils/parse-json");
+const utils_1 = require("@directus/shared/utils");
 async function up(knex) {
     var _a;
     await knex.schema.alterTable('directus_relations', (table) => {
@@ -12,7 +12,7 @@ async function up(knex) {
         .from('directus_fields')
         .whereIn('interface', ['one-to-many', 'm2a-builder', 'many-to-many']);
     for (const field of fieldsWithSort) {
-        const options = typeof field.options === 'string' ? (0, parse_json_1.parseJSON)(field.options) : (_a = field.options) !== null && _a !== void 0 ? _a : {};
+        const options = typeof field.options === 'string' ? (0, utils_1.parseJSON)(field.options) : (_a = field.options) !== null && _a !== void 0 ? _a : {};
         if ('sortField' in options) {
             await knex('directus_relations')
                 .update({

package/dist/database/migrations/20210506A-rename-interfaces.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-const parse_json_1 = require("../../utils/parse-json");
+const utils_1 = require("@directus/shared/utils");
 // [before, after, after-option additions]
 const changes = [
     ['button-links', 'presentation-links'],
@@ -55,7 +55,7 @@ async function up(knex) {
                 .from('directus_fields')
                 .where({ interface: before });
             for (const { id, options: existingOptionsRaw } of fields) {
-                const existingOptions = typeof existingOptionsRaw === 'string' ? (0, parse_json_1.parseJSON)(existingOptionsRaw) : existingOptionsRaw;
+                const existingOptions = typeof existingOptionsRaw === 'string' ? (0, utils_1.parseJSON)(existingOptionsRaw) : existingOptionsRaw;
                 const newOptions = {
                     ...(existingOptions || {}),
                     ...options,

package/dist/database/migrations/20210802A-replace-groups.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
+const utils_1 = require("@directus/shared/utils");
 const logger_1 = __importDefault(require("../../logger"));
-const parse_json_1 = require("../../utils/parse-json");
 async function up(knex) {
     const dividerGroups = await knex.select('*').from('directus_fields').where('interface', '=', 'group-divider');
     for (const dividerGroup of dividerGroups) {
         const newOptions = { showHeader: true };
         if (dividerGroup.options) {
             try {
-                const options = typeof dividerGroup.options === 'string' ? (0, parse_json_1.parseJSON)(dividerGroup.options) : dividerGroup.options;
+                const options = typeof dividerGroup.options === 'string' ? (0, utils_1.parseJSON)(dividerGroup.options) : dividerGroup.options;
                 if (options.icon)
                     newOptions.headerIcon = options.icon;
                 if (options.color)

package/dist/database/migrations/20210805A-update-groups.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-const parse_json_1 = require("../../utils/parse-json");
+const utils_1 = require("@directus/shared/utils");
 async function up(knex) {
     const groups = await knex.select('*').from('directus_fields').where({ interface: 'group-standard' });
     const raw = [];
     const detail = [];
     for (const group of groups) {
-        const options = typeof group.options === 'string' ? (0, parse_json_1.parseJSON)(group.options) : group.options || {};
+        const options = typeof group.options === 'string' ? (0, utils_1.parseJSON)(group.options) : group.options || {};
         if (options.showHeader === true) {
             detail.push(group);
         }