@strapi/database 4.25.22 → 4.25.24

package/dist/index.mjs

@@ -1330,7 +1330,7 @@ const createSchemaDiff = (db) => {
   const diffColumns = (oldColumn, column) => {
     const changes = [];
     const isIgnoredType = ["increments"].includes(column.type);
-    const oldType = oldColumn.type;
+    const oldType = db.dialect.getSqlType(oldColumn.type);
     const type = db.dialect.getSqlType(column.type);
     if (oldType !== type && !isIgnoredType) {
       changes.push("type");
@@ -1821,10 +1821,10 @@ const createSchemaProvider = (db) => {
       await this.drop();
       await this.create();
     },
-    async syncSchema() {
+    async syncSchema(oldSchema) {
       debug$1("Synchronizing database schema");
-      const DBSchema = await db.dialect.schemaInspector.getSchema();
-      const { status, diff } = await this.schemaDiff.diff(DBSchema, schema);
+      const currentSchema = oldSchema ?? await db.dialect.schemaInspector.getSchema();
+      const { status, diff } = await this.schemaDiff.diff(currentSchema, schema);
       if (status === "CHANGED") {
         await this.builder.updateSchema(diff);
       }
@@ -1849,6 +1849,10 @@ const createSchemaProvider = (db) => {
       const hash = await this.schemaStorage.hashSchema(schema);
       if (oldHash !== hash) {
         debug$1("Schema changed");
+        if (!db.config.settings.strictSyncSchema) {
+          debug$1("Syncing schema keeping not Strapi managed elements");
+          return this.syncSchema(oldSchema.schema);
+        }
         return this.syncSchema();
       }
       debug$1("Schema unchanged");
@@ -6228,6 +6232,7 @@ class Database {
       settings: {
         forceMigration: true,
         runMigrations: true,
+        strictSyncSchema: true,
         ...config.settings ?? {}
       }
     };