@strapi/database 4.9.0-exp.90df253ba90fd6879eb56a720a1f80d04ff745b8 → 4.10.0-beta.0

package/lib/entity-manager/entity-repository.js

@@ -96,8 +96,15 @@ const createRepository = (uid, db) => {
       return db.entityManager.attachRelations(uid, id, data);
     },
 
-    updateRelations(id, data) {
-      return db.entityManager.updateRelations(uid, id, data);
+    async updateRelations(id, data) {
+      const trx = await db.transaction();
+      try {
+        await db.entityManager.updateRelations(uid, id, data, { transaction: trx.get() });
+        return trx.commit();
+      } catch (e) {
+        await trx.rollback();
+        throw e;
+      }
     },
 
     deleteRelations(id) {

package/lib/schema/__tests__/schema-diff.test.js

@@ -14,9 +14,15 @@ describe('diffSchemas', () => {
     });
 
     diffSchemas = schemaDiff.diff.bind(schemaDiff);
+
+    global.strapi = {
+      store: {
+        get: () => [],
+      },
+    };
   });
 
-  test('New Table', () => {
+  test('New Table', async () => {
     const testTable = {
       name: 'my_table',
     };
@@ -29,7 +35,7 @@ describe('diffSchemas', () => {
       tables: [testTable],
     };
 
-    expect(diffSchemas(srcSchema, destSchema)).toStrictEqual({
+    expect(await diffSchemas(srcSchema, destSchema)).toStrictEqual({
       status: 'CHANGED',
       diff: {
         tables: {
@@ -42,7 +48,7 @@ describe('diffSchemas', () => {
     });
   });
 
-  test('Removed Table', () => {
+  test('Removed Table', async () => {
     const testTable = {
       name: 'my_table',
     };
@@ -55,7 +61,7 @@ describe('diffSchemas', () => {
       tables: [],
     };
 
-    expect(diffSchemas(srcSchema, destSchema)).toStrictEqual({
+    expect(await diffSchemas(srcSchema, destSchema)).toStrictEqual({
       status: 'CHANGED',
       diff: {
         tables: {
@@ -68,7 +74,7 @@ describe('diffSchemas', () => {
     });
   });
 
-  test('Unchanged Table', () => {
+  test('Unchanged Table', async () => {
     const testTable = {
       name: 'my_table',
       columns: [],
@@ -84,7 +90,7 @@ describe('diffSchemas', () => {
       tables: [testTable],
     };
 
-    expect(diffSchemas(srcSchema, destSchema)).toStrictEqual({
+    expect(await diffSchemas(srcSchema, destSchema)).toStrictEqual({
       status: 'UNCHANGED',
       diff: {
         tables: {
@@ -98,7 +104,7 @@ describe('diffSchemas', () => {
   });
 
   describe('Changed table', () => {
-    test('added column', () => {
+    test('added column', async () => {
       const srcSchema = {
         tables: [
           {
@@ -125,7 +131,7 @@ describe('diffSchemas', () => {
         ],
       };
 
-      expect(diffSchemas(srcSchema, destSchema)).toStrictEqual({
+      expect(await diffSchemas(srcSchema, destSchema)).toStrictEqual({
         status: 'CHANGED',
         diff: {
           tables: {
@@ -178,4 +184,48 @@ describe('diffSchemas', () => {
     test.todo('unchanged foreign key');
     test.todo('removed foreign key');
   });
+
+  test('With persisted DB tables', async () => {
+    const testTables = [
+      {
+        name: 'my_table',
+      },
+      {
+        name: 'my_table_1',
+      },
+    ];
+
+    const coreStoreTable = {
+      name: 'strapi_core_store_settings',
+      columns: [],
+      indexes: [],
+      foreignKeys: [],
+    };
+
+    global.strapi = {
+      store: {
+        get: async () => [testTables[0].name, 'table2'],
+      },
+    };
+
+    const srcSchema = {
+      tables: [...testTables, coreStoreTable],
+    };
+
+    const destSchema = {
+      tables: [coreStoreTable],
+    };
+
+    expect(await diffSchemas(srcSchema, destSchema)).toStrictEqual({
+      status: 'CHANGED',
+      diff: {
+        tables: {
+          added: [],
+          updated: [],
+          unchanged: [coreStoreTable],
+          removed: [testTables[1]],
+        },
+      },
+    });
+  });
 });

package/lib/schema/diff.js

@@ -322,7 +322,7 @@ module.exports = (db) => {
     };
   };
 
-  const diffSchemas = (srcSchema, destSchema) => {
+  const diffSchemas = async (srcSchema, destSchema) => {
     const addedTables = [];
     const updatedTables = [];
     const unchangedTables = [];
@@ -344,10 +344,17 @@ module.exports = (db) => {
       }
     }
 
+    const persistedTables = helpers.hasTable(srcSchema, 'strapi_core_store_settings')
+      ? (await strapi.store.get({
+          type: 'core',
+          key: 'persisted_tables',
+        })) ?? []
+      : [];
+
     for (const srcTable of srcSchema.tables) {
       if (
         !helpers.hasTable(destSchema, srcTable.name) &&
-        !RESERVED_TABLE_NAMES.includes(srcTable.name)
+        ![...RESERVED_TABLE_NAMES, ...persistedTables].includes(srcTable.name)
       ) {
         removedTables.push(srcTable);
       }

package/lib/schema/index.js

@@ -50,7 +50,7 @@ const createSchemaProvider = (db) => {
 
       const DBSchema = await db.dialect.schemaInspector.getSchema();
 
-      const { status, diff } = this.schemaDiff.diff(DBSchema, schema);
+      const { status, diff } = await this.schemaDiff.diff(DBSchema, schema);
 
       if (status === 'CHANGED') {
         await this.builder.updateSchema(diff);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.9.0-exp.90df253ba90fd6879eb56a720a1f80d04ff745b8",
+  "version": "4.10.0-beta.0",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -43,5 +43,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "366eb8a0d0f06935914854c6d9c4b3fe859468e0"
+  "gitHead": "1519ef0e56d27b738f24fc88223797651ad47aaf"
 }