@directus/api 35.0.2 → 35.2.0

package/dist/database/migrations/20230721A-require-shares-fields.js

@@ -5,44 +5,33 @@ import { createInspector } from "@directus/schema";
 //#region src/database/migrations/20230721A-require-shares-fields.ts
 async function up(knex) {
 	const isMysql = getDatabaseClient(knex) === "mysql";
-	if (isMysql) {
-		await dropConstraint(knex);
-	}
+	if (isMysql) await dropConstraint(knex);
 	await knex.schema.alterTable("directus_shares", (table) => {
 		table.dropNullable("collection");
 		table.dropNullable("item");
 	});
-	if (isMysql) {
-		await recreateConstraint(knex);
-	}
+	if (isMysql) await recreateConstraint(knex);
 }
 async function down(knex) {
 	const isMysql = getDatabaseClient(knex) === "mysql";
-	if (isMysql) {
-		await dropConstraint(knex);
-	}
+	if (isMysql) await dropConstraint(knex);
 	await knex.schema.alterTable("directus_shares", (table) => {
 		table.setNullable("collection");
 		table.setNullable("item");
 	});
-	if (isMysql) {
-		await recreateConstraint(knex);
-	}
+	if (isMysql) await recreateConstraint(knex);
 }
 /**
 * Temporarily drop foreign key constraint for MySQL instances, see https://github.com/directus/directus/issues/19399
 */
 async function dropConstraint(knex) {
 	const logger = useLogger();
-	const inspector = createInspector(knex);
-	const foreignKeys = await inspector.foreignKeys("directus_shares");
-	const collectionForeignKeys = foreignKeys.filter((fk) => fk.column === "collection");
+	const collectionForeignKeys = (await createInspector(knex).foreignKeys("directus_shares")).filter((fk) => fk.column === "collection");
 	const constraintName = collectionForeignKeys[0]?.constraint_name;
-	if (constraintName && collectionForeignKeys.length === 1) {
-		await knex.schema.alterTable("directus_shares", (table) => {
-			table.dropForeign("collection", constraintName);
-		});
-	} else {
+	if (constraintName && collectionForeignKeys.length === 1) await knex.schema.alterTable("directus_shares", (table) => {
+		table.dropForeign("collection", constraintName);
+	});
+	else {
 		logger.warn(`Unexpected number of foreign key constraints on 'directus_shares.collection':`);
 		logger.warn(JSON.stringify(collectionForeignKeys, null, 4));
 	}

package/dist/database/migrations/20231009A-update-csv-fields-to-text.js

@@ -7,15 +7,13 @@ async function up(knex) {
 	const helper = getHelpers(knex).schema;
 	const csvFields = await knex.select("collection", "field").from("directus_fields").where("special", "=", "cast-csv");
 	const updates = [];
-	for (const { collection, field } of csvFields) {
-		updates.push(inspector.columnInfo(collection, field).then((column) => {
-			if (column.data_type === "text") return;
-			return helper.changeToType(collection, field, "text", {
-				default: column.default_value,
-				nullable: column.is_nullable
-			});
-		}));
-	}
+	for (const { collection, field } of csvFields) updates.push(inspector.columnInfo(collection, field).then((column) => {
+		if (column.data_type === "text") return;
+		return helper.changeToType(collection, field, "text", {
+			default: column.default_value,
+			nullable: column.is_nullable
+		});
+	}));
 	return checkPromises(updates);
 }
 async function down(knex) {
@@ -23,22 +21,17 @@ async function down(knex) {
 	const helper = getHelpers(knex).schema;
 	const csvFields = await knex.select("collection", "field").from("directus_fields").where("special", "=", "cast-csv");
 	const updates = [];
-	for (const { collection, field } of csvFields) {
-		updates.push(inspector.columnInfo(collection, field).then((column) => {
-			return helper.changeToType(collection, field, "string", {
-				default: column.default_value,
-				nullable: column.is_nullable
-			});
-		}));
-	}
+	for (const { collection, field } of csvFields) updates.push(inspector.columnInfo(collection, field).then((column) => {
+		return helper.changeToType(collection, field, "string", {
+			default: column.default_value,
+			nullable: column.is_nullable
+		});
+	}));
 	return checkPromises(updates);
 }
 async function checkPromises(promises) {
-	const result = await Promise.allSettled(promises);
-	const errors = result.filter(isRejectedPromise).map((promise) => promise.reason);
-	if (errors.length > 0) {
-		throw new Error(errors.toString());
-	}
+	const errors = (await Promise.allSettled(promises)).filter(isRejectedPromise).map((promise) => promise.reason);
+	if (errors.length > 0) throw new Error(errors.toString());
 }
 function isRejectedPromise(promise) {
 	return promise.status === "rejected";

package/dist/database/migrations/20231009B-update-panel-options.js

@@ -5,9 +5,7 @@ async function up(knex) {
 	for (const panel of panels) {
 		let options = panel.options;
 		const wasStringified = typeof options === "string";
-		if (wasStringified) {
-			options = JSON.parse(options);
-		}
+		if (wasStringified) options = JSON.parse(options);
 		if (!options) continue;
 		let needsUpdate = false;
 		if (options.abbreviate === true) {
@@ -22,9 +20,7 @@ async function up(knex) {
 			needsUpdate = true;
 		}
 		if (needsUpdate) {
-			if (wasStringified) {
-				options = JSON.stringify(options);
-			}
+			if (wasStringified) options = JSON.stringify(options);
 			updates.push(knex("directus_panels").update({ options }).where("id", panel.id));
 		}
 	}
@@ -36,9 +32,7 @@ async function down(knex) {
 	for (const panel of panels) {
 		let options = panel.options;
 		const wasStringified = typeof options === "string";
-		if (wasStringified) {
-			options = JSON.parse(options);
-		}
+		if (wasStringified) options = JSON.parse(options);
 		if (!options) continue;
 		let needsUpdate = false;
 		if (options.notation === "compact") {
@@ -53,9 +47,7 @@ async function down(knex) {
 			needsUpdate = true;
 		}
 		if (needsUpdate) {
-			if (wasStringified) {
-				options = JSON.stringify(options);
-			}
+			if (wasStringified) options = JSON.stringify(options);
 			updates.push(knex("directus_panels").update({ options }).where("id", panel.id));
 		}
 	}

package/dist/database/migrations/20240204A-marketplace.js

@@ -14,29 +14,26 @@ async function up(knex) {
 		table.uuid("bundle");
 	});
 	const installedExtensions = await knex.select("name").from("directus_extensions");
-	const idMap = new Map();
-	for (const { name } of installedExtensions) {
-		if (name.includes(":")) {
-			await knex("directus_extensions").delete().where({ name });
-		} else {
-			const id = randomUUID();
-			let source;
-			try {
-				resolvePackage(name, __dirname);
-				source = "module";
-			} catch {
-				source = "local";
-			}
-			await knex("directus_extensions").update({
-				id,
-				source,
-				folder: name
-			}).where({ name });
-			idMap.set(name, {
-				id,
-				source
-			});
+	const idMap = /* @__PURE__ */ new Map();
+	for (const { name } of installedExtensions) if (name.includes(":")) await knex("directus_extensions").delete().where({ name });
+	else {
+		const id = randomUUID();
+		let source;
+		try {
+			resolvePackage(name, __dirname);
+			source = "module";
+		} catch {
+			source = "local";
 		}
+		await knex("directus_extensions").update({
+			id,
+			source,
+			folder: name
+		}).where({ name });
+		idMap.set(name, {
+			id,
+			source
+		});
 	}
 	for (const { name } of installedExtensions) {
 		if (!name.includes("/")) continue;
@@ -82,10 +79,7 @@ async function down(knex) {
 			continue;
 		}
 		let name = folder;
-		if (bundle) {
-			const bundleParentName = idMap.get(bundle);
-			name = `${bundleParentName}/${name}`;
-		}
+		if (bundle) name = `${idMap.get(bundle)}/${name}`;
 		await knex("directus_extensions").update({ name }).where({ id });
 	}
 	await knex.transaction(async (trx) => {

package/dist/database/migrations/20240311A-deprecate-webhooks.js

@@ -61,7 +61,7 @@ async function up(knex) {
 				position_y: 1,
 				options: {
 					url: webhook.url,
-					body: webhook.data ? "{{$last}}" : undefined,
+					body: webhook.data ? "{{$last}}" : void 0,
 					method: webhook.method,
 					headers: typeof webhook.headers === "string" ? parseJSON(webhook.headers) : webhook.headers
 				},

package/dist/database/migrations/20240716A-update-files-date-fields.js

@@ -2,13 +2,10 @@ import { getDatabaseClient } from "../index.js";
 
 //#region src/database/migrations/20240716A-update-files-date-fields.ts
 async function up(knex) {
-	if (getDatabaseClient(knex) === "mysql") {
-		await knex.schema.raw("ALTER TABLE `directus_files` CHANGE `uploaded_on` `created_on` TIMESTAMP NOT NULL DEFAULT current_timestamp();");
-	} else {
-		await knex.schema.alterTable("directus_files", (table) => {
-			table.renameColumn("uploaded_on", "created_on");
-		});
-	}
+	if (getDatabaseClient(knex) === "mysql") await knex.schema.raw("ALTER TABLE `directus_files` CHANGE `uploaded_on` `created_on` TIMESTAMP NOT NULL DEFAULT current_timestamp();");
+	else await knex.schema.alterTable("directus_files", (table) => {
+		table.renameColumn("uploaded_on", "created_on");
+	});
 	await knex.schema.alterTable("directus_files", (table) => {
 		table.timestamp("uploaded_on");
 	});
@@ -18,13 +15,10 @@ async function down(knex) {
 	await knex.schema.alterTable("directus_files", (table) => {
 		table.dropColumn("uploaded_on");
 	});
-	if (getDatabaseClient(knex) === "mysql") {
-		await knex.schema.raw("ALTER TABLE `directus_files` CHANGE `created_on` `uploaded_on` TIMESTAMP NOT NULL DEFAULT current_timestamp();");
-	} else {
-		await knex.schema.alterTable("directus_files", (table) => {
-			table.renameColumn("created_on", "uploaded_on");
-		});
-	}
+	if (getDatabaseClient(knex) === "mysql") await knex.schema.raw("ALTER TABLE `directus_files` CHANGE `created_on` `uploaded_on` TIMESTAMP NOT NULL DEFAULT current_timestamp();");
+	else await knex.schema.alterTable("directus_files", (table) => {
+		table.renameColumn("created_on", "uploaded_on");
+	});
 }
 
 //#endregion

package/dist/database/migrations/20240806A-permissions-policies.js

@@ -18,18 +18,14 @@ async function fetchRoleAccess(roles, context) {
 		enforce_tfa: false
 	};
 	const accessRows = await context.knex("directus_access").select("directus_policies.id", "directus_policies.admin_access", "directus_policies.app_access", "directus_policies.ip_access", "directus_policies.enforce_tfa").where("role", "in", roles).leftJoin("directus_policies", "directus_policies.id", "directus_access.policy");
-	const ipAccess = new Set();
+	const ipAccess = /* @__PURE__ */ new Set();
 	for (const { admin_access, app_access, ip_access, enforce_tfa } of accessRows) {
 		roleAccess.admin_access ||= toBoolean(admin_access);
 		roleAccess.app_access ||= toBoolean(app_access);
 		roleAccess.enforce_tfa ||= toBoolean(enforce_tfa);
-		if (ip_access && ip_access.length) {
-			ip_access.split(",").forEach((ip) => ipAccess.add(ip));
-		}
-	}
-	if (ipAccess.size > 0) {
-		roleAccess.ip_access = Array.from(ipAccess).join(",");
+		if (ip_access && ip_access.length) ip_access.split(",").forEach((ip) => ipAccess.add(ip));
 	}
+	if (ipAccess.size > 0) roleAccess.ip_access = Array.from(ipAccess).join(",");
 	return roleAccess;
 }
 /**
@@ -39,9 +35,7 @@ async function fetchRoleAccess(roles, context) {
 const PUBLIC_POLICY_ID = "abf8a154-5b1c-4a46-ac9c-7300570f4f17";
 async function up(knex) {
 	const logger = useLogger();
-	if (await knex.schema.hasTable("directus_policies")) {
-		return;
-	}
+	if (await knex.schema.hasTable("directus_policies")) return;
 	await knex.schema.createTable("directus_policies", (table) => {
 		table.uuid("id").primary();
 		table.string("name", 100).notNullable();
@@ -53,11 +47,9 @@ async function up(knex) {
 		table.boolean("app_access").defaultTo(false).notNullable();
 	});
 	const roles = await knex.select("id", "name", "icon", "description", "ip_access", "enforce_tfa", "admin_access", "app_access").from("directus_roles");
-	if (roles.length > 0) {
-		await processChunk(roles, 100, async (chunk$1) => {
-			await knex("directus_policies").insert(chunk$1);
-		});
-	}
+	if (roles.length > 0) await processChunk(roles, 100, async (chunk$1) => {
+		await knex("directus_policies").insert(chunk$1);
+	});
 	await knex.insert({
 		id: PUBLIC_POLICY_ID,
 		name: "$t:public_label",
@@ -77,9 +69,7 @@ async function up(knex) {
 		table.uuid("policy");
 	});
 	try {
-		const inspector = await getSchemaInspector(knex);
-		const foreignKeys = await inspector.foreignKeys("directus_permissions");
-		const foreignConstraint = foreignKeys.find((foreign) => foreign.foreign_key_table === "directus_roles" && foreign.column === "role")?.constraint_name || undefined;
+		const foreignConstraint = (await (await getSchemaInspector(knex)).foreignKeys("directus_permissions")).find((foreign) => foreign.foreign_key_table === "directus_roles" && foreign.column === "role")?.constraint_name || void 0;
 		await knex.schema.alterTable("directus_permissions", (table) => {
 			table.dropForeign("role", foreignConstraint);
 		});
@@ -100,14 +90,13 @@ async function up(knex) {
 		table.uuid("policy").references("directus_policies.id").notNullable().onDelete("CASCADE");
 		table.integer("sort");
 	});
-	const policyAttachments = roles.map((role) => ({
+	await processChunk(roles.map((role) => ({
 		id: randomUUID(),
 		role: role.id,
 		user: null,
 		policy: role.id,
 		sort: 1
-	}));
-	await processChunk(policyAttachments, 100, async (chunk$1) => {
+	})), 100, async (chunk$1) => {
 		await knex("directus_access").insert(chunk$1);
 	});
 	await knex("directus_access").insert({
@@ -150,7 +139,7 @@ async function down(knex) {
 				user: null,
 				ip: null
 			}, context);
-			const rawPermissions = await fetchPermissions({
+			mergePermissions("or", await fetchPermissions({
 				accountability: {
 					role: null,
 					roles: roleTree,
@@ -159,23 +148,12 @@ async function down(knex) {
 				},
 				policies,
 				bypassDynamicVariableProcessing: true
-			}, context);
-			mergePermissions("or", rawPermissions).forEach((permission) => {
-				if (permission.system) {
-					return;
-				}
-				if (Array.isArray(permission.fields)) {
-					permission.fields = permission.fields.join(",");
-				}
-				if (permission.permissions) {
-					permission.permissions = JSON.stringify(permission.permissions);
-				}
-				if (permission.validation) {
-					permission.validation = JSON.stringify(permission.validation);
-				}
-				if (permission.presets) {
-					permission.presets = JSON.stringify(permission.presets);
-				}
+			}, context)).forEach((permission) => {
+				if (permission.system) return;
+				if (Array.isArray(permission.fields)) permission.fields = permission.fields.join(",");
+				if (permission.permissions) permission.permissions = JSON.stringify(permission.permissions);
+				if (permission.validation) permission.validation = JSON.stringify(permission.validation);
+				if (permission.presets) permission.presets = JSON.stringify(permission.presets);
 				rolePermissions.push({
 					role: role.id,
 					...omit(permission, ["id", "policy"])

package/dist/database/migrations/20240909A-separate-comments.js

@@ -27,23 +27,20 @@ async function down(knex) {
 		await knex.transaction(async (trx) => {
 			for (const comment of comments) {
 				const migratedRecords = await trx("directus_activity").select("id").where("collection", "=", "directus_comments").andWhere("item", "=", comment.id).andWhere("action", "=", Action.CREATE).limit(1);
-				if (migratedRecords[0]) {
-					await trx("directus_activity").update({
-						action: Action.COMMENT,
-						collection: comment.collection,
-						item: comment.item,
-						comment: comment.comment
-					}).where("id", "=", migratedRecords[0].id);
-				} else {
-					await trx("directus_activity").insert({
-						action: Action.COMMENT,
-						collection: comment.collection,
-						item: comment.item,
-						comment: comment.comment,
-						user: comment.user_created,
-						timestamp: comment.date_created
-					});
-				}
+				if (migratedRecords[0]) await trx("directus_activity").update({
+					action: Action.COMMENT,
+					collection: comment.collection,
+					item: comment.item,
+					comment: comment.comment
+				}).where("id", "=", migratedRecords[0].id);
+				else await trx("directus_activity").insert({
+					action: Action.COMMENT,
+					collection: comment.collection,
+					item: comment.item,
+					comment: comment.comment,
+					user: comment.user_created,
+					timestamp: comment.date_created
+				});
 				await trx("directus_comments").where("id", "=", comment.id).delete();
 			}
 		});

package/dist/database/migrations/20240924A-migrate-legacy-comments.js

@@ -10,8 +10,8 @@ async function up(knex) {
 	} catch {}
 	const rowsLimit = 50;
 	let hasMore = true;
-	const existingUsers = new Set();
-	const missingUsers = new Set();
+	const existingUsers = /* @__PURE__ */ new Set();
+	const missingUsers = /* @__PURE__ */ new Set();
 	while (hasMore) {
 		const legacyComments = await knex.select("*").from("directus_activity").where("action", "=", Action.COMMENT).limit(rowsLimit);
 		if (legacyComments.length === 0) {
@@ -25,16 +25,11 @@ async function up(knex) {
 					primaryKey = randomUUID();
 					let legacyCommentUserId = legacyComment.user;
 					if (legacyCommentUserId) {
-						if (missingUsers.has(legacyCommentUserId)) {
+						if (missingUsers.has(legacyCommentUserId)) legacyCommentUserId = null;
+						else if (!existingUsers.has(legacyCommentUserId)) if (await trx.select("id").from("directus_users").where("id", "=", legacyCommentUserId).first()) existingUsers.add(legacyCommentUserId);
+						else {
+							missingUsers.add(legacyCommentUserId);
 							legacyCommentUserId = null;
-						} else if (!existingUsers.has(legacyCommentUserId)) {
-							const userExists = await trx.select("id").from("directus_users").where("id", "=", legacyCommentUserId).first();
-							if (userExists) {
-								existingUsers.add(legacyCommentUserId);
-							} else {
-								missingUsers.add(legacyCommentUserId);
-								legacyCommentUserId = null;
-							}
 						}
 					}
 					await trx("directus_comments").insert({

package/dist/database/migrations/20240924B-populate-versioning-deltas.js

@@ -13,9 +13,7 @@ async function up(knex) {
 		}
 		await knex.transaction(async (trx) => {
 			for (const missingDeltaVersion of missingDeltaVersions) {
-				const revisions = await trx.select("delta").from("directus_revisions").where("version", "=", missingDeltaVersion.id).orderBy("id");
-				const deltas = revisions.map((revision) => typeof revision.delta === "string" ? parseJSON(revision.delta) : revision.delta ?? {});
-				const consolidatedDelta = assign({}, ...deltas);
+				const consolidatedDelta = assign({}, ...(await trx.select("delta").from("directus_revisions").where("version", "=", missingDeltaVersion.id).orderBy("id")).map((revision) => typeof revision.delta === "string" ? parseJSON(revision.delta) : revision.delta ?? {}));
 				await trx("directus_versions").update({ delta: JSON.stringify(consolidatedDelta) }).where("id", "=", missingDeltaVersion.id);
 			}
 		});

package/dist/database/migrations/20250224A-visual-editor.js

@@ -24,8 +24,7 @@ async function down(knex) {
 async function updateModuleBar(knex, modify) {
 	const result = await knex("directus_settings").select("module_bar", "id").first();
 	if (result && result.module_bar) {
-		const moduleBar = typeof result.module_bar === "string" ? JSON.parse(result.module_bar) : result.module_bar;
-		const updatedModuleBar = modify(moduleBar);
+		const updatedModuleBar = modify(typeof result.module_bar === "string" ? JSON.parse(result.module_bar) : result.module_bar);
 		if (!updatedModuleBar) return;
 		await knex("directus_settings").update({ module_bar: JSON.stringify(updatedModuleBar) }).where("id", result.id);
 	}

package/dist/database/migrations/20250609A-license-banner.js

@@ -3,8 +3,7 @@ import { toBoolean } from "@directus/utils";
 
 //#region src/database/migrations/20250609A-license-banner.ts
 async function up(knex) {
-	const env = useEnv();
-	const acceptedTerms = toBoolean(env["ACCEPT_TERMS"]);
+	const acceptedTerms = toBoolean(useEnv()["ACCEPT_TERMS"]);
 	await knex.schema.alterTable("directus_settings", (table) => {
 		table.boolean("accepted_terms").defaultTo(acceptedTerms);
 	});

package/dist/database/migrations/20250613A-add-project-id.js

@@ -8,11 +8,8 @@ async function up(knex) {
 	const existing = await knex("directus_settings").select("id").first();
 	const timestamp = await knex("directus_migrations").select("timestamp").first();
 	const msecs = timestamp ? new Date(timestamp.timestamp).getTime() : Date.now();
-	if (existing) {
-		await knex("directus_settings").update({ project_id: v7({ msecs }) });
-	} else {
-		await knex("directus_settings").insert({ project_id: v7() });
-	}
+	if (existing) await knex("directus_settings").update({ project_id: v7({ msecs }) });
+	else await knex("directus_settings").insert({ project_id: v7() });
 }
 async function down(knex) {
 	await knex.schema.alterTable("directus_settings", (table) => {

package/dist/database/migrations/20251014A-add-project-owner.js

@@ -16,18 +16,15 @@ async function up(knex) {
 	});
 	const env = useEnv();
 	const settingsService = new SettingsService({ schema: await getSchema() });
-	if (email().safeParse(env["PROJECT_OWNER"]).success) {
-		await settingsService.setOwner({
-			project_owner: env["PROJECT_OWNER"],
-			org_name: null,
-			project_usage: null,
-			product_updates: false
-		});
-	}
+	if (email().safeParse(env["PROJECT_OWNER"]).success) await settingsService.setOwner({
+		project_owner: env["PROJECT_OWNER"],
+		org_name: null,
+		project_usage: null,
+		product_updates: false
+	});
 }
 async function down(knex) {
-	const env = useEnv();
-	const acceptedTerms = toBoolean(env["ACCEPT_TERMS"]);
+	const acceptedTerms = toBoolean(useEnv()["ACCEPT_TERMS"]);
 	await knex.schema.alterTable("directus_settings", (table) => {
 		table.dropColumn("project_owner");
 		table.dropColumn("project_usage");

package/dist/database/migrations/20251028A-add-retention-indexes.js

@@ -17,37 +17,29 @@ const RETENTION_INDEXES = [{
 async function up(knex) {
 	const client = getDatabaseClient(knex);
 	const helpers = getHelpers(knex);
-	const schema = await getSchema();
 	const service = new FieldsService({
 		knex,
-		schema
+		schema: await getSchema()
 	});
 	for (const { collection, field, ignore } of RETENTION_INDEXES) {
 		if (ignore.includes(client)) continue;
-		const existingColumn = await service.columnInfo(collection, field);
-		if (!existingColumn.is_indexed) {
-			await helpers.schema.createIndex(collection, field, { attemptConcurrentIndex: true });
-		}
+		if (!(await service.columnInfo(collection, field)).is_indexed) await helpers.schema.createIndex(collection, field, { attemptConcurrentIndex: true });
 	}
 }
 async function down(knex) {
 	const client = getDatabaseClient(knex);
 	const helpers = getHelpers(knex);
-	const schema = await getSchema();
 	const service = new FieldsService({
 		knex,
-		schema
+		schema: await getSchema()
 	});
 	for (const { collection, field, ignore } of RETENTION_INDEXES) {
 		if (ignore.includes(client)) continue;
-		const existingColumn = await service.columnInfo(collection, field);
-		if (existingColumn.is_indexed) {
-			await transaction(knex, async (trx) => {
-				await trx.schema.alterTable(collection, async (table) => {
-					table.dropIndex([field], helpers.schema.generateIndexName("index", collection, field));
-				});
+		if ((await service.columnInfo(collection, field)).is_indexed) await transaction(knex, async (trx) => {
+			await trx.schema.alterTable(collection, async (table) => {
+				table.dropIndex([field], helpers.schema.generateIndexName("index", collection, field));
 			});
-		}
+		});
 	}
 }
 

package/dist/database/migrations/20260113A-add-revisions-index.js

@@ -13,37 +13,29 @@ const RETENTION_INDEXES = [{
 async function up(knex) {
 	const client = getDatabaseClient(knex);
 	const helpers = getHelpers(knex);
-	const schema = await getSchema();
 	const service = new FieldsService({
 		knex,
-		schema
+		schema: await getSchema()
 	});
 	for (const { collection, field, ignore } of RETENTION_INDEXES) {
 		if (ignore.includes(client)) continue;
-		const existingColumn = await service.columnInfo(collection, field);
-		if (!existingColumn.is_indexed) {
-			await helpers.schema.createIndex(collection, field, { attemptConcurrentIndex: true });
-		}
+		if (!(await service.columnInfo(collection, field)).is_indexed) await helpers.schema.createIndex(collection, field, { attemptConcurrentIndex: true });
 	}
 }
 async function down(knex) {
 	const client = getDatabaseClient(knex);
 	const helpers = getHelpers(knex);
-	const schema = await getSchema();
 	const service = new FieldsService({
 		knex,
-		schema
+		schema: await getSchema()
 	});
 	for (const { collection, field, ignore } of RETENTION_INDEXES) {
 		if (ignore.includes(client)) continue;
-		const existingColumn = await service.columnInfo(collection, field);
-		if (existingColumn.is_indexed) {
-			await transaction(knex, async (trx) => {
-				await trx.schema.alterTable(collection, async (table) => {
-					table.dropIndex([field], helpers.schema.generateIndexName("index", collection, field));
-				});
+		if ((await service.columnInfo(collection, field)).is_indexed) await transaction(knex, async (trx) => {
+			await trx.schema.alterTable(collection, async (table) => {
+				table.dropIndex([field], helpers.schema.generateIndexName("index", collection, field));
 			});
-		}
+		});
 	}
 }