@strapi/database 4.12.0-beta.4 → 4.12.0

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

@@ -206,98 +206,114 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
 
   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);
-  }
-
-  switch (strapi.db.dialect.client) {
-    case 'mysql':
-      // Here it's MariaDB and MySQL 8
-      await db
-        .getConnection()
-        .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;
-    /*
-      UPDATE
-        :joinTable: as a,
-        (
-          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
-      SET :orderColumn: = b.src_order, :inverseOrderColumn: = b.inv_order
-      WHERE b.id = a.id;
-    */
-    default: {
-      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
-              SET ${update.join(', ')}
-              FROM (
-                SELECT ${select.join(', ')}
-                FROM ??
-                WHERE ${where.join(' OR ')}
-              ) AS b
-              WHERE b.id = a.id`,
-          [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,
+  (
+    SELECT
+      id,
+      ROW_NUMBER() OVER ( PARTITION BY :joinColumn: ORDER BY :orderColumn:) AS src_order,
+    FROM :joinTable:
+    WHERE :joinColumn: = :id
+  ) AS b
+  SET :orderColumn: = b.src_order
+  WHERE b.id = a.id;
+  */
+  const updateOrderColumn = async () => {
+    if (!hasOrderColumn(attribute) || !id) return;
+
+    const select = db
+      .connection(joinTable.name)
+      .select('id')
+      .rowNumber('src_order', orderColumnName, joinColumn.name)
+      .where(joinColumn.name, id)
+      .toSQL();
+
+    switch (strapi.db.dialect.client) {
+      case 'mysql':
+        // Here it's MariaDB and MySQL 8
+        await db
+          .getConnection()
+          .raw(
+            `UPDATE ?? as a, ( ${select.sql} ) AS b
+            SET ?? = b.src_order
+            WHERE b.id = a.id`,
+            [joinTable.name, ...select.bindings, orderColumnName]
+          )
+          .transacting(trx);
+
+        break;
+
+      default: {
+        const joinTableName = addSchema(joinTable.name);
+
+        // raw query as knex doesn't allow updating from a subquery
+        await db.connection
+          .raw(
+            `UPDATE ?? as a
+            SET ?? = b.src_order
+            FROM ( ${select.sql} ) AS b
+            WHERE b.id = a.id`,
+            [joinTableName, orderColumnName, ...select.bindings]
+          )
+          .transacting(trx);
+      }
     }
-  }
+  };
+
+  /**
+  UPDATE :joinTable: as a,
+  (
+    SELECT
+      id,
+      ROW_NUMBER() OVER ( PARTITION BY :inverseJoinColumn: ORDER BY :inverseOrderColumn:) AS inv_order
+    FROM :joinTable:
+    WHERE :inverseJoinColumn: IN (:inverseRelIds)
+  ) AS b
+  SET :inverseOrderColumn: = b.inv_order
+  WHERE b.id = a.id;
+  */
+  const updateInverseOrderColumn = async () => {
+    if (!hasInverseOrderColumn(attribute) || isEmpty(inverseRelIds)) return;
+    const select = db
+      .connection(joinTable.name)
+      .select('id')
+      .rowNumber('inv_order', inverseOrderColumnName, inverseJoinColumn.name)
+      .where(inverseJoinColumn.name, 'in', inverseRelIds)
+      .toSQL();
+
+    switch (strapi.db.dialect.client) {
+      case 'mysql':
+        // Here it's MariaDB and MySQL 8
+        await db
+          .getConnection()
+          .raw(
+            `UPDATE ?? as a, ( ${select.sql} ) AS b
+            SET ?? = b.inv_order
+            WHERE b.id = a.id`,
+            [joinTable.name, ...select.bindings, inverseOrderColumnName]
+          )
+          .transacting(trx);
+        break;
+
+      default: {
+        const joinTableName = addSchema(joinTable.name);
+
+        // raw query as knex doesn't allow updating from a subquery
+        await db.connection
+          .raw(
+            `UPDATE ?? as a
+            SET ?? = b.inv_order
+            FROM ( ${select.sql} ) AS b
+            WHERE b.id = a.id`,
+            [joinTableName, inverseOrderColumnName, ...select.bindings]
+          )
+          .transacting(trx);
+      }
+    }
+  };
+
+  return Promise.all([updateOrderColumn(), updateInverseOrderColumn()]);
 };
 
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.12.0-beta.4",
+  "version": "4.12.0",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -33,7 +33,7 @@
     "lint": "run -T eslint ."
   },
   "dependencies": {
-    "@strapi/utils": "4.12.0-beta.4",
+    "@strapi/utils": "4.12.0",
     "date-fns": "2.30.0",
     "debug": "4.3.4",
     "fs-extra": "10.0.0",
@@ -46,5 +46,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "edcf86b496a7bee5189cdbfeb16f5a5c0abccc81"
+  "gitHead": "7f8109a1a736c1d997fbb445469b3b59550c7aeb"
 }