@directus/api 35.0.2 → 35.1.0

package/dist/database/index.js

@@ -22,9 +22,7 @@ let inspector = null;
 const __dirname = dirname(fileURLToPath(import.meta.url));
 var database_default = getDatabase;
 function getDatabase() {
-	if (database) {
-		return database;
-	}
+	if (database) return database;
 	const env = useEnv();
 	const logger = useLogger();
 	const metrics = useMetrics();
@@ -35,31 +33,20 @@ function getDatabase() {
 			requiredEnvVars.push("DB_FILENAME");
 			break;
 		case "oracledb":
-			if (!env["DB_CONNECT_STRING"]) {
-				requiredEnvVars.push("DB_HOST", "DB_PORT", "DB_DATABASE", "DB_USER", "DB_PASSWORD");
-			} else {
-				requiredEnvVars.push("DB_USER", "DB_PASSWORD", "DB_CONNECT_STRING");
-			}
+			if (!env["DB_CONNECT_STRING"]) requiredEnvVars.push("DB_HOST", "DB_PORT", "DB_DATABASE", "DB_USER", "DB_PASSWORD");
+			else requiredEnvVars.push("DB_USER", "DB_PASSWORD", "DB_CONNECT_STRING");
 			break;
 		case "cockroachdb":
 		case "pg":
-			if (!connectionString) {
-				requiredEnvVars.push("DB_HOST", "DB_PORT", "DB_DATABASE", "DB_USER");
-			} else {
-				requiredEnvVars.push("DB_CONNECTION_STRING");
-			}
+			if (!connectionString) requiredEnvVars.push("DB_HOST", "DB_PORT", "DB_DATABASE", "DB_USER");
+			else requiredEnvVars.push("DB_CONNECTION_STRING");
 			break;
 		case "mysql":
-			if (!env["DB_SOCKET_PATH"]) {
-				requiredEnvVars.push("DB_HOST", "DB_PORT", "DB_DATABASE", "DB_USER", "DB_PASSWORD");
-			} else {
-				requiredEnvVars.push("DB_DATABASE", "DB_USER", "DB_PASSWORD", "DB_SOCKET_PATH");
-			}
+			if (!env["DB_SOCKET_PATH"]) requiredEnvVars.push("DB_HOST", "DB_PORT", "DB_DATABASE", "DB_USER", "DB_PASSWORD");
+			else requiredEnvVars.push("DB_DATABASE", "DB_USER", "DB_PASSWORD", "DB_SOCKET_PATH");
 			break;
 		case "mssql":
-			if (!env["DB_TYPE"] || env["DB_TYPE"] === "default") {
-				requiredEnvVars.push("DB_HOST", "DB_PORT", "DB_DATABASE", "DB_USER", "DB_PASSWORD");
-			}
+			if (!env["DB_TYPE"] || env["DB_TYPE"] === "default") requiredEnvVars.push("DB_HOST", "DB_PORT", "DB_DATABASE", "DB_USER", "DB_PASSWORD");
 			break;
 		default: requiredEnvVars.push("DB_HOST", "DB_PORT", "DB_DATABASE", "DB_USER", "DB_PASSWORD");
 	}
@@ -90,32 +77,26 @@ function getDatabase() {
 			callback(null, conn);
 		};
 	}
-	if (client === "cockroachdb") {
-		poolConfig.afterCreate = (conn, callback) => {
-			logger.trace("Setting CRDB serial_normalization and default_int_size");
-			conn.query("SET serial_normalization = \"sql_sequence\"");
-			conn.query("SET default_int_size = 4");
-			callback(null, conn);
-		};
-	}
-	if (client === "oracledb") {
-		poolConfig.afterCreate = (conn, callback) => {
-			logger.trace("Setting OracleDB NLS_DATE_FORMAT and NLS_TIMESTAMP_FORMAT");
-			conn.execute("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD\"T\"HH24:MI:SS.FF3\"Z\"'");
-			conn.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD'");
-			callback(null, conn);
-		};
-	}
+	if (client === "cockroachdb") poolConfig.afterCreate = (conn, callback) => {
+		logger.trace("Setting CRDB serial_normalization and default_int_size");
+		conn.query("SET serial_normalization = \"sql_sequence\"");
+		conn.query("SET default_int_size = 4");
+		callback(null, conn);
+	};
+	if (client === "oracledb") poolConfig.afterCreate = (conn, callback) => {
+		logger.trace("Setting OracleDB NLS_DATE_FORMAT and NLS_TIMESTAMP_FORMAT");
+		conn.execute("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD\"T\"HH24:MI:SS.FF3\"Z\"'");
+		conn.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD'");
+		callback(null, conn);
+	};
 	if (client === "mysql") {
 		if (isObject(knexConfig.connection)) delete knexConfig.connection["filename"];
 		Object.assign(knexConfig, { client: "mysql2" });
 	}
