directus 9.14.3 → 9.15.1

package/dist/app.js

@@ -168,7 +168,7 @@ async function createApp() {
         res.send(constants_1.ROBOTSTXT);
     });
     if (env_1.default.SERVE_APP) {
-        const adminPath = require.resolve('@directus/app');
+        const adminPath = require.resolve('@directus/app', require.main ? { paths: [require.main.filename] } : undefined);
         const adminUrl = new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin');
         // Set the App's base path according to the APIs public URL
         const html = await fs_extra_1.default.readFile(adminPath, 'utf8');

package/dist/auth/drivers/ldap.js

@@ -34,6 +34,7 @@ const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
 const joi_1 = __importDefault(require("joi"));
 const auth_1 = require("../auth");
 const exceptions_1 = require("../../exceptions");
+const record_not_unique_1 = require("../../exceptions/database/record-not-unique");
 const services_1 = require("../../services");
 const async_handler_1 = __importDefault(require("../../utils/async-handler"));
 const env_1 = __importDefault(require("../../env"));
@@ -218,14 +219,23 @@ class LDAPAuthDriver extends auth_1.AuthDriver {
         if (!userInfo) {
             throw new exceptions_1.InvalidCredentialsException();
         }
-        await this.usersService.createOne({
-            provider: this.config.provider,
-            first_name: userInfo.firstName,
-            last_name: userInfo.lastName,
-            email: userInfo.email,
-            external_identifier: userInfo.dn,
-            role: (_c = userRole === null || userRole === void 0 ? void 0 : userRole.id) !== null && _c !== void 0 ? _c : defaultRoleId,
-        });
+        try {
+            await this.usersService.createOne({
+                provider: this.config.provider,
+                first_name: userInfo.firstName,
+                last_name: userInfo.lastName,
+                email: userInfo.email,
+                external_identifier: userInfo.dn,
+                role: (_c = userRole === null || userRole === void 0 ? void 0 : userRole.id) !== null && _c !== void 0 ? _c : defaultRoleId,
+            });
+        }
+        catch (e) {
+            if (e instanceof record_not_unique_1.RecordNotUniqueException) {
+                logger_1.default.warn(e, '[LDAP] Failed to register user. User not unique');
+                throw new exceptions_1.InvalidProviderException();
+            }
+            throw e;
+        }
         return (await this.fetchUserId(userInfo.dn));
     }
     async verify(user, password) {

package/dist/auth/drivers/oauth2.js

@@ -14,6 +14,7 @@ const openid_client_1 = require("openid-client");
 const auth_1 = require("../../auth");
 const env_1 = __importDefault(require("../../env"));
 const exceptions_2 = require("../../exceptions");
+const record_not_unique_1 = require("../../exceptions/database/record-not-unique");
 const logger_1 = __importDefault(require("../../logger"));
 const respond_1 = require("../../middleware/respond");
 const services_1 = require("../../services");
@@ -118,15 +119,24 @@ class OAuth2AuthDriver extends local_1.LocalAuthDriver {
             logger_1.default.trace(`[OAuth2] User doesn't exist, and public registration not allowed for provider "${provider}"`);
             throw new exceptions_2.InvalidCredentialsException();
         }
-        await this.usersService.createOne({
-            provider,
-            first_name: userInfo[this.config.firstNameKey],
-            last_name: userInfo[this.config.lastNameKey],
-            email: email,
-            external_identifier: identifier,
-            role: this.config.defaultRoleId,
-            auth_data: tokenSet.refresh_token && JSON.stringify({ refreshToken: tokenSet.refresh_token }),
-        });
+        try {
+            await this.usersService.createOne({
+                provider,
+                first_name: userInfo[this.config.firstNameKey],
+                last_name: userInfo[this.config.lastNameKey],
+                email: email,
+                external_identifier: identifier,
+                role: this.config.defaultRoleId,
+                auth_data: tokenSet.refresh_token && JSON.stringify({ refreshToken: tokenSet.refresh_token }),
+            });
+        }
+        catch (e) {
+            if (e instanceof record_not_unique_1.RecordNotUniqueException) {
+                logger_1.default.warn(e, '[OAuth2] Failed to register user. User not unique');
+                throw new exceptions_2.InvalidProviderException();
+            }
+            throw e;
+        }
         return (await this.fetchUserId(identifier));
     }
     async login(user) {

package/dist/auth/drivers/openid.js

@@ -14,6 +14,7 @@ const openid_client_1 = require("openid-client");
 const auth_1 = require("../../auth");
 const env_1 = __importDefault(require("../../env"));
 const exceptions_2 = require("../../exceptions");
+const record_not_unique_1 = require("../../exceptions/database/record-not-unique");
 const logger_1 = __importDefault(require("../../logger"));
 const respond_1 = require("../../middleware/respond");
 const services_1 = require("../../services");
@@ -136,15 +137,24 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
             logger_1.default.trace(`[OpenID] User doesn't exist, and public registration not allowed for provider "${provider}"`);
             throw new exceptions_2.InvalidCredentialsException();
         }
-        await this.usersService.createOne({
-            provider,
-            first_name: userInfo.given_name,
-            last_name: userInfo.family_name,
-            email: email,
-            external_identifier: identifier,
-            role: this.config.defaultRoleId,
-            auth_data: tokenSet.refresh_token && JSON.stringify({ refreshToken: tokenSet.refresh_token }),
-        });
+        try {
+            await this.usersService.createOne({
+                provider,
+                first_name: userInfo.given_name,
+                last_name: userInfo.family_name,
+                email: email,
+                external_identifier: identifier,
+                role: this.config.defaultRoleId,
+                auth_data: tokenSet.refresh_token && JSON.stringify({ refreshToken: tokenSet.refresh_token }),
+            });
+        }
+        catch (e) {
+            if (e instanceof record_not_unique_1.RecordNotUniqueException) {
+                logger_1.default.warn(e, '[OpenID] Failed to register user. User not unique');
+                throw new exceptions_2.InvalidProviderException();
+            }
+            throw e;
+        }
         return (await this.fetchUserId(identifier));
     }
     async login(user) {

package/dist/cache.d.ts

@@ -7,3 +7,6 @@ export declare function getCache(): {
 export declare function flushCaches(forced?: boolean): Promise<void>;
 export declare function clearSystemCache(forced?: boolean): Promise<void>;
 export declare function setSystemCache(key: string, value: any, ttl?: number): Promise<void>;
+export declare function getSystemCache(key: string): Promise<Record<string, any>>;
+export declare function setCacheValue(cache: Keyv, key: string, value: Record<string, any> | Record<string, any>[], ttl?: number): Promise<void>;
+export declare function getCacheValue(cache: Keyv, key: string): Promise<any>;

package/dist/cache.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
+exports.getCacheValue = exports.setCacheValue = exports.getSystemCache = exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
 const keyv_1 = __importDefault(require("keyv"));
 const ms_1 = __importDefault(require("ms"));
 const env_1 = __importDefault(require("./env"));
 const logger_1 = __importDefault(require("./logger"));
 const get_config_from_env_1 = require("./utils/get-config-from-env");
 const validate_env_1 = require("./utils/validate-env");
+const compress_1 = require("./utils/compress");
 let cache = null;
 let systemCache = null;
 let lockCache = null;
@@ -49,10 +50,28 @@ exports.clearSystemCache = clearSystemCache;
 async function setSystemCache(key, value, ttl) {
     const { systemCache, lockCache } = getCache();
     if (!(await lockCache.get('system-cache-lock'))) {
-        await systemCache.set(key, value, ttl);
+        await setCacheValue(systemCache, key, value, ttl);
     }
 }
 exports.setSystemCache = setSystemCache;
+async function getSystemCache(key) {
+    const { systemCache } = getCache();
+    return await getCacheValue(systemCache, key);
+}
+exports.getSystemCache = getSystemCache;
+async function setCacheValue(cache, key, value, ttl) {
+    const compressed = await (0, compress_1.compress)(value);
+    await cache.set(key, compressed, ttl);
+}
+exports.setCacheValue = setCacheValue;
+async function getCacheValue(cache, key) {
+    const value = await cache.get(key);
+    if (!value)
+        return undefined;
+    const decompressed = await (0, compress_1.decompress)(value);
+    return decompressed;
+}
+exports.getCacheValue = getCacheValue;
 function getKeyvInstance(ttl, namespaceSuffix) {
     switch (env_1.default.CACHE_STORE) {
         case 'redis':

package/dist/constants.d.ts

@@ -5,6 +5,7 @@ export declare const FILTER_VARIABLES: string[];
 export declare const ALIAS_TYPES: string[];
 export declare const DEFAULT_AUTH_PROVIDER = "default";
 export declare const COLUMN_TRANSFORMS: string[];
+export declare const GENERATE_SPECIAL: string[];
 export declare const UUID_REGEX = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
 export declare const COOKIE_OPTIONS: {
     httpOnly: boolean;

package/dist/constants.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ROBOTSTXT = exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
+exports.ROBOTSTXT = exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.GENERATE_SPECIAL = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
 const env_1 = __importDefault(require("./env"));
 const ms_1 = __importDefault(require("ms"));
 exports.SYSTEM_ASSET_ALLOW_LIST = [
@@ -47,6 +47,7 @@ exports.FILTER_VARIABLES = ['$NOW', '$CURRENT_USER', '$CURRENT_ROLE'];
 exports.ALIAS_TYPES = ['alias', 'o2m', 'm2m', 'm2a', 'o2a', 'files', 'translations'];
 exports.DEFAULT_AUTH_PROVIDER = 'default';
 exports.COLUMN_TRANSFORMS = ['year', 'month', 'day', 'weekday', 'hour', 'minute', 'second'];
+exports.GENERATE_SPECIAL = ['uuid', 'date-created', 'role-created', 'user-created'];
 exports.UUID_REGEX = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
 exports.COOKIE_OPTIONS = {
     httpOnly: true,

package/dist/controllers/assets.js

@@ -12,6 +12,7 @@ const constants_1 = require("../constants");
 const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
+const logger_1 = __importDefault(require("../logger"));
 const use_collection_1 = __importDefault(require("../middleware/use-collection"));
 const services_1 = require("../services");
 const assets_1 = require("../types/assets");
@@ -147,6 +148,27 @@ router.get('/:pk/:filename?',
         res.setHeader('Content-Length', stat.size);
         return res.end();
     }
-    stream.pipe(res);
+    stream.on('data', (chunk) => res.write(chunk));
+    stream.on('end', () => {
+        res.status(200).send();
+    });
+    stream.on('error', (e) => {
+        logger_1.default.error(e, `Couldn't stream file ${file.id} to the client`);
+        stream.unpipe(res);
+        res.removeHeader('Content-Disposition');
+        res.removeHeader('Content-Type');
+        res.removeHeader('Content-Disposition');
+        res.removeHeader('Cache-Control');
+        res.status(500).json({
+            errors: [
+                {
+                    message: 'An unexpected error occurred.',
+                    extensions: {
+                        code: 'INTERNAL_SERVER_ERROR',
+                    },
+                },
+            ],
+        });
+    });
 }));
 exports.default = router;

package/dist/controllers/extensions.js

@@ -9,13 +9,14 @@ const exceptions_1 = require("../exceptions");
 const extensions_1 = require("../extensions");
 const respond_1 = require("../middleware/respond");
 const utils_1 = require("@directus/shared/utils");
+const constants_1 = require("@directus/shared/constants");
 const ms_1 = __importDefault(require("ms"));
 const env_1 = __importDefault(require("../env"));
 const get_cache_headers_1 = require("../utils/get-cache-headers");
 const router = (0, express_1.Router)();
 router.get('/:type', (0, async_handler_1.default)(async (req, res, next) => {
     const type = (0, utils_1.depluralize)(req.params.type);
-    if (!(0, utils_1.isAppExtension)(type)) {
+    if (!(0, utils_1.isIn)(type, constants_1.APP_OR_HYBRID_EXTENSION_TYPES)) {
         throw new exceptions_1.RouteNotFoundException(req.path);
     }
     const extensionManager = (0, extensions_1.getExtensionManager)();
@@ -27,7 +28,7 @@ router.get('/:type', (0, async_handler_1.default)(async (req, res, next) => {
 }), respond_1.respond);
 router.get('/:type/index.js', (0, async_handler_1.default)(async (req, res) => {
     const type = (0, utils_1.depluralize)(req.params.type);
-    if (!(0, utils_1.isAppExtension)(type)) {
+    if (!(0, utils_1.isIn)(type, constants_1.APP_OR_HYBRID_EXTENSION_TYPES)) {
         throw new exceptions_1.RouteNotFoundException(req.path);
     }
     const extensionManager = (0, extensions_1.getExtensionManager)();

package/dist/database/helpers/schema/dialects/cockroachdb.d.ts

@@ -1,16 +1,5 @@
-import { SchemaHelper } from '../types';
+import { KNEX_TYPES } from '@directus/shared/constants';
+import { Options, SchemaHelper } from '../types';
 export declare class SchemaHelperCockroachDb extends SchemaHelper {
-    changeToText(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
-    changeToString(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-        length?: number;
-    }): Promise<void>;
-    changeToInteger(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
+    changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
 }

package/dist/database/helpers/schema/dialects/cockroachdb.js

@@ -3,14 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaHelperCockroachDb = void 0;
 const types_1 = require("../types");
 class SchemaHelperCockroachDb extends types_1.SchemaHelper {
-    async changeToText(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column) => builder.text(column));
-    }
-    async changeToString(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column, options) => builder.string(column, options.length));
-    }
-    async changeToInteger(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column) => builder.integer(column));
+    async changeToType(table, column, type, options = {}) {
+        await this.changeToTypeByCopy(table, column, type, options);
     }
 }
 exports.SchemaHelperCockroachDb = SchemaHelperCockroachDb;

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

@@ -1,12 +1,5 @@
-import { SchemaHelper } from '../types';
+import { KNEX_TYPES } from '@directus/shared/constants';
+import { Options, SchemaHelper } from '../types';
 export declare class SchemaHelperOracle extends SchemaHelper {
-    changeToText(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
-    changeToString(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-        length?: number;
-    }): Promise<void>;
+    changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
 }

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

@@ -3,11 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaHelperOracle = void 0;
 const types_1 = require("../types");
 class SchemaHelperOracle extends types_1.SchemaHelper {
-    async changeToText(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column) => builder.text(column));
-    }
-    async changeToString(table, column, options = {}) {
-        await this.changeToTypeByCopy(table, column, options, (builder, column, options) => builder.string(column, options.length));
+    async changeToType(table, column, type, options = {}) {
+        await this.changeToTypeByCopy(table, column, type, options);
     }
 }
 exports.SchemaHelperOracle = SchemaHelperOracle;

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

@@ -1,26 +1,16 @@
 import { DatabaseHelper } from '../types';
-import { Knex } from 'knex';
+import { KNEX_TYPES } from '@directus/shared/constants';
 declare type Clients = 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
+export declare type Options = {
+    nullable?: boolean;
+    default?: any;
+    length?: number;
+};
 export declare abstract class SchemaHelper extends DatabaseHelper {
     isOneOfClients(clients: Clients[]): boolean;
     changeNullable(table: string, column: string, nullable: boolean): Promise<void>;
-    changeToText(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
-    changeToInteger(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-    }): Promise<void>;
-    changeToString(table: string, column: string, options?: {
-        nullable?: boolean;
-        default?: any;
-        length?: number;
-    }): Promise<void>;
-    protected changeToTypeByCopy<Options extends {
-        nullable?: boolean;
-        default?: any;
-    }>(table: string, column: string, options: Options, cb: (builder: Knex.CreateTableBuilder, column: string, options: Options) => Knex.ColumnBuilder): Promise<void>;
+    changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
+    protected changeToTypeByCopy(table: string, column: string, type: typeof KNEX_TYPES[number], options: Options): Promise<void>;
     preColumnDelete(): Promise<boolean>;
     postColumnDelete(): Promise<void>;
 }

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

@@ -17,9 +17,9 @@ class SchemaHelper extends types_1.DatabaseHelper {
             }
         });
     }
-    async changeToText(table, column, options = {}) {
+    async changeToType(table, column, type, options = {}) {
         await this.knex.schema.alterTable(table, (builder) => {
-            const b = builder.string(column);
+            const b = type === 'string' ? builder.string(column, options.length) : builder[type](column);
             if (options.nullable === true) {
                 b.nullable();
             }
@@ -32,39 +32,10 @@ class SchemaHelper extends types_1.DatabaseHelper {
             b.alter();
         });
     }
-    async changeToInteger(table, column, options = {}) {
+    async changeToTypeByCopy(table, column, type, options) {
+        const tempName = `${column}__temp`;
         await this.knex.schema.alterTable(table, (builder) => {
-            const b = builder.integer(column);
-            if (options.nullable === true) {
-                b.nullable();
-            }
-            if (options.nullable === false) {
-                b.notNullable();
-            }
-            if (options.default !== undefined) {
-                b.defaultTo(options.default);
-            }
-            b.alter();
-        });
-    }
-    async changeToString(table, column, options = {}) {
-        await this.knex.schema.alterTable(table, (builder) => {
-            const b = builder.string(column, options.length);
-            if (options.nullable === true) {
-                b.nullable();
-            }
-            if (options.nullable === false) {
-                b.notNullable();
-            }
-            if (options.default !== undefined) {
-                b.defaultTo(options.default);
-            }
-            b.alter();
-        });
-    }
-    async changeToTypeByCopy(table, column, options, cb) {
-        await this.knex.schema.alterTable(table, (builder) => {
-            const col = cb(builder, `${column}__temp`, options);
+            const col = type === 'string' ? builder.string(tempName, options.length) : builder[type](tempName);
             if (options.default !== undefined) {
                 col.defaultTo(options.default);
             }
@@ -72,12 +43,12 @@ class SchemaHelper extends types_1.DatabaseHelper {
             // the table)
             col.nullable();
         });
-        await this.knex(table).update(`${column}__temp`, this.knex.ref(column));
+        await this.knex(table).update(tempName, this.knex.ref(column));
         await this.knex.schema.alterTable(table, (builder) => {
             builder.dropColumn(column);
         });
         await this.knex.schema.alterTable(table, (builder) => {
-            builder.renameColumn(`${column}__temp`, column);
+            builder.renameColumn(tempName, column);
         });
         // We're altering the temporary column here. That starts nullable, so we only want to set it
         // to NOT NULL when applicable

package/dist/database/migrations/20201105B-change-webhook-url-type.js

@@ -4,11 +4,12 @@ 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.changeToText('directus_webhooks', 'url');
+    const type = helper.isOneOfClients(['oracle', 'cockroachdb']) ? 'text' : 'string';
+    await helper.changeToType('directus_webhooks', 'url', type);
 }
 exports.up = up;
 async function down(knex) {
-    await (0, helpers_1.getHelpers)(knex).schema.changeToString('directus_webhooks', 'url', {
+    await (0, helpers_1.getHelpers)(knex).schema.changeToType('directus_webhooks', 'url', 'string', {
         nullable: false,
         length: 255,
     });

package/dist/database/migrations/20210312A-webhooks-collections-text.js

@@ -4,11 +4,12 @@ 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.changeToText('directus_webhooks', 'collections');
+    const type = helper.isOneOfClients(['oracle', 'cockroachdb']) ? 'text' : 'string';
+    await helper.changeToType('directus_webhooks', 'collections', type);
 }
 exports.up = up;
 async function down(knex) {
-    await (0, helpers_1.getHelpers)(knex).schema.changeToString('directus_webhooks', 'collections', {
+    await (0, helpers_1.getHelpers)(knex).schema.changeToType('directus_webhooks', 'collections', 'string', {
         nullable: false,
         length: 255,
     });

package/dist/database/migrations/20210415A-make-filesize-nullable.js

@@ -4,7 +4,7 @@ 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.changeToInteger('directus_files', 'filesize', {
+    await helper.changeToType('directus_files', 'filesize', 'integer', {
         nullable: true,
         default: null,
     });
@@ -12,7 +12,7 @@ async function up(knex) {
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToInteger('directus_files', 'filesize', {
+    await helper.changeToType('directus_files', 'filesize', 'integer', {
         nullable: false,
         default: 0,
     });

package/dist/database/migrations/20210510A-restructure-relations.js

@@ -9,10 +9,10 @@ async function up(knex) {
         table.string('one_deselect_action').defaultTo('nullify');
     });
     await knex('directus_relations').update({ one_deselect_action: 'nullify' });
-    await helper.changeToString('directus_relations', 'sort_field', {
+    await helper.changeToType('directus_relations', 'sort_field', 'string', {
         length: 64,
     });
-    await helper.changeToString('directus_relations', 'one_deselect_action', {
+    await helper.changeToType('directus_relations', 'one_deselect_action', 'string', {
         nullable: false,
         default: 'nullify',
     });
@@ -20,7 +20,7 @@ async function up(knex) {
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToString('directus_relations', 'sort_field', {
+    await helper.changeToType('directus_relations', 'sort_field', 'string', {
         length: 255,
     });
     await knex.schema.alterTable('directus_relations', (table) => {

package/dist/database/migrations/20210903A-add-auth-provider.js

@@ -11,7 +11,7 @@ async function up(knex) {
         table.string('provider', 128).notNullable().defaultTo('default');
         table.string('external_identifier').unique();
     });
-    await helper.changeToString('directus_users', 'email', {
+    await helper.changeToType('directus_users', 'email', 'string', {
         nullable: true,
         length: 128,
     });
@@ -29,7 +29,7 @@ async function down(knex) {
         table.dropColumn('provider');
         table.dropColumn('external_identifier');
     });
-    await helper.changeToString('directus_users', 'email', {
+    await helper.changeToType('directus_users', 'email', 'string', {
         nullable: false,
         length: 128,
     });

package/dist/database/migrations/20210907A-webhooks-collections-not-null.js

@@ -4,13 +4,15 @@ 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.changeToText('directus_webhooks', 'collections', {
+    const type = helper.isOneOfClients(['oracle', 'cockroachdb']) ? 'text' : 'string';
+    await helper.changeToType('directus_webhooks', 'collections', type, {
         nullable: false,
     });
 }
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToText('directus_webhooks', 'collections');
+    const type = helper.isOneOfClients(['oracle', 'cockroachdb']) ? 'text' : 'string';
+    await helper.changeToType('directus_webhooks', 'collections', type);
 }
 exports.down = down;

package/dist/database/migrations/20210920A-webhooks-url-not-null.js

@@ -9,7 +9,7 @@ async function up(knex) {
         // "20201105B-change-webhook-url-type.ts"
         return;
     }
-    await helper.changeToText('directus_webhooks', 'url', {
+    await helper.changeToType('directus_webhooks', 'url', 'string', {
         nullable: false,
     });
 }
@@ -21,6 +21,6 @@ async function down(knex) {
         // "20201105B-change-webhook-url-type.ts"
         return;
     }
-    await helper.changeToText('directus_webhooks', 'url');
+    await helper.changeToType('directus_webhooks', 'url', 'string');
 }
 exports.down = down;

package/dist/database/migrations/20220303A-remove-default-project-color.js

@@ -4,7 +4,7 @@ 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_settings', 'project_color', {
+    await helper.changeToType('directus_settings', 'project_color', 'string', {
         nullable: true,
         default: null,
         length: 50,
@@ -13,7 +13,7 @@ async function up(knex) {
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToString('directus_settings', 'project_color', {
+    await helper.changeToType('directus_settings', 'project_color', 'string', {
         nullable: true,
         default: '#00C897',
         length: 10,

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

@@ -7,7 +7,7 @@ async function up(knex) {
     await knex.schema.alterTable('directus_settings', (table) => {
         table.string('default_language').notNullable().defaultTo('en-US');
     });
-    await helper.changeToString('directus_users', 'language', {
+    await helper.changeToType('directus_users', 'language', 'string', {
         nullable: true,
         default: null,
         length: 255,
@@ -19,7 +19,7 @@ async function down(knex) {
     await knex.schema.alterTable('directus_settings', (table) => {
         table.dropColumn('default_language');
     });
-    await helper.changeToString('directus_users', 'language', {
+    await helper.changeToType('directus_users', 'language', 'string', {
         nullable: true,
         default: 'en-US',
         length: 255,