@strapi/database 4.9.1 → 4.9.2

package/lib/entity-manager/__tests__/relations-orderer.test.js

@@ -121,6 +121,28 @@ describe('Given I have some relations in the database', () => {
       ]);
     });
   });
+
+  describe('When you connect a relation before one with null order', () => {
+    test('Then it replaces null order values to 1 and properly reorders relations', () => {
+      const orderer = relationsOrderer(
+        [
+          { id: 2, order: null },
+          { id: 3, order: null },
+        ],
+        'id',
+        'order'
+      );
+
+      orderer.connect([{ id: 4, position: { before: 3 } }, { id: 5 }]);
+
+      expect(orderer.get()).toMatchObject([
+        { id: 2, order: 1 },
+        { id: 4, order: 0.5 },
+        { id: 3, order: 1 },
+        { id: 5, order: 1.5 },
+      ]);
+    });
+  });
 });
 
 describe('Given there are no relations in the database', () => {

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

@@ -135,7 +135,7 @@ const relationsOrderer = (initArr, idColumn, orderColumn, strict) => {
   const computedRelations = _.castArray(initArr || []).map((r) => ({
     init: true,
     id: r[idColumn],
-    order: r[orderColumn],
+    order: r[orderColumn] || 1,
   }));
 
   const maxOrder = _.maxBy('order', computedRelations)?.order || 0;

package/lib/index.js

@@ -57,15 +57,18 @@ class Database {
 
     async function commit() {
       if (notNestedTransaction) {
+        transactionCtx.clear();
         await trx.commit();
       }
     }
 
     async function rollback() {
       if (notNestedTransaction) {
+        transactionCtx.clear();
         await trx.rollback();
       }
     }
+
     if (!cb) {
       return {
         commit,

package/lib/transaction-context.js

@@ -6,11 +6,19 @@ const storage = new AsyncLocalStorage();
 
 const transactionCtx = {
   async run(store, cb) {
-    return storage.run(store, cb);
+    return storage.run({ trx: store }, cb);
   },
 
   get() {
-    return storage.getStore();
+    const store = storage.getStore();
+    return store?.trx;
+  },
+
+  clear() {
+    const store = storage.getStore();
+    if (store?.trx) {
+      store.trx = null;
+    }
   },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.9.1",
+  "version": "4.9.2",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -45,5 +45,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "c8f2f0543b45dda8eadde21a0782b64d156fc786"
+  "gitHead": "91e0be2708e4d1e8ec731c75e73e54c0dfacb67d"
 }