@strapi/database 4.5.4 → 4.6.0-alpha.1

package/lib/entity-manager/index.js

@@ -211,19 +211,22 @@ const createEntityManager = (db) => {
       }
 
       const dataToInsert = processData(metadata, data, { withDefaults: true });
-
-      const res = await this.createQueryBuilder(uid).insert(dataToInsert).execute();
-
-      const id = res[0].id || res[0];
+      let id;
 
       const trx = await strapi.db.transaction();
       try {
+        const res = await this.createQueryBuilder(uid)
+          .insert(dataToInsert)
+          .transacting(trx)
+          .execute();
+
+        id = res[0].id || res[0];
+
         await this.attachRelations(uid, id, data, { transaction: trx });
 
         await trx.commit();
       } catch (e) {
         await trx.rollback();
-        await this.createQueryBuilder(uid).where({ id }).delete().execute();
         throw e;
       }
 
@@ -282,11 +285,7 @@ const createEntityManager = (db) => {
         throw new Error('Update requires a where parameter');
       }
 
-      const entity = await this.createQueryBuilder(uid)
-        .select('*')
-        .where(where)
-        .first()
-        .execute({ mapResults: false });
+      const entity = await this.createQueryBuilder(uid).select('id').where(where).first().execute();
 
       if (!entity) {
         return null;
@@ -294,19 +293,23 @@ const createEntityManager = (db) => {
 
       const { id } = entity;
 
-      const dataToUpdate = processData(metadata, data);
-
-      if (!isEmpty(dataToUpdate)) {
-        await this.createQueryBuilder(uid).where({ id }).update(dataToUpdate).execute();
-      }
-
       const trx = await strapi.db.transaction();
       try {
+        const dataToUpdate = processData(metadata, data);
+
+        if (!isEmpty(dataToUpdate)) {
+          await this.createQueryBuilder(uid)
+            .where({ id })
+            .update(dataToUpdate)
+            .transacting(trx)
+            .execute();
+        }
+
         await this.updateRelations(uid, id, data, { transaction: trx });
+
         await trx.commit();
       } catch (e) {
         await trx.rollback();
-        await this.createQueryBuilder(uid).where({ id }).update(entity).execute();
         throw e;
       }
 
@@ -369,10 +372,10 @@ const createEntityManager = (db) => {
 
       const { id } = entity;
 
-      await this.createQueryBuilder(uid).where({ id }).delete().execute();
-
       const trx = await strapi.db.transaction();
       try {
+        await this.createQueryBuilder(uid).where({ id }).delete().transacting(trx).execute();
+
         await this.deleteRelations(uid, id, { transaction: trx });
 
         await trx.commit();

package/lib/entity-manager/regular-relations.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const { map, isEmpty } = require('lodash/fp');
-const { randomBytes } = require('crypto');
 
 const {
   isBidirectional,
@@ -198,42 +197,60 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
     return;
   }
 
+  // Handle databases that don't support window function ROW_NUMBER
+  if (!strapi.db.dialect.supportsWindowFunctions()) {
+    await cleanOrderColumnsForOldDatabases({ id, attribute, db, inverseRelIds, transaction: trx });
+    return;
+  }
+
+  const { joinTable } = attribute;
+  const { joinColumn, inverseJoinColumn, orderColumnName, inverseOrderColumnName } = joinTable;
+  const update = [];
+  const updateBinding = [];
+  const select = ['??'];
+  const selectBinding = ['id'];
+  const where = [];
+  const whereBinding = [];
+
+  if (hasOrderColumn(attribute) && id) {
+    update.push('?? = b.src_order');
+    updateBinding.push(orderColumnName);
+    select.push('ROW_NUMBER() OVER (PARTITION BY ?? ORDER BY ??) AS src_order');
+    selectBinding.push(joinColumn.name, orderColumnName);
+    where.push('?? = ?');
+    whereBinding.push(joinColumn.name, id);
+  }
+
+  if (hasInverseOrderColumn(attribute) && !isEmpty(inverseRelIds)) {
+    update.push('?? = b.inv_order');
+    updateBinding.push(inverseOrderColumnName);
+    select.push('ROW_NUMBER() OVER (PARTITION BY ?? ORDER BY ??) AS inv_order');
+    selectBinding.push(inverseJoinColumn.name, inverseOrderColumnName);
+    where.push(`?? IN (${inverseRelIds.map(() => '?').join(', ')})`);
+    whereBinding.push(inverseJoinColumn.name, ...inverseRelIds);
+  }
+
+  // raw query as knex doesn't allow updating from a subquery
+  // https://github.com/knex/knex/issues/2504
   switch (strapi.db.dialect.client) {
     case 'mysql':
-      await cleanOrderColumnsForInnoDB({ id, attribute, db, inverseRelIds, transaction: trx });
+      await db.connection
+        .raw(
+          `UPDATE
+            ?? as a,
+            (
+              SELECT ${select.join(', ')}
+              FROM ??
+              WHERE ${where.join(' OR ')}
+            ) AS b
+          SET ${update.join(', ')}
+          WHERE b.id = a.id`,
+          [joinTable.name, ...selectBinding, joinTable.name, ...whereBinding, ...updateBinding]
+        )
+        .transacting(trx);
       break;
     default: {
-      const { joinTable } = attribute;
-      const { joinColumn, inverseJoinColumn, orderColumnName, inverseOrderColumnName } = joinTable;
-      const update = [];
-      const updateBinding = [];
-      const select = ['??'];
-      const selectBinding = ['id'];
-      const where = [];
-      const whereBinding = [];
-
-      if (hasOrderColumn(attribute) && id) {
-        update.push('?? = b.src_order');
-        updateBinding.push(orderColumnName);
-        select.push('ROW_NUMBER() OVER (PARTITION BY ?? ORDER BY ??) AS src_order');
-        selectBinding.push(joinColumn.name, orderColumnName);
-        where.push('?? = ?');
-        whereBinding.push(joinColumn.name, id);
-      }
-
-      if (hasInverseOrderColumn(attribute) && !isEmpty(inverseRelIds)) {
-        update.push('?? = b.inv_order');
-        updateBinding.push(inverseOrderColumnName);
-        select.push('ROW_NUMBER() OVER (PARTITION BY ?? ORDER BY ??) AS inv_order');
-        selectBinding.push(inverseJoinColumn.name, inverseOrderColumnName);
-        where.push(`?? IN (${inverseRelIds.map(() => '?').join(', ')})`);
-        whereBinding.push(inverseJoinColumn.name, ...inverseRelIds);
-      }
-
       const joinTableName = addSchema(joinTable.name);
-
-      // raw query as knex doesn't allow updating from a subquery
-      // https://github.com/knex/knex/issues/2504
       await db.connection
         .raw(
           `UPDATE ?? as a
@@ -247,29 +264,24 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
           [joinTableName, ...updateBinding, ...selectBinding, joinTableName, ...whereBinding]
         )
         .transacting(trx);
-
-      /*
-        `UPDATE :joinTable: as a
-          SET :orderColumn: = b.src_order, :inverseOrderColumn: = b.inv_order
-          FROM (
-            SELECT
-              id,
-              ROW_NUMBER() OVER ( PARTITION BY :joinColumn: ORDER BY :orderColumn:) AS src_order,
-              ROW_NUMBER() OVER ( PARTITION BY :inverseJoinColumn: ORDER BY :inverseOrderColumn:) AS inv_order
-            FROM :joinTable:
-            WHERE :joinColumn: = :id OR :inverseJoinColumn: IN (:inverseRelIds)
-          ) AS b
-          WHERE b.id = a.id`,
-      */
     }
+    /*
+      `UPDATE :joinTable: as a
+        SET :orderColumn: = b.src_order, :inverseOrderColumn: = b.inv_order
+        FROM (
+          SELECT
+            id,
+            ROW_NUMBER() OVER ( PARTITION BY :joinColumn: ORDER BY :orderColumn:) AS src_order,
+            ROW_NUMBER() OVER ( PARTITION BY :inverseJoinColumn: ORDER BY :inverseOrderColumn:) AS inv_order
+          FROM :joinTable:
+          WHERE :joinColumn: = :id OR :inverseJoinColumn: IN (:inverseRelIds)
+        ) AS b
+        WHERE b.id = a.id`,
+    */
   }
 };
 
-/*
- * Ensure that orders are following a 1, 2, 3 sequence, without gap.
- * The use of a temporary table instead of a window function makes the query compatible with MySQL 5 and prevents some deadlocks to happen in innoDB databases
- */
-const cleanOrderColumnsForInnoDB = async ({
+const cleanOrderColumnsForOldDatabases = async ({
   id,
   attribute,
   db,
@@ -280,15 +292,14 @@ const cleanOrderColumnsForInnoDB = async ({
   const { joinColumn, inverseJoinColumn, orderColumnName, inverseOrderColumnName } = joinTable;
 
   const now = new Date().valueOf();
-  const randomHex = randomBytes(16).toString('hex');
 
   if (hasOrderColumn(attribute) && id) {
-    const tempOrderTableName = `orderTable_${now}_${randomHex}`;
+    const tempOrderTableName = `tempOrderTableName_${now}`;
     try {
       await db.connection
         .raw(
           `
-          CREATE TABLE :tempOrderTableName:
+          CREATE TEMPORARY TABLE :tempOrderTableName:
             SELECT
               id,
               (
@@ -306,9 +317,6 @@ const cleanOrderColumnsForInnoDB = async ({
           }
         )
         .transacting(trx);
-
-      // raw query as knex doesn't allow updating from a subquery
-      // https://github.com/knex/knex/issues/2504
       await db.connection
         .raw(
           `UPDATE ?? as a, (SELECT * FROM ??) AS b
@@ -318,12 +326,14 @@ const cleanOrderColumnsForInnoDB = async ({
         )
         .transacting(trx);
     } finally {
-      await db.connection.raw(`DROP TABLE IF EXISTS ??`, [tempOrderTableName]).transacting(trx);
+      await db.connection
+        .raw(`DROP TEMPORARY TABLE IF EXISTS ??`, [tempOrderTableName])
+        .transacting(trx);
     }
   }
 
   if (hasInverseOrderColumn(attribute) && !isEmpty(inverseRelIds)) {
-    const tempInvOrderTableName = `invOrderTable_${now}_${randomHex}`;
+    const tempInvOrderTableName = `tempInvOrderTableName_${now}`;
     try {
       await db.connection
         .raw(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.5.4",
+  "version": "4.6.0-alpha.1",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "date-fns": "2.29.2",
-    "debug": "4.3.4",
+    "debug": "4.3.1",
     "fs-extra": "10.0.0",
     "knex": "1.0.7",
     "lodash": "4.17.21",
@@ -43,5 +43,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "8716ecc920130db5341b0904cf868c6e6b581a5d"
+  "gitHead": "9171c48104548f5f6da21abf2a8098009f1a40e9"
 }