-	if (client === "mssql") {
-		merge(knexConfig, { connection: { options: { useUTC: false } } });
-	}
+	if (client === "mssql") merge(knexConfig, { connection: { options: { useUTC: false } } });
 	database = knex.default(knexConfig);
 	validateDatabaseCharset(database);
-	const times = new Map();
+	const times = /* @__PURE__ */ new Map();
 	database.on("query", ({ __knexUid }) => {
 		times.set(__knexUid, performance.now());
 	}).on("query-response", (_response, queryInfo) => {
@@ -134,9 +115,7 @@ function getDatabase() {
 	return database;
 }
 function getSchemaInspector(database$1) {
-	if (inspector) {
-		return inspector;
-	}
+	if (inspector) return inspector;
 	database$1 ??= getDatabase();
 	inspector = createInspector(database$1);
 	return inspector;
@@ -144,11 +123,8 @@ function getSchemaInspector(database$1) {
 async function hasDatabaseConnection(database$1) {
 	database$1 = database$1 ?? getDatabase();
 	try {
-		if (getDatabaseClient(database$1) === "oracle") {
-			await database$1.raw("select 1 from DUAL");
-		} else {
-			await database$1.raw("SELECT 1");
-		}
+		if (getDatabaseClient(database$1) === "oracle") await database$1.raw("select 1 from DUAL");
+		else await database$1.raw("SELECT 1");
 		return true;
 	} catch {
 		return false;
@@ -158,11 +134,8 @@ async function validateDatabaseConnection(database$1) {
 	database$1 = database$1 ?? getDatabase();
 	const logger = useLogger();
 	try {
-		if (getDatabaseClient(database$1) === "oracle") {
-			await database$1.raw("select 1 from DUAL");
-		} else {
-			await database$1.raw("SELECT 1");
-		}
+		if (getDatabaseClient(database$1) === "oracle") await database$1.raw("select 1 from DUAL");
+		else await database$1.raw("SELECT 1");
 	} catch (error) {
 		logger.error(`Can't connect to the database.`);
 		logger.error(error);
@@ -184,8 +157,7 @@ function getDatabaseClient(database$1) {
 	throw new Error(`Couldn't extract database client`);
 }
 async function isInstalled() {
-	const inspector$1 = getSchemaInspector();
-	return await inspector$1.hasTable("directus_collections");
+	return await getSchemaInspector().hasTable("directus_collections");
 }
 async function validateMigrations() {
 	const database$1 = getDatabase();
@@ -213,20 +185,16 @@ async function validateDatabaseExtensions() {
 	const logger = useLogger();
 	const database$1 = getDatabase();
 	const client = getDatabaseClient(database$1);
-	const helpers = getHelpers(database$1);
-	const geometrySupport = await helpers.st.supported();
-	if (!geometrySupport) {
-		switch (client) {
-			case "postgres":
-				logger.warn(`PostGIS isn't installed. Geometry type support will be limited.`);
-				break;
-			case "sqlite":
-				logger.warn(`Spatialite isn't installed. Geometry type support will be limited.`);
-				break;
-			default:
-				logger.warn(`Geometry type not supported on ${client}`);
-				break;
-		}
+	if (!await getHelpers(database$1).st.supported()) switch (client) {
+		case "postgres":
+			logger.warn(`PostGIS isn't installed. Geometry type support will be limited.`);
+			break;
+		case "sqlite":
+			logger.warn(`Spatialite isn't installed. Geometry type support will be limited.`);
+			break;
+		default:
+			logger.warn(`Geometry type not supported on ${client}`);
+			break;
 	}
 }
 async function validateDatabaseCharset(database$1) {
@@ -249,19 +217,13 @@ async function validateDatabaseCharset(database$1) {
 		for (const table of tables) {
 			if (excludedTables.includes(table.name)) continue;
 			const tableColumns = columns.filter((column) => column.table_name === table.name);
-			const tableHasInvalidCollation = table.collation !== collation;
-			if (tableHasInvalidCollation || tableColumns.length > 0) {
+			if (table.collation !== collation || tableColumns.length > 0) {
 				inconsistencies += `\t\t- Table "${table.name}": "${table.collation}"\n`;
-				for (const column of tableColumns) {
-					inconsistencies += `\t\t  - Column "${column.name}": "${column.collation}"\n`;
-				}
+				for (const column of tableColumns) inconsistencies += `\t\t  - Column "${column.name}": "${column.collation}"\n`;
 			}
 		}
-		if (inconsistencies) {
-			logger.warn(`Some tables and columns do not match your database's default collation (${collation}):\n${inconsistencies}`);
-		}
+		if (inconsistencies) logger.warn(`Some tables and columns do not match your database's default collation (${collation}):\n${inconsistencies}`);
 	}
-	return;
 }
 
 //#endregion

package/dist/database/migrations/20201029A-remove-system-relations.js

@@ -110,11 +110,7 @@ async function down(knex) {
 			one_primary: "id"
 		}
 	].map((row) => {
-		for (const [key, value] of Object.entries(row)) {
-			if (value !== null && (typeof value === "object" || Array.isArray(value))) {
-				row[key] = JSON.stringify(value);
-			}
-		}
+		for (const [key, value] of Object.entries(row)) if (value !== null && (typeof value === "object" || Array.isArray(value))) row[key] = JSON.stringify(value);
 		return merge({}, defaults, row);
 	});
 	await knex.insert(systemRelations).into("directus_relations");

package/dist/database/migrations/20201029B-remove-system-collections.js

@@ -84,11 +84,7 @@ async function down(knex) {
 			note: "Configuration for event-based HTTP requests"
 		}
 	].map((row) => {
-		for (const [key, value] of Object.entries(row)) {
-			if (value !== null && (typeof value === "object" || Array.isArray(value))) {
-				row[key] = JSON.stringify(value);
-			}
-		}
+		for (const [key, value] of Object.entries(row)) if (value !== null && (typeof value === "object" || Array.isArray(value))) row[key] = JSON.stringify(value);
 		return merge({}, defaults, row);
 	});
 	await knex.insert(systemCollections).into("directus_collections");

package/dist/database/migrations/20201029C-remove-system-fields.js

@@ -1515,11 +1515,7 @@ const systemFields = [
 		special: "csv"
 	}
 ].map((row) => {
-	for (const [key, value] of Object.entries(row)) {
-		if (value !== null && (typeof value === "object" || Array.isArray(value))) {
-			row[key] = JSON.stringify(value);
-		}
-	}
+	for (const [key, value] of Object.entries(row)) if (value !== null && (typeof value === "object" || Array.isArray(value))) row[key] = JSON.stringify(value);
 	return merge({}, defaults, row);
 });
 async function up(knex) {

package/dist/database/migrations/20201105A-add-cascade-system-relations.js

@@ -96,23 +96,17 @@ const updates = [
 * Postgres behaves erratic on those triggers, not sure if MySQL / Maria plays nice either.
 */
 async function up(knex) {
-	for (const update of updates) {
-		await knex.schema.alterTable(update.table, (table) => {
-			for (const constraint of update.constraints) {
-				table.dropForeign([constraint.column]);
-				table.foreign(constraint.column).references(constraint.references);
-			}
-		});
-	}
+	for (const update of updates) await knex.schema.alterTable(update.table, (table) => {
+		for (const constraint of update.constraints) {
+			table.dropForeign([constraint.column]);
+			table.foreign(constraint.column).references(constraint.references);
+		}
+	});
 }
 async function down(knex) {
-	for (const update of updates) {
-		await knex.schema.alterTable(update.table, (table) => {
-			for (const constraint of update.constraints) {
-				table.dropForeign([constraint.column]);
-			}
-		});
-	}
+	for (const update of updates) await knex.schema.alterTable(update.table, (table) => {
+		for (const constraint of update.constraints) table.dropForeign([constraint.column]);
+	});
 }
 
 //#endregion

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

@@ -14,12 +14,10 @@ async function up(knex) {
 	]);
 	for (const field of fieldsWithSort) {
 		const options = typeof field.options === "string" ? parseJSON(field.options) : field.options ?? {};
-		if ("sortField" in options) {
-			await knex("directus_relations").update({ sort_field: options.sortField }).where({
-				one_collection: field.collection,
-				one_field: field.field
-			});
-		}
+		if ("sortField" in options) await knex("directus_relations").update({ sort_field: options.sortField }).where({
+			one_collection: field.collection,
+			one_field: field.field
+		});
 	}
 }
 async function down(knex) {

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

@@ -2,15 +2,13 @@ import { getHelpers } from "../helpers/index.js";
 
 //#region src/database/migrations/20210415A-make-filesize-nullable.ts
 async function up(knex) {
-	const helper = getHelpers(knex).schema;
-	await helper.changeToType("directus_files", "filesize", "integer", {
+	await getHelpers(knex).schema.changeToType("directus_files", "filesize", "integer", {
 		nullable: true,
 		default: null
 	});
 }
 async function down(knex) {
-	const helper = getHelpers(knex).schema;
-	await helper.changeToType("directus_files", "filesize", "integer", {
+	await getHelpers(knex).schema.changeToType("directus_files", "filesize", "integer", {
 		nullable: false,
 		default: 0
 	});

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

@@ -52,29 +52,22 @@ const changes = [
 	["tfa-setup", "system-mfa-setup"]
 ];
 async function up(knex) {
-	for (const [before, after, options] of changes) {
-		if (options) {
-			const fields = await knex.select("id", "options").from("directus_fields").where({ interface: before });
-			for (const { id, options: existingOptionsRaw } of fields) {
-				const existingOptions = typeof existingOptionsRaw === "string" ? parseJSON(existingOptionsRaw) : existingOptionsRaw;
-				const newOptions = {
-					...existingOptions || {},
-					...options
-				};
-				await knex("directus_fields").update({
-					interface: after,
-					options: JSON.stringify(newOptions)
-				}).where({ id });
-			}
-		} else {
-			await knex("directus_fields").update({ interface: after }).where({ interface: before });
+	for (const [before, after, options] of changes) if (options) {
+		const fields = await knex.select("id", "options").from("directus_fields").where({ interface: before });
+		for (const { id, options: existingOptionsRaw } of fields) {
+			const newOptions = {
+				...(typeof existingOptionsRaw === "string" ? parseJSON(existingOptionsRaw) : existingOptionsRaw) || {},
+				...options
+			};
+			await knex("directus_fields").update({
+				interface: after,
+				options: JSON.stringify(newOptions)
+			}).where({ id });
 		}
-	}
+	} else await knex("directus_fields").update({ interface: after }).where({ interface: before });
 }
 async function down(knex) {
-	for (const [before, after] of changes) {
-		await knex("directus_fields").update({ interface: before }).where({ interface: after });
-	}
+	for (const [before, after] of changes) await knex("directus_fields").update({ interface: before }).where({ interface: after });
 }
 
 //#endregion

package/dist/database/migrations/20210518A-add-foreign-key-constraints.js

@@ -7,10 +7,8 @@ async function up(knex) {
 	const logger = useLogger();
 	const inspector = createInspector(knex);
 	const foreignKeys = await inspector.foreignKeys();
-	const relations = await knex.select("id", "many_collection", "many_field", "one_collection").from("directus_relations");
-	const constraintsToAdd = relations.filter((relation) => {
-		const exists = !!foreignKeys.find((fk) => fk.table === relation?.many_collection && fk.column === relation?.many_field);
-		return exists === false;
+	const constraintsToAdd = (await knex.select("id", "many_collection", "many_field", "one_collection").from("directus_relations")).filter((relation) => {
+		return !!foreignKeys.find((fk) => fk.table === relation?.many_collection && fk.column === relation?.many_field) === false;
 	});
 	const corruptedRelations = [];
 	for (const constraint of constraintsToAdd) {
@@ -35,11 +33,8 @@ async function up(knex) {
 				await knex(constraint.many_collection).update({ [constraint.many_field]: null }).whereIn(currentPrimaryKeyField, ids);
 			} catch {
 				logger.error(`${constraint.many_collection}.${constraint.many_field} contains illegal foreign keys which couldn't be set to NULL. Please fix these references and rerun this migration to complete the upgrade.`);
-				if (ids.length < 25) {
-					logger.error(`Items with illegal foreign keys: ${ids.join(", ")}`);
-				} else {
-					logger.error(`Items with illegal foreign keys: ${ids.slice(0, 25).join(", ")} and ${ids.length} others`);
-				}
+				if (ids.length < 25) logger.error(`Items with illegal foreign keys: ${ids.join(", ")}`);
+				else logger.error(`Items with illegal foreign keys: ${ids.slice(0, 25).join(", ")} and ${ids.length} others`);
 				throw "Migration aborted";
 			}
 		}
@@ -47,23 +42,17 @@ async function up(knex) {
 		const relatedColumnInfo = await inspector.columnInfo(constraint.one_collection, relatedPrimaryKeyField);
 		try {
 			await knex.schema.alterTable(constraint.many_collection, (table) => {
-				if (columnInfo.data_type !== relatedColumnInfo.data_type && columnInfo.data_type === "int" && relatedColumnInfo.data_type === "int unsigned") {
-					table.specificType(constraint.many_field, "int unsigned").alter();
-				}
+				if (columnInfo.data_type !== relatedColumnInfo.data_type && columnInfo.data_type === "int" && relatedColumnInfo.data_type === "int unsigned") table.specificType(constraint.many_field, "int unsigned").alter();
 				const indexName = getDefaultIndexName("foreign", constraint.many_collection, constraint.many_field);
 				const builder = table.foreign(constraint.many_field, indexName).references(relatedPrimaryKeyField).inTable(constraint.one_collection);
-				if (constraint.many_collection !== constraint.one_collection) {
-					builder.onDelete("SET NULL");
-				}
+				if (constraint.many_collection !== constraint.one_collection) builder.onDelete("SET NULL");
 			});
 		} catch (err) {
 			logger.warn(`Couldn't add foreign key constraint for ${constraint.many_collection}.${constraint.many_field}<->${constraint.one_collection}`);
 			logger.warn(err);
 		}
 	}
-	if (corruptedRelations.length > 0) {
-		logger.warn(`Encountered one or more corrupted relationships. Please check the following rows in "directus_relations": ${corruptedRelations.join(", ")}`);
-	}
+	if (corruptedRelations.length > 0) logger.warn(`Encountered one or more corrupted relationships. Please check the following rows in "directus_relations": ${corruptedRelations.join(", ")}`);
 }
 async function down(knex) {
 	const logger = useLogger();

package/dist/database/migrations/20210519A-add-system-fk-triggers.js

@@ -68,78 +68,69 @@ const updates = [
 ];
 async function up(knex) {
 	const logger = useLogger();
-	const inspector = createInspector(knex);
-	const foreignKeys = await inspector.foreignKeys();
-	for (const update of updates) {
-		for (const constraint of update.constraints) {
-			const existingForeignKey = foreignKeys.find((fk) => fk.table === update.table && fk.column === constraint.column && fk.foreign_key_table === constraint.references.split(".")[0] && fk.foreign_key_column === constraint.references.split(".")[1]);
-			try {
-				await knex.schema.alterTable(update.table, (table) => {
-					table.dropForeign([constraint.column], existingForeignKey?.constraint_name || undefined);
-				});
-			} catch (err) {
-				logger.warn(`Couldn't drop foreign key ${update.table}.${constraint.column}->${constraint.references}`);
-				logger.warn(err);
-			}
-			/**
-			* MySQL won't delete the index when you drop the foreign key constraint. Gotta make
-			* sure to clean those up as well
-			*/
-			if (getDatabaseClient(knex) === "mysql") {
-				try {
-					await knex.schema.alterTable(update.table, (table) => {
-						table.dropIndex([constraint.column], `${update.table}_${constraint.column}_foreign`);
-					});
-				} catch (err) {
-					logger.warn(`Couldn't clean up index for foreign key ${update.table}.${constraint.column}->${constraint.references}`);
-					logger.warn(err);
-				}
-			}
-			try {
-				await knex.schema.alterTable(update.table, (table) => {
-					table.foreign(constraint.column).references(constraint.references).onDelete(constraint.on_delete);
-				});
-			} catch (err) {
-				logger.warn(`Couldn't add foreign key to ${update.table}.${constraint.column}->${constraint.references}`);
-				logger.warn(err);
-			}
+	const foreignKeys = await createInspector(knex).foreignKeys();
+	for (const update of updates) for (const constraint of update.constraints) {
+		const existingForeignKey = foreignKeys.find((fk) => fk.table === update.table && fk.column === constraint.column && fk.foreign_key_table === constraint.references.split(".")[0] && fk.foreign_key_column === constraint.references.split(".")[1]);
+		try {
+			await knex.schema.alterTable(update.table, (table) => {
+				table.dropForeign([constraint.column], existingForeignKey?.constraint_name || void 0);
+			});
+		} catch (err) {
+			logger.warn(`Couldn't drop foreign key ${update.table}.${constraint.column}->${constraint.references}`);
+			logger.warn(err);
+		}
+		/**
+		* MySQL won't delete the index when you drop the foreign key constraint. Gotta make
+		* sure to clean those up as well
+		*/
+		if (getDatabaseClient(knex) === "mysql") try {
+			await knex.schema.alterTable(update.table, (table) => {
+				table.dropIndex([constraint.column], `${update.table}_${constraint.column}_foreign`);
+			});
+		} catch (err) {
+			logger.warn(`Couldn't clean up index for foreign key ${update.table}.${constraint.column}->${constraint.references}`);
+			logger.warn(err);
+		}
+		try {
+			await knex.schema.alterTable(update.table, (table) => {
+				table.foreign(constraint.column).references(constraint.references).onDelete(constraint.on_delete);
+			});
+		} catch (err) {
+			logger.warn(`Couldn't add foreign key to ${update.table}.${constraint.column}->${constraint.references}`);
+			logger.warn(err);
 		}
 	}
 }
 async function down(knex) {
 	const logger = useLogger();
-	for (const update of updates) {
-		for (const constraint of update.constraints) {
-			try {
-				await knex.schema.alterTable(update.table, (table) => {
-					table.dropForeign([constraint.column]);
-				});
-			} catch (err) {
-				logger.warn(`Couldn't drop foreign key ${update.table}.${constraint.column}->${constraint.references}`);
-				logger.warn(err);
-			}
-			/**
-			* MySQL won't delete the index when you drop the foreign key constraint. Gotta make
-			* sure to clean those up as well
-			*/
-			if (getDatabaseClient(knex) === "mysql") {
-				try {
-					await knex.schema.alterTable(update.table, (table) => {
-						table.dropIndex([constraint.column], `${update.table}_${constraint.column}_foreign`);
-					});
-				} catch (err) {
-					logger.warn(`Couldn't clean up index for foreign key ${update.table}.${constraint.column}->${constraint.references}`);
-					logger.warn(err);
-				}
-			}
-			try {
-				await knex.schema.alterTable(update.table, (table) => {
-					table.foreign(constraint.column).references(constraint.references);
-				});
-			} catch (err) {
-				logger.warn(`Couldn't add foreign key to ${update.table}.${constraint.column}->${constraint.references}`);
-				logger.warn(err);
-			}
+	for (const update of updates) for (const constraint of update.constraints) {
+		try {
+			await knex.schema.alterTable(update.table, (table) => {
+				table.dropForeign([constraint.column]);
+			});
+		} catch (err) {
+			logger.warn(`Couldn't drop foreign key ${update.table}.${constraint.column}->${constraint.references}`);
+			logger.warn(err);
+		}
+		/**
+		* MySQL won't delete the index when you drop the foreign key constraint. Gotta make
+		* sure to clean those up as well
+		*/
+		if (getDatabaseClient(knex) === "mysql") try {
+			await knex.schema.alterTable(update.table, (table) => {
+				table.dropIndex([constraint.column], `${update.table}_${constraint.column}_foreign`);
+			});
+		} catch (err) {
+			logger.warn(`Couldn't clean up index for foreign key ${update.table}.${constraint.column}->${constraint.references}`);
+			logger.warn(err);
+		}
+		try {
+			await knex.schema.alterTable(update.table, (table) => {
+				table.foreign(constraint.column).references(constraint.references);
+			});
+		} catch (err) {
+			logger.warn(`Couldn't add foreign key to ${update.table}.${constraint.column}->${constraint.references}`);
+			logger.warn(err);
 		}
 	}
 }

package/dist/database/migrations/20210626A-change-filesize-bigint.js

@@ -2,19 +2,13 @@ import { getHelpers } from "../helpers/index.js";
 
 //#region src/database/migrations/20210626A-change-filesize-bigint.ts
 async function up(knex) {
-	const helper = getHelpers(knex).schema;
-	if (helper.isOneOfClients(["oracle", "cockroachdb"])) {
-		return;
-	}
+	if (getHelpers(knex).schema.isOneOfClients(["oracle", "cockroachdb"])) return;
 	await knex.schema.alterTable("directus_files", (table) => {
 		table.bigInteger("filesize").nullable().defaultTo(null).alter();
 	});
 }
 async function down(knex) {
-	const helper = getHelpers(knex).schema;
-	if (helper.isOneOfClients(["oracle", "cockroachdb"])) {
-		return;
-	}
+	if (getHelpers(knex).schema.isOneOfClients(["oracle", "cockroachdb"])) return;
 	await knex.schema.alterTable("directus_files", (table) => {
 		table.integer("filesize").nullable().defaultTo(null).alter();
 	});

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

@@ -7,15 +7,13 @@ 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" ? parseJSON(dividerGroup.options) : dividerGroup.options;
-				if (options.icon) newOptions.headerIcon = options.icon;
-				if (options.color) newOptions.headerColor = options.color;
-			} catch (err) {
-				logger.warn(`Couldn't convert previous options from field ${dividerGroup.collection}.${dividerGroup.field}`);
-				logger.warn(err);
-			}
+		if (dividerGroup.options) try {
+			const options = typeof dividerGroup.options === "string" ? parseJSON(dividerGroup.options) : dividerGroup.options;
+			if (options.icon) newOptions.headerIcon = options.icon;
+			if (options.color) newOptions.headerColor = options.color;
+		} catch (err) {
+			logger.warn(`Couldn't convert previous options from field ${dividerGroup.collection}.${dividerGroup.field}`);
+			logger.warn(err);
 		}
 		try {
 			await knex("directus_fields").update({

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

@@ -5,20 +5,10 @@ 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" ? parseJSON(group.options) : group.options || {};
-		if (options.showHeader === true) {
-			detail.push(group);
-		} else {
-			raw.push(group);
-		}
-	}
-	for (const field of raw) {
-		await knex("directus_fields").update({ interface: "group-raw" }).where({ id: field.id });
-	}
-	for (const field of detail) {
-		await knex("directus_fields").update({ interface: "group-detail" }).where({ id: field.id });
-	}
+	for (const group of groups) if ((typeof group.options === "string" ? parseJSON(group.options) : group.options || {}).showHeader === true) detail.push(group);
+	else raw.push(group);
+	for (const field of raw) await knex("directus_fields").update({ interface: "group-raw" }).where({ id: field.id });
+	for (const field of detail) await knex("directus_fields").update({ interface: "group-detail" }).where({ id: field.id });
 }
 async function down(knex) {
 	await knex("directus_fields").update({ interface: "group-standard" }).where({ interface: "group-detail" }).orWhere({ interface: "group-raw" });

package/dist/database/migrations/20210805B-change-image-metadata-structure.js

@@ -24,12 +24,8 @@ async function up(knex) {
 				newMetadata.interop = newMetadata.interoperability;
 				delete newMetadata.interoperability;
 			}
-			if (prevMetadata.icc) {
-				newMetadata.icc = prevMetadata.icc;
-			}
-			if (prevMetadata.iptc) {
-				newMetadata.iptc = prevMetadata.iptc;
-			}
+			if (prevMetadata.icc) newMetadata.icc = prevMetadata.icc;
+			if (prevMetadata.iptc) newMetadata.iptc = prevMetadata.iptc;
 			await knex("directus_files").update({ metadata: JSON.stringify(newMetadata) }).where({ id });
 		}
 	}