@strapi/database 4.9.2 → 4.10.0-beta.1

package/lib/dialects/postgresql/index.js

@@ -22,12 +22,6 @@ class PostgresDialect extends Dialect {
       'text',
       (v) => v
     );
-    // Don't parse JSONB automatically
-    this.db.connection.client.driver.types.setTypeParser(
-      this.db.connection.client.driver.types.builtins.JSONB,
-      'text',
-      (v) => v
-    );
     this.db.connection.client.driver.types.setTypeParser(
       this.db.connection.client.driver.types.builtins.NUMERIC,
       'text',

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/fields/json.js

@@ -8,7 +8,12 @@ class JSONField extends Field {
   }
 
   fromDB(value) {
-    if (typeof value === 'string') return JSON.parse(value);
+    try {
+      if (typeof value === 'string') return JSON.parse(value);
+    } catch (error) {
+      // Just return the value if it's not a valid JSON string
+      return value;
+    }
     return value;
   }
 }

package/lib/schema/diff.js

@@ -344,6 +344,13 @@ module.exports = (db) => {
       }
     }
 
+    const parsePersistedTable = (persistedTable) => {
+      if (typeof persistedTable === 'string') {
+        return persistedTable;
+      }
+      return persistedTable.name;
+    };
+
     const persistedTables = helpers.hasTable(srcSchema, 'strapi_core_store_settings')
       ? (await strapi.store.get({
           type: 'core',
@@ -351,12 +358,19 @@ module.exports = (db) => {
         })) ?? []
       : [];
 
+    const reservedTables = [...RESERVED_TABLE_NAMES, ...persistedTables.map(parsePersistedTable)];
+
     for (const srcTable of srcSchema.tables) {
-      if (
-        !helpers.hasTable(destSchema, srcTable.name) &&
-        ![...RESERVED_TABLE_NAMES, ...persistedTables].includes(srcTable.name)
-      ) {
-        removedTables.push(srcTable);
+      if (!helpers.hasTable(destSchema, srcTable.name) && !reservedTables.includes(srcTable.name)) {
+        const dependencies = persistedTables
+          .filter((table) => {
+            return table?.dependsOn?.some((table) => table.name === srcTable.name);
+          })
+          .map((dependsOnTable) => {
+            return srcSchema.tables.find((srcTable) => srcTable.name === dependsOnTable.name);
+          });
+
+        removedTables.push(srcTable, ...dependencies);
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "4.9.2",
+  "version": "4.10.0-beta.1",
   "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": "91e0be2708e4d1e8ec731c75e73e54c0dfacb67d"
+  "gitHead": "95d581b31bee464af42e5d8db408fa578d8532c7"
 }