@strapi/database 5.0.0-beta.9 → 5.0.0-rc.1

package/dist/index.mjs

@@ -5,11 +5,11 @@ import _, { isNil, castArray, prop, omit, isInteger, snakeCase, partition, sumBy
 import crypto from "crypto";
 import crypto$1 from "node:crypto";
 import * as dateFns from "date-fns";
-import { isOperatorOfType, isOperator } from "@strapi/utils";
+import { AsyncLocalStorage } from "node:async_hooks";
 import KnexBuilder from "knex/lib/query/querybuilder";
 import KnexRaw from "knex/lib/raw";
+import { isOperatorOfType, isOperator } from "@strapi/utils";
 import { Readable } from "stream";
-import { AsyncLocalStorage } from "node:async_hooks";
 import _$1 from "lodash";
 import { Umzug } from "umzug";
 import { createId } from "@paralleldrive/cuid2";
@@ -1087,7 +1087,7 @@ const createHelpers = (db) => {
       }
     }
   };
-  const dropIndex = (tableBuilder, index2) => {
+  const dropIndex2 = (tableBuilder, index2) => {
     if (!db.config.settings?.forceMigration) {
       return;
     }
@@ -1164,13 +1164,13 @@ const createHelpers = (db) => {
       for (const removedIndex of table.indexes.removed) {
         if (!ignoreForeignKeyNames.includes(removedIndex.name)) {
           debug$2(`Dropping index ${removedIndex.name} on ${table.name}`);
-          dropIndex(tableBuilder, removedIndex);
+          dropIndex2(tableBuilder, removedIndex);
         }
       }
       for (const updatedIndex of table.indexes.updated) {
         if (!ignoreForeignKeyNames.includes(updatedIndex.name)) {
           debug$2(`Dropping updated index ${updatedIndex.name} on ${table.name}`);
-          dropIndex(tableBuilder, updatedIndex.object);
+          dropIndex2(tableBuilder, updatedIndex.object);
         }
       }
       for (const updatedColumn of table.columns.updated) {
@@ -1356,27 +1356,28 @@ const createSchemaDiff = (db) => {
       }
     };
   };
-  const diffTableColumns = (srcTable, destTable) => {
+  const diffTableColumns = (diffCtx) => {
+    const { databaseTable, userSchemaTable, previousTable } = diffCtx;
     const addedColumns = [];
     const updatedColumns = [];
     const unchangedColumns = [];
     const removedColumns = [];
-    for (const destColumn of destTable.columns) {
-      const srcColumn = helpers.findColumn(srcTable, destColumn.name);
-      if (srcColumn) {
-        const { status, diff } = diffColumns(srcColumn, destColumn);
+    for (const userSchemaColumn of userSchemaTable.columns) {
+      const databaseColumn = helpers.findColumn(databaseTable, userSchemaColumn.name);
+      if (databaseColumn) {
+        const { status, diff } = diffColumns(databaseColumn, userSchemaColumn);
         if (status === statuses.CHANGED) {
           updatedColumns.push(diff);
         } else {
-          unchangedColumns.push(srcColumn);
+          unchangedColumns.push(databaseColumn);
         }
       } else {
-        addedColumns.push(destColumn);
+        addedColumns.push(userSchemaColumn);
       }
     }
-    for (const srcColumn of srcTable.columns) {
-      if (!helpers.hasColumn(destTable, srcColumn.name)) {
-        removedColumns.push(srcColumn);
+    for (const databaseColumn of databaseTable.columns) {
+      if (!helpers.hasColumn(userSchemaTable, databaseColumn.name) && previousTable && helpers.hasColumn(previousTable, databaseColumn.name)) {
+        removedColumns.push(databaseColumn);
       }
     }
     const hasChanged = [addedColumns, updatedColumns, removedColumns].some((arr) => arr.length > 0);
@@ -1390,27 +1391,28 @@ const createSchemaDiff = (db) => {
       }
     };
   };
-  const diffTableIndexes = (srcTable, destTable) => {
+  const diffTableIndexes = (diffCtx) => {
+    const { databaseTable, userSchemaTable, previousTable } = diffCtx;
     const addedIndexes = [];
     const updatedIndexes = [];
     const unchangedIndexes = [];
     const removedIndexes = [];
-    for (const destIndex of destTable.indexes) {
-      const srcIndex = helpers.findIndex(srcTable, destIndex.name);
-      if (srcIndex) {
-        const { status, diff } = diffIndexes(srcIndex, destIndex);
+    for (const userSchemaIndex of userSchemaTable.indexes) {
+      const databaseIndex = helpers.findIndex(databaseTable, userSchemaIndex.name);
+      if (databaseIndex) {
+        const { status, diff } = diffIndexes(databaseIndex, userSchemaIndex);
         if (status === statuses.CHANGED) {
           updatedIndexes.push(diff);
         } else {
-          unchangedIndexes.push(srcIndex);
+          unchangedIndexes.push(databaseIndex);
         }
       } else {
-        addedIndexes.push(destIndex);
+        addedIndexes.push(userSchemaIndex);
       }
     }
-    for (const srcIndex of srcTable.indexes) {
-      if (!helpers.hasIndex(destTable, srcIndex.name)) {
-        removedIndexes.push(srcIndex);
+    for (const databaseIndex of databaseTable.indexes) {
+      if (!helpers.hasIndex(userSchemaTable, databaseIndex.name) && previousTable && helpers.hasIndex(previousTable, databaseIndex.name)) {
+        removedIndexes.push(databaseIndex);
       }
     }
     const hasChanged = [addedIndexes, updatedIndexes, removedIndexes].some((arr) => arr.length > 0);
@@ -1424,7 +1426,8 @@ const createSchemaDiff = (db) => {
       }
     };
   };
-  const diffTableForeignKeys = (srcTable, destTable) => {
+  const diffTableForeignKeys = (diffCtx) => {
+    const { databaseTable, userSchemaTable, previousTable } = diffCtx;
     const addedForeignKeys = [];
     const updatedForeignKeys = [];
     const unchangedForeignKeys = [];
@@ -1440,22 +1443,22 @@ const createSchemaDiff = (db) => {
         }
       };
     }
-    for (const destForeignKey of destTable.foreignKeys) {
-      const srcForeignKey = helpers.findForeignKey(srcTable, destForeignKey.name);
-      if (srcForeignKey) {
-        const { status, diff } = diffForeignKeys(srcForeignKey, destForeignKey);
+    for (const userSchemaForeignKeys of userSchemaTable.foreignKeys) {
+      const databaseForeignKeys = helpers.findForeignKey(databaseTable, userSchemaForeignKeys.name);
+      if (databaseForeignKeys) {
+        const { status, diff } = diffForeignKeys(databaseForeignKeys, userSchemaForeignKeys);
         if (status === statuses.CHANGED) {
           updatedForeignKeys.push(diff);
         } else {
-          unchangedForeignKeys.push(srcForeignKey);
+          unchangedForeignKeys.push(databaseForeignKeys);
         }
       } else {
-        addedForeignKeys.push(destForeignKey);
+        addedForeignKeys.push(userSchemaForeignKeys);
       }
     }
-    for (const srcForeignKey of srcTable.foreignKeys) {
-      if (!helpers.hasForeignKey(destTable, srcForeignKey.name)) {
-        removedForeignKeys.push(srcForeignKey);
+    for (const databaseForeignKeys of databaseTable.foreignKeys) {
+      if (!helpers.hasForeignKey(userSchemaTable, databaseForeignKeys.name) && previousTable && helpers.hasForeignKey(previousTable, databaseForeignKeys.name)) {
+        removedForeignKeys.push(databaseForeignKeys);
       }
     }
     const hasChanged = [addedForeignKeys, updatedForeignKeys, removedForeignKeys].some(
@@ -1471,37 +1474,44 @@ const createSchemaDiff = (db) => {
       }
     };
   };
-  const diffTables = (srcTable, destTable) => {
-    const columnsDiff = diffTableColumns(srcTable, destTable);
-    const indexesDiff = diffTableIndexes(srcTable, destTable);
-    const foreignKeysDiff = diffTableForeignKeys(srcTable, destTable);
+  const diffTables = (diffCtx) => {
+    const { databaseTable } = diffCtx;
+    const columnsDiff = diffTableColumns(diffCtx);
+    const indexesDiff = diffTableIndexes(diffCtx);
+    const foreignKeysDiff = diffTableForeignKeys(diffCtx);
     const hasChanged = [columnsDiff, indexesDiff, foreignKeysDiff].some(hasChangedStatus);
     return {
       status: hasChanged ? statuses.CHANGED : statuses.UNCHANGED,
       diff: {
-        name: srcTable.name,
+        name: databaseTable.name,
         indexes: indexesDiff.diff,
         foreignKeys: foreignKeysDiff.diff,
         columns: columnsDiff.diff
       }
     };
   };
-  const diffSchemas = async (srcSchema, destSchema) => {
+  const diffSchemas = async (schemaDiffCtx) => {
+    const { previousSchema, databaseSchema, userSchema } = schemaDiffCtx;
     const addedTables = [];
     const updatedTables = [];
     const unchangedTables = [];
     const removedTables = [];
-    for (const destTable of destSchema.tables) {
-      const srcTable = helpers.findTable(srcSchema, destTable.name);
-      if (srcTable) {
-        const { status, diff } = diffTables(srcTable, destTable);
+    for (const userSchemaTable of userSchema.tables) {
+      const databaseTable = helpers.findTable(databaseSchema, userSchemaTable.name);
+      const previousTable = previousSchema && helpers.findTable(previousSchema, userSchemaTable.name);
+      if (databaseTable) {
+        const { status, diff } = diffTables({
+          previousTable,
+          databaseTable,
+          userSchemaTable
+        });
         if (status === statuses.CHANGED) {
           updatedTables.push(diff);
         } else {
-          unchangedTables.push(srcTable);
+          unchangedTables.push(databaseTable);
         }
       } else {
-        addedTables.push(destTable);
+        addedTables.push(userSchemaTable);
       }
     }
     const parsePersistedTable = (persistedTable) => {
@@ -1510,23 +1520,34 @@ const createSchemaDiff = (db) => {
       }
       return persistedTable.name;
     };
-    const persistedTables = helpers.hasTable(srcSchema, "strapi_core_store_settings") ? await strapi.store.get({
-      type: "core",
-      key: "persisted_tables"
-    }) ?? [] : [];
+    const persistedTables = helpers.hasTable(databaseSchema, "strapi_core_store_settings") ? (
+      // TODO: replace with low level db query instead
+      await strapi.store.get({
+        type: "core",
+        key: "persisted_tables"
+      }) ?? []
+    ) : [];
     const reservedTables = [...RESERVED_TABLE_NAMES, ...persistedTables.map(parsePersistedTable)];
-    for (const srcTable of srcSchema.tables) {
-      if (!helpers.hasTable(destSchema, srcTable.name) && !reservedTables.includes(srcTable.name)) {
+    for (const databaseTable of databaseSchema.tables) {
+      const isInUserSchema = helpers.hasTable(userSchema, databaseTable.name);
+      const wasTracked = previousSchema && helpers.hasTable(previousSchema, databaseTable.name);
+      const isReserved = reservedTables.includes(databaseTable.name);
+      if (!isInUserSchema && !wasTracked) {
+        continue;
+      }
+      if (!isInUserSchema && wasTracked && !isReserved) {
         const dependencies = persistedTables.filter((table) => {
           const dependsOn = table?.dependsOn;
           if (!_.isArray(dependsOn)) {
             return;
           }
-          return dependsOn.some((table2) => table2.name === srcTable.name);
+          return dependsOn.some((table2) => table2.name === databaseTable.name);
         }).map((dependsOnTable) => {
-          return srcSchema.tables.find((srcTable2) => srcTable2.name === dependsOnTable.name);
+          return databaseSchema.tables.find(
+            (databaseTable2) => databaseTable2.name === dependsOnTable.name
+          );
         }).filter((table) => !_.isNil(table));
-        removedTables.push(srcTable, ...dependencies);
+        removedTables.push(databaseTable, ...dependencies);
       }
     }
     const hasChanged = [addedTables, updatedTables, removedTables].some((arr) => arr.length > 0);
@@ -2172,8 +2193,13 @@ const createSchemaProvider = (db) => {
     },
     async syncSchema() {
       debug$1("Synchronizing database schema");
-      const DBSchema = await db.dialect.schemaInspector.getSchema();
-      const { status, diff } = await this.schemaDiff.diff(DBSchema, this.schema);
+      const databaseSchema = await db.dialect.schemaInspector.getSchema();
+      const storedSchema = await this.schemaStorage.read();
+      const { status, diff } = await this.schemaDiff.diff({
+        previousSchema: storedSchema?.schema,
+        databaseSchema,
+        userSchema: this.schema
+      });
       if (status === "CHANGED") {
         await this.builder.updateSchema(diff);
       }
@@ -2895,6 +2921,68 @@ const createField = (attribute) => {
   }
   throw new Error(`Undefined field for type ${type}`);
 };
+const storage = new AsyncLocalStorage();
+const transactionCtx = {
+  async run(trx, cb) {
+    const store = storage.getStore();
+    return storage.run(
+      {
+        trx,
+        // Fill with existing callbacks if nesting transactions
+        commitCallbacks: store?.commitCallbacks || [],
+        rollbackCallbacks: store?.rollbackCallbacks || []
+      },
+      cb
+    );
+  },
+  get() {
+    const store = storage.getStore();
+    return store?.trx;
+  },
+  async commit(trx) {
+    const store = storage.getStore();
+    if (store?.trx) {
+      store.trx = null;
+    }
+    await trx.commit();
+    if (!store?.commitCallbacks.length) {
+      return;
+    }
+    store.commitCallbacks.forEach((cb) => cb());
+    store.commitCallbacks = [];
+  },
+  async rollback(trx) {
+    const store = storage.getStore();
+    if (store?.trx) {
+      store.trx = null;
+    }
+    await trx.rollback();
+    if (!store?.rollbackCallbacks.length) {
+      return;
+    }
+    store.rollbackCallbacks.forEach((cb) => cb());
+    store.rollbackCallbacks = [];
+  },
+  onCommit(cb) {
+    const store = storage.getStore();
+    if (store?.commitCallbacks) {
+      store.commitCallbacks.push(cb);
+    }
+  },
+  onRollback(cb) {
+    const store = storage.getStore();
+    if (store?.rollbackCallbacks) {
+      store.rollbackCallbacks.push(cb);
+    }
+  }
+};
+function isKnexQuery(value) {
+  return value instanceof KnexBuilder || value instanceof KnexRaw;
+}
+const addSchema = (db, tableName) => {
+  const schemaName = db.getSchemaName();
+  return schemaName ? `${schemaName}.${tableName}` : tableName;
+};
 const fromSingleRow = (meta, row) => {
   const { attributes } = meta;
   if (_.isNil(row)) {
@@ -3017,7 +3105,7 @@ const escapeQuery = (query, charsToEscape, escapeChar = "\\") => {
     ""
   );
 };
-const createPivotJoin = (ctx, { alias, refAlias, joinTable, targetMeta }) => {
+const createPivotJoin = (ctx, { alias: alias2, refAlias, joinTable, targetMeta }) => {
   const { qb } = ctx;
   const joinAlias = qb.getAlias();
   qb.join({
@@ -3025,7 +3113,7 @@ const createPivotJoin = (ctx, { alias, refAlias, joinTable, targetMeta }) => {
     referencedTable: joinTable.name,
     referencedColumn: joinTable.joinColumn.name,
     rootColumn: joinTable.joinColumn.referencedColumn,
-    rootTable: alias,
+    rootTable: alias2,
     on: joinTable.on
   });
   const subAlias = refAlias || qb.getAlias();
@@ -3038,7 +3126,7 @@ const createPivotJoin = (ctx, { alias, refAlias, joinTable, targetMeta }) => {
   });
   return subAlias;
 };
-const createJoin = (ctx, { alias, refAlias, attributeName, attribute }) => {
+const createJoin = (ctx, { alias: alias2, refAlias, attributeName, attribute }) => {
   const { db, qb, uid } = ctx;
   if (attribute.type !== "relation") {
     throw new Error(`Cannot join on non relational field ${attributeName}`);
@@ -3054,7 +3142,7 @@ const createJoin = (ctx, { alias, refAlias, attributeName, attribute }) => {
         referencedTable: targetMeta.tableName,
         referencedColumn: morphColumn.idColumn.name,
         rootColumn: morphColumn.idColumn.referencedColumn,
-        rootTable: alias,
+        rootTable: alias2,
         on: {
           [morphColumn.typeColumn.name]: uid,
           ...morphColumn.on
@@ -3069,7 +3157,7 @@ const createJoin = (ctx, { alias, refAlias, attributeName, attribute }) => {
         referencedTable: joinTable2.name,
         referencedColumn: joinTable2.morphColumn.idColumn.name,
         rootColumn: joinTable2.morphColumn.idColumn.referencedColumn,
-        rootTable: alias,
+        rootTable: alias2,
         on: {
           [joinTable2.morphColumn.typeColumn.name]: uid,
           field: attributeName
@@ -3085,7 +3173,7 @@ const createJoin = (ctx, { alias, refAlias, attributeName, attribute }) => {
       });
       return subAlias;
     }
-    return alias;
+    return alias2;
   }
   const { joinColumn } = attribute;
   if (joinColumn) {
@@ -3095,20 +3183,20 @@ const createJoin = (ctx, { alias, refAlias, attributeName, attribute }) => {
       referencedTable: targetMeta.tableName,
       referencedColumn: joinColumn.referencedColumn,
       rootColumn: joinColumn.name,
-      rootTable: alias
+      rootTable: alias2
     });
     return subAlias;
   }
   const { joinTable } = attribute;
   if (joinTable) {
-    return createPivotJoin(ctx, { alias, refAlias, joinTable, targetMeta });
+    return createPivotJoin(ctx, { alias: alias2, refAlias, joinTable, targetMeta });
   }
-  return alias;
+  return alias2;
 };
 const applyJoin = (qb, join) => {
   const {
     method = "leftJoin",
-    alias,
+    alias: alias2,
     referencedTable,
     referencedColumn,
     rootColumn,
@@ -3118,26 +3206,28 @@ const applyJoin = (qb, join) => {
     on,
     orderBy
   } = join;
-  qb[method](`${referencedTable} as ${alias}`, (inner) => {
-    inner.on(`${rootTable}.${rootColumn}`, `${alias}.${referencedColumn}`);
+  qb[method](`${referencedTable} as ${alias2}`, (inner) => {
+    inner.on(`${rootTable}.${rootColumn}`, `${alias2}.${referencedColumn}`);
     if (on) {
       for (const key of Object.keys(on)) {
-        inner.onVal(`${alias}.${key}`, on[key]);
+        inner.onVal(`${alias2}.${key}`, on[key]);
       }
     }
   });
   if (orderBy) {
     Object.keys(orderBy).forEach((column) => {
       const direction = orderBy[column];
-      qb.orderBy(`${alias}.${column}`, direction);
+      qb.orderBy(`${alias2}.${column}`, direction);
     });
   }
 };
 const applyJoins = (qb, joins) => {
   return joins.forEach((join) => applyJoin(qb, join));
 };
+const COL_STRAPI_ROW_NUMBER = "__strapi_row_number";
+const COL_STRAPI_ORDER_BY_PREFIX = "__strapi_order_by";
 const processOrderBy = (orderBy, ctx) => {
-  const { db, uid, qb, alias } = ctx;
+  const { db, uid, qb, alias: alias2 } = ctx;
   const meta = db.metadata.get(uid);
   const { attributes } = meta;
   if (typeof orderBy === "string") {
@@ -3146,7 +3236,7 @@ const processOrderBy = (orderBy, ctx) => {
       throw new Error(`Attribute ${orderBy} not found on model ${uid}`);
     }
     const columnName = toColumnName(meta, orderBy);
-    return [{ column: qb.aliasColumn(columnName, alias) }];
+    return [{ column: qb.aliasColumn(columnName, alias2) }];
   }
   if (Array.isArray(orderBy)) {
     return orderBy.flatMap((value) => processOrderBy(value, ctx));
@@ -3160,11 +3250,11 @@ const processOrderBy = (orderBy, ctx) => {
       }
       if (isScalar(attribute.type)) {
         const columnName = toColumnName(meta, key);
-        return { column: qb.aliasColumn(columnName, alias), order: direction };
+        return { column: qb.aliasColumn(columnName, alias2), order: direction };
       }
       if (attribute.type === "relation" && "target" in attribute) {
         const subAlias = createJoin(ctx, {
-          alias: alias || qb.alias,
+          alias: alias2 || qb.alias,
           attributeName: key,
           attribute
         });
@@ -3180,6 +3270,75 @@ const processOrderBy = (orderBy, ctx) => {
   }
   throw new Error("Invalid orderBy syntax");
 };
+const getStrapiOrderColumnAlias = (column) => {
+  const trimmedColumnName = column.replaceAll(".", "_");
+  return `${COL_STRAPI_ORDER_BY_PREFIX}__${trimmedColumnName}`;
+};
+const wrapWithDeepSort = (originalQuery, ctx) => {
+  const { db, qb, uid } = ctx;
+  const { tableName } = db.metadata.get(uid);
+  const orderBy = _.cloneDeep(qb.state.orderBy);
+  const resultQueryAlias = qb.getAlias();
+  const aliasedTableName = qb.mustUseAlias() ? alias(resultQueryAlias, tableName) : tableName;
+  const resultQuery = db.getConnection(aliasedTableName);
+  const baseQuery = originalQuery.clone();
+  const baseQueryAlias = qb.getAlias();
+  baseQuery.clear("select").clear("order").clear("limit").clear("offset");
+  baseQuery.select(
+    // Always select the row id for future manipulation
+    prefix(qb.alias, "id"),
+    ...orderBy.map(
+      (orderByClause) => alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)
+    )
+  );
+  const partitionedQueryAlias = qb.getAlias();
+  const selectRowsAsNumberedPartitions = (partitionedQuery) => {
+    const prefixedOrderBy = orderBy.map((orderByClause) => ({
+      column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),
+      order: orderByClause.order
+    }));
+    const orderByColumns = prefixedOrderBy.map(_.prop("column"));
+    partitionedQuery.select(
+      // Always select baseQuery.id
+      prefix(baseQueryAlias, "id"),
+      ...orderByColumns
+    ).rowNumber(COL_STRAPI_ROW_NUMBER, (subQuery) => {
+      for (const orderByClause of prefixedOrderBy) {
+        subQuery.orderBy(orderByClause.column, orderByClause.order, "last");
+      }
+      subQuery.partitionBy(`${baseQueryAlias}.id`);
+    }).from(baseQuery.as(baseQueryAlias)).as(partitionedQueryAlias);
+  };
+  const originalSelect = _.difference(
+    qb.state.select,
+    // Remove order by columns from the initial select
+    qb.state.orderBy.map(_.prop("column"))
+  ).map(prefix(resultQueryAlias));
+  resultQuery.select(originalSelect).innerJoin(selectRowsAsNumberedPartitions, function() {
+    this.on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`).andOnVal(`${partitionedQueryAlias}.${COL_STRAPI_ROW_NUMBER}`, "=", 1);
+  });
+  if (qb.state.limit) {
+    resultQuery.limit(qb.state.limit);
+  }
+  if (qb.state.offset) {
+    resultQuery.offset(qb.state.offset);
+  }
+  if (qb.state.first) {
+    resultQuery.first();
+  }
+  resultQuery.orderBy([
+    // Transform "order by" clause to their T alias and prefix them with T alias
+    ...orderBy.map((orderByClause) => ({
+      column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),
+      order: orderByClause.order
+    })),
+    // Add T.id to the order by clause to get consistent results in case several rows have the exact same order
+    { column: `${partitionedQueryAlias}.id`, order: "asc" }
+  ]);
+  return resultQuery;
+};
+const alias = _.curry((alias2, value) => `${value} as ${alias2}`);
+const prefix = _.curry((prefix2, value) => `${prefix2}.${value}`);
 const joinColPrefix = "__strapi";
 const XtoOne = async (input, ctx) => {
   const { attribute, attributeName, results, populateValue, targetMeta, isCount } = input;
@@ -3207,8 +3366,8 @@ const XtoOne = async (input, ctx) => {
     const { joinTable } = attribute;
     const qb2 = db.entityManager.createQueryBuilder(targetMeta.uid);
     const { name: joinColumnName, referencedColumn: referencedColumnName } = joinTable.joinColumn;
-    const alias = qb2.getAlias();
-    const joinColAlias = `${alias}.${joinColumnName}`;
+    const alias2 = qb2.getAlias();
+    const joinColAlias = `${alias2}.${joinColumnName}`;
     const joinColRenameAs = `${joinColPrefix}${joinColumnName}`;
     const joinColSelect = `${joinColAlias} as ${joinColRenameAs}`;
     const referencedValues = _.uniq(
@@ -3222,7 +3381,7 @@ const XtoOne = async (input, ctx) => {
         return;
       }
       const rows2 = await qb2.init(populateValue).join({
-        alias,
+        alias: alias2,
         referencedTable: joinTable.name,
         referencedColumn: joinTable.inverseJoinColumn.name,
         rootColumn: joinTable.inverseJoinColumn.referencedColumn,
@@ -3248,7 +3407,7 @@ const XtoOne = async (input, ctx) => {
       return;
     }
     const rows = await qb2.init(populateValue).join({
-      alias,
+      alias: alias2,
       referencedTable: joinTable.name,
       referencedColumn: joinTable.inverseJoinColumn.name,
       rootColumn: joinTable.inverseJoinColumn.referencedColumn,
@@ -3288,8 +3447,8 @@ const oneToMany = async (input, ctx) => {
     const { joinTable } = attribute;
     const qb2 = db.entityManager.createQueryBuilder(targetMeta.uid);
     const { name: joinColumnName, referencedColumn: referencedColumnName } = joinTable.joinColumn;
-    const alias = qb2.getAlias();
-    const joinColAlias = `${alias}.${joinColumnName}`;
+    const alias2 = qb2.getAlias();
+    const joinColAlias = `${alias2}.${joinColumnName}`;
     const joinColRenameAs = `${joinColPrefix}${joinColumnName}`;
     const joinColSelect = `${joinColAlias} as ${joinColRenameAs}`;
     const referencedValues = _.uniq(
@@ -3303,7 +3462,7 @@ const oneToMany = async (input, ctx) => {
         return;
       }
       const rows2 = await qb2.init(populateValue).join({
-        alias,
+        alias: alias2,
         referencedTable: joinTable.name,
         referencedColumn: joinTable.inverseJoinColumn.name,
         rootColumn: joinTable.inverseJoinColumn.referencedColumn,
@@ -3329,7 +3488,7 @@ const oneToMany = async (input, ctx) => {
       return;
     }
     const rows = await qb2.init(populateValue).join({
-      alias,
+      alias: alias2,
       referencedTable: joinTable.name,
       referencedColumn: joinTable.inverseJoinColumn.name,
       rootColumn: joinTable.inverseJoinColumn.referencedColumn,
@@ -3350,8 +3509,8 @@ const manyToMany = async (input, ctx) => {
   const { joinTable } = attribute;
   const populateQb = db.entityManager.createQueryBuilder(targetMeta.uid);
   const { name: joinColumnName, referencedColumn: referencedColumnName } = joinTable.joinColumn;
-  const alias = populateQb.getAlias();
-  const joinColAlias = `${alias}.${joinColumnName}`;
+  const alias2 = populateQb.getAlias();
+  const joinColAlias = `${alias2}.${joinColumnName}`;
   const joinColRenameAs = `${joinColPrefix}${joinColumnName}`;
   const joinColSelect = `${joinColAlias} as ${joinColRenameAs}`;
   const referencedValues = _.uniq(
@@ -3365,7 +3524,7 @@ const manyToMany = async (input, ctx) => {
       return;
     }
     const rows2 = await populateQb.init(populateValue).join({
-      alias,
+      alias: alias2,
       referencedTable: joinTable.name,
       referencedColumn: joinTable.inverseJoinColumn.name,
       rootColumn: joinTable.inverseJoinColumn.referencedColumn,
@@ -3391,7 +3550,7 @@ const manyToMany = async (input, ctx) => {
     return;
   }
   const rows = await populateQb.init(populateValue).join({
-    alias,
+    alias: alias2,
     referencedTable: joinTable.name,
     referencedColumn: joinTable.inverseJoinColumn.name,
     rootColumn: joinTable.inverseJoinColumn.referencedColumn,
@@ -3442,9 +3601,9 @@ const morphX = async (input, ctx) => {
       return;
     }
     const qb = db.entityManager.createQueryBuilder(target);
-    const alias = qb.getAlias();
+    const alias2 = qb.getAlias();
     const rows = await qb.init(populateValue).join({
-      alias,
+      alias: alias2,
       referencedTable: joinTable.name,
       referencedColumn: joinColumn.name,
       rootColumn: joinColumn.referencedColumn,
@@ -3454,9 +3613,9 @@ const morphX = async (input, ctx) => {
         field: attributeName
       },
       orderBy: _.mapValues((v) => populateValue.ordering || v, joinTable.orderBy)
-    }).addSelect([`${alias}.${idColumn.name}`, `${alias}.${typeColumn.name}`]).where({
-      [`${alias}.${idColumn.name}`]: referencedValues,
-      [`${alias}.${typeColumn.name}`]: uid
+    }).addSelect([`${alias2}.${idColumn.name}`, `${alias2}.${typeColumn.name}`]).where({
+      [`${alias2}.${idColumn.name}`]: referencedValues,
+      [`${alias2}.${typeColumn.name}`]: uid
     }).execute({ mapResults: false });
     const map2 = _.groupBy(idColumn.name)(rows);
     results.forEach((result) => {
@@ -3705,13 +3864,6 @@ const processPopulate = (populate, ctx) => {
   }
   return finalPopulate;
 };
-function isKnexQuery(value) {
-  return value instanceof KnexBuilder || value instanceof KnexRaw;
-}
-const addSchema = (db, tableName) => {
-  const schemaName = db.getSchemaName();
-  return schemaName ? `${schemaName}.${tableName}` : tableName;
-};
 const isRecord$1 = (value) => isPlainObject(value);
 const castValue = (value, attribute) => {
   if (!attribute) {
@@ -3753,8 +3905,8 @@ const processNested = (where, ctx) => {
   return processWhere(where, ctx);
 };
 const processRelationWhere = (where, ctx) => {
-  const { qb, alias } = ctx;
-  const idAlias = qb.aliasColumn("id", alias);
+  const { qb, alias: alias2 } = ctx;
+  const idAlias = qb.aliasColumn("id", alias2);
   if (!isRecord$1(where)) {
     return { [idAlias]: where };
   }
@@ -3784,7 +3936,7 @@ function processWhere(where, ctx) {
   if (isArray(where)) {
     return where.map((sub) => processWhere(sub, ctx));
   }
-  const { db, uid, qb, alias } = ctx;
+  const { db, uid, qb, alias: alias2 } = ctx;
   const meta = db.metadata.get(uid);
   const filters = {};
   for (const key of Object.keys(where)) {
@@ -3807,12 +3959,12 @@ function processWhere(where, ctx) {
     }
     const attribute = meta.attributes[key];
     if (!attribute) {
-      filters[qb.aliasColumn(key, alias)] = processAttributeWhere(null, value);
+      filters[qb.aliasColumn(key, alias2)] = processAttributeWhere(null, value);
       continue;
     }
     if (isRelation(attribute.type) && "target" in attribute) {
       const subAlias = createJoin(ctx, {
-        alias: alias || qb.alias,
+        alias: alias2 || qb.alias,
         attributeName: key,
         attribute
       });
@@ -3827,7 +3979,7 @@ function processWhere(where, ctx) {
     }
     if (isScalar(attribute.type)) {
       const columnName = toColumnName(meta, key);
-      const aliasedColumnName = qb.aliasColumn(columnName, alias);
+      const aliasedColumnName = qb.aliasColumn(columnName, alias2);
       filters[aliasedColumnName] = processAttributeWhere(attribute, value);
       continue;
     }
@@ -4055,7 +4207,7 @@ class ReadableStrapiQuery extends Readable {
    * Custom ._read() implementation
    *
    *  NOTE: Here "size" means the number of entities to be read from the database.
-   *  Not the actual byte size, as it would means that we need to return partial entities.
+   *  Not the actual byte size, as it would mean that we need to return partial entities.
    *
    */
   async _read(size) {
@@ -4118,61 +4270,6 @@ class ReadableStrapiQuery extends Readable {
     }
   }
 }
-const storage = new AsyncLocalStorage();
-const transactionCtx = {
-  async run(trx, cb) {
-    const store = storage.getStore();
-    return storage.run(
-      {
-        trx,
-        // Fill with existing callbacks if nesting transactions
-        commitCallbacks: store?.commitCallbacks || [],
-        rollbackCallbacks: store?.rollbackCallbacks || []
-      },
-      cb
-    );
-  },
-  get() {
-    const store = storage.getStore();
-    return store?.trx;
-  },
-  async commit(trx) {
-    const store = storage.getStore();
-    if (store?.trx) {
-      store.trx = null;
-    }
-    await trx.commit();
-    if (!store?.commitCallbacks.length) {
-      return;
-    }
-    store.commitCallbacks.forEach((cb) => cb());
-    store.commitCallbacks = [];
-  },
-  async rollback(trx) {
-    const store = storage.getStore();
-    if (store?.trx) {
-      store.trx = null;
-    }
-    await trx.rollback();
-    if (!store?.rollbackCallbacks.length) {
-      return;
-    }
-    store.rollbackCallbacks.forEach((cb) => cb());
-    store.rollbackCallbacks = [];
-  },
-  onCommit(cb) {
-    const store = storage.getStore();
-    if (store?.commitCallbacks) {
-      store.commitCallbacks.push(cb);
-    }
-  },
-  onRollback(cb) {
-    const store = storage.getStore();
-    if (store?.rollbackCallbacks) {
-      store.rollbackCallbacks.push(cb);
-    }
-  }
-};
 const createQueryBuilder = (uid, db, initialState = {}) => {
   const meta = db.metadata.get(uid);
   const { tableName } = meta;
@@ -4205,9 +4302,9 @@ const createQueryBuilder = (uid, db, initialState = {}) => {
     initialState
   );
   const getAlias = () => {
-    const alias = `t${state.aliasCounter}`;
+    const alias2 = `t${state.aliasCounter}`;
     state.aliasCounter += 1;
-    return alias;
+    return alias2;
   };
   return {
     alias: getAlias(),
@@ -4374,15 +4471,15 @@ const createQueryBuilder = (uid, db, initialState = {}) => {
     mustUseAlias() {
       return ["select", "count"].includes(state.type);
     },
-    aliasColumn(key, alias) {
+    aliasColumn(key, alias2) {
       if (typeof key !== "string") {
         return key;
       }
       if (key.indexOf(".") >= 0) {
         return key;
       }
-      if (!_.isNil(alias)) {
-        return `${alias}.${key}`;
+      if (!_.isNil(alias2)) {
+        return `${alias2}.${key}`;
       }
       return this.mustUseAlias() ? `${this.alias}.${key}` : key;
     },
@@ -4417,6 +4514,20 @@ const createQueryBuilder = (uid, db, initialState = {}) => {
     shouldUseDistinct() {
       return state.joins.length > 0 && _.isEmpty(state.groupBy);
     },
+    shouldUseDeepSort() {
+      return state.orderBy.filter(({ column }) => column.indexOf(".") >= 0).filter(({ column }) => {
+        const col = column.split(".");
+        for (let i = 0; i < col.length - 1; i += 1) {
+          const el = col[i];
+          const isRelationAttribute = meta.attributes[el]?.type === "relation";
+          const isAliasedRelation = Object.values(state.joins).map((join) => join.alias).includes(el);
+          if (isRelationAttribute || isAliasedRelation) {
+            return true;
+          }
+        }
+        return false;
+      }).length > 0;
+    },
     processSelect() {
       state.select = state.select.map((field) => {
         if (isKnexQuery(field)) {
@@ -4534,6 +4645,9 @@ const createQueryBuilder = (uid, db, initialState = {}) => {
       if (state.joins.length > 0) {
         applyJoins(qb, state.joins);
       }
+      if (this.shouldUseDeepSort()) {
+        return wrapWithDeepSort(qb, { qb: this, db, uid });
+      }
       return qb;
     },
     async execute({ mapResults = true } = {}) {
@@ -4735,7 +4849,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 +4857,11 @@ 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 function(query) {
+    query.select("id").from(tableName).whereIn("document_id", (documentIDSubQuery) => {
+      documentIDSubQuery.from(tableName).select("document_id").where("id", id);
+    });
+  };
 };
 const deletePreviousOneToAnyRelations = async ({
   id,
@@ -4763,7 +4878,7 @@ 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(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 ({
@@ -4782,7 +4897,7 @@ const deletePreviousAnyToOneRelations = async ({
   if (isManyToAny(attribute)) {
     const relsToDelete = await con.select(inverseJoinColumn.name).from(joinTable.name).where(joinColumn.name, id).whereNotIn(
       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({
@@ -4793,7 +4908,7 @@ const deletePreviousAnyToOneRelations = async ({
   } else {
     await con.delete().from(joinTable.name).where(joinColumn.name, id).whereNotIn(
       inverseJoinColumn.name,
-      getDocumentSiblingIdsQuery(con, inverseJoinColumn.referencedTable, relIdToadd)
+      getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable, relIdToadd)
     ).where(joinTable.on || {}).transacting(trx);
   }
 };
@@ -5877,6 +5992,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 +6035,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 }],
@@ -6211,7 +6354,8 @@ const createdLocale = {
       if (!model) {
         continue;
       }
-      if (isNil(meta.attributes.locale)) {
+      const hasLocaleColumn = await knex2.schema.hasColumn(meta.tableName, "locale");
+      if (meta.attributes.locale && !hasLocaleColumn) {
         await createLocaleColumn(knex2, meta.tableName);
       }
     }
@@ -6220,17 +6364,87 @@ const createdLocale = {
     throw new Error("not implemented");
   }
 };
+const createPublishedAtColumn = async (db, tableName) => {
+  await db.schema.alterTable(tableName, (table) => {
+    table.string("published_at");
+  });
+};
+const createdPublishedAt = {
+  name: "5.0.0-04-created-published-at",
+  async up(knex2, db) {
+    for (const meta of db.metadata.values()) {
+      const hasTable = await knex2.schema.hasTable(meta.tableName);
+      if (!hasTable) {
+        continue;
+      }
+      const uid = meta.uid;
+      const model = strapi.getModel(uid);
+      if (!model) {
+        continue;
+      }
+      const hasPublishedAtColumn = await knex2.schema.hasColumn(meta.tableName, "published_at");
+      if (meta.attributes.publishedAt && !hasPublishedAtColumn) {
+        await createPublishedAtColumn(knex2, meta.tableName);
+      }
+    }
+  },
+  async down() {
+    throw new Error("not implemented");
+  }
+};
+const dropIndex = async (knex2, tableName, columnName) => {
+  try {
+    await knex2.schema.alterTable(tableName, (table) => {
+      table.dropUnique([columnName], `${tableName}_${columnName}_unique`);
+    });
+  } catch (error) {
+  }
+};
+const dropSlugFieldsIndex = {
+  name: "5.0.0-05-drop-slug-fields-index",
+  async up(knex2, db) {
+    for (const meta of db.metadata.values()) {
+      const hasTable = await knex2.schema.hasTable(meta.tableName);
+      if (!hasTable) {
+        continue;
+      }
+      for (const attribute of Object.values(meta.attributes)) {
+        if (attribute.type === "uid" && attribute.columnName) {
+          await dropIndex(knex2, meta.tableName, attribute.columnName);
+        }
+      }
+    }
+  },
+  async down() {
+    throw new Error("not implemented");
+  }
+};
 const internalMigrations = [
   renameIdentifiersLongerThanMaxLength,
   createdDocumentId,
-  createdLocale
+  createdLocale,
+  createdPublishedAt,
+  dropSlugFieldsIndex
 ];
 const createInternalMigrationProvider = (db) => {
   const context = { 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 +6715,7 @@ class Database {
   migrations;
   lifecycles;
   entityManager;
+  logger;
   constructor(config) {
     this.config = {
       ...config,
@@ -6520,6 +6735,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);