@strapi/database 5.0.0-beta.10 → 5.0.0-beta.12

package/dist/index.mjs

@@ -4735,7 +4735,7 @@ const deleteRelatedMorphOneRelationsAfterMorphToManyUpdate = async (rows, {
     await createQueryBuilder(joinTable.name, db).delete().where({ $or: orWhere }).transacting(trx).execute();
   }
 };
-const getDocumentSiblingIdsQuery = (con, tableName, id) => {
+const getDocumentSiblingIdsQuery = (tableName, id) => {
   const models = Array.from(strapi.db.metadata.values());
   const isContentType = models.find((model) => {
     return model.tableName === tableName && model.attributes.documentId;
@@ -4743,10 +4743,12 @@ const getDocumentSiblingIdsQuery = (con, tableName, id) => {
   if (!isContentType) {
     return [id];
   }
-  return con.from(tableName).select("id").where(
-    "document_id",
-    con.from(tableName).select("document_id").where("id", id)
-  );
+  return (con) => {
+    con.from(tableName).select("id").where(
+      "document_id",
+      (con2) => con2.select("document_id").from(tableName).where("id", id)
+    );
+  };
 };
 const deletePreviousOneToAnyRelations = async ({
   id,
@@ -4763,7 +4765,11 @@ const deletePreviousOneToAnyRelations = async ({
   const { joinTable } = attribute;
   const { joinColumn, inverseJoinColumn } = joinTable;
   const con = db.getConnection();
-  await con.delete().from(joinTable.name).whereNotIn(joinColumn.name, getDocumentSiblingIdsQuery(con, joinColumn.referencedTable, id)).whereIn(inverseJoinColumn.name, relIdsToadd).where(joinTable.on || {}).transacting(trx);
+  await con.delete().from(joinTable.name).whereNotIn(
+    // @ts-expect-error - knex incorrectly expects a string array
+    joinColumn.name,
+    getDocumentSiblingIdsQuery(joinColumn.referencedTable, id)
+  ).whereIn(inverseJoinColumn.name, relIdsToadd).where(joinTable.on || {}).transacting(trx);
   await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToadd, transaction: trx });
 };
 const deletePreviousAnyToOneRelations = async ({
@@ -4781,8 +4787,9 @@ const deletePreviousAnyToOneRelations = async ({
   }
   if (isManyToAny(attribute)) {
     const relsToDelete = await con.select(inverseJoinColumn.name).from(joinTable.name).where(joinColumn.name, id).whereNotIn(
+      // @ts-expect-error - knex incorrectly expects a string array
       inverseJoinColumn.name,
-      getDocumentSiblingIdsQuery(con, inverseJoinColumn.referencedTable, relIdToadd)
+      getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable, relIdToadd)
     ).where(joinTable.on || {}).transacting(trx);
     const relIdsToDelete = map(inverseJoinColumn.name, relsToDelete);
     await createQueryBuilder(joinTable.name, db).delete().where({
@@ -4792,8 +4799,9 @@ const deletePreviousAnyToOneRelations = async ({
     await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToDelete, transaction: trx });
   } else {
     await con.delete().from(joinTable.name).where(joinColumn.name, id).whereNotIn(
+      // @ts-expect-error - knex incorrectly expects a string array
       inverseJoinColumn.name,
-      getDocumentSiblingIdsQuery(con, inverseJoinColumn.referencedTable, relIdToadd)
+      getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable, relIdToadd)
     ).where(joinTable.on || {}).transacting(trx);
   }
 };
@@ -5877,6 +5885,21 @@ const createStorage = (opts) => {
 const wrapTransaction = (db) => (fn) => () => {
   return db.transaction(({ trx }) => Promise.resolve(fn(trx, db)));
 };
+const transformLogMessage = (level, message) => {
+  if (typeof message === "string") {
+    return { level, message };
+  }
+  if (typeof message === "object" && message !== null) {
+    if ("event" in message && "name" in message) {
+      return {
+        level,
+        message: `[internal migration]: ${message.event} ${message?.name}`,
+        timestamp: Date.now()
+      };
+    }
+  }
+  return "";
+};
 const migrationResolver = ({ name, path: path2, context }) => {
   const { db } = context;
   if (!path2) {
@@ -5905,7 +5928,20 @@ const createUserMigrationProvider = (db) => {
   const context = { db };
   const umzugProvider = new Umzug({
     storage: createStorage({ db, tableName: "strapi_migrations" }),
-    logger: console,
+    logger: {
+      info(message) {
+        db.logger.info(transformLogMessage("info", message));
+      },
+      warn(message) {
+        db.logger.warn(transformLogMessage("warn", message));
+      },
+      error(message) {
+        db.logger.error(transformLogMessage("error", message));
+      },
+      debug(message) {
+        db.logger.debug(transformLogMessage("debug", message));
+      }
+    },
     context,
     migrations: {
       glob: ["*.{js,sql}", { cwd: dir }],
@@ -6230,7 +6266,20 @@ const createInternalMigrationProvider = (db) => {
   const migrations = [...internalMigrations];
   const umzugProvider = new Umzug({
     storage: createStorage({ db, tableName: "strapi_migrations_internal" }),
-    logger: console,
+    logger: {
+      info(message) {
+        db.logger.debug(transformLogMessage("info", message));
+      },
+      warn(message) {
+        db.logger.warn(transformLogMessage("warn", message));
+      },
+      error(message) {
+        db.logger.error(transformLogMessage("error", message));
+      },
+      debug(message) {
+        db.logger.debug(transformLogMessage("debug", message));
+      }
+    },
     context,
     migrations: () => migrations.map((migration) => {
       return {
@@ -6501,6 +6550,7 @@ class Database {
   migrations;
   lifecycles;
   entityManager;
+  logger;
   constructor(config) {
     this.config = {
       ...config,
@@ -6520,6 +6570,7 @@ class Database {
     this.migrations = createMigrationsProvider(this);
     this.lifecycles = createLifecyclesProvider(this);
     this.entityManager = createEntityManager(this);
+    this.logger = config.logger ?? console;
   }
   async init({ models }) {
     this.metadata.loadModels(models);