@nocobase/database 1.4.0-alpha.20241020033334 → 1.4.0-alpha.20241023053303

package/lib/inherited-sync-runner.js

@@ -44,6 +44,7 @@ var import_lodash = __toESM(require("lodash"));
 const _InheritedSyncRunner = class _InheritedSyncRunner {
   static async syncInheritModel(model, options) {
     const { transaction } = options;
+    options.hooks = options.hooks === void 0 ? true : !!options.hooks;
     const inheritedCollection = model.collection;
     const db = inheritedCollection.context.database;
     const dialect = db.sequelize.getDialect();
@@ -78,10 +79,10 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
         for (const parent of parents) {
           const sequenceNameResult = await queryInterface.sequelize.query(
             `SELECT column_default
-           FROM information_schema.columns
-           WHERE table_name = '${parent.model.tableName}'
-             and table_schema = '${parent.collectionSchema()}'
-             and "column_name" = 'id';`,
+             FROM information_schema.columns
+             WHERE table_name = '${parent.model.tableName}'
+               and table_schema = '${parent.collectionSchema()}'
+               and "column_name" = 'id';`,
             {
               transaction
             }
@@ -98,7 +99,7 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
           const sequenceName = match[1];
           const sequenceCurrentValResult = await queryInterface.sequelize.query(
             `select last_value
-           from ${sequenceName}`,
+             from ${sequenceName}`,
             {
               transaction
             }
@@ -120,10 +121,10 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
           const tableName2 = sequenceTable.tableName;
           const schemaName = sequenceTable.schema;
           const idColumnSql = `SELECT column_name
-           FROM information_schema.columns
-           WHERE table_name = '${tableName2}'
-             and column_name = 'id'
-             and table_schema = '${schemaName}';
+                               FROM information_schema.columns
+                               WHERE table_name = '${tableName2}'
+                                 and column_name = 'id'
+                                 and table_schema = '${schemaName}';
           `;
           const idColumnQuery = await queryInterface.sequelize.query(idColumnSql, {
             transaction
@@ -133,7 +134,7 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
           }
           await queryInterface.sequelize.query(
             `alter table ${db.utils.quoteTable(sequenceTable)}
-            alter column id set default nextval('${maxSequenceName}')`,
+              alter column id set default nextval('${maxSequenceName}')`,
             {
               transaction
             }
@@ -150,6 +151,13 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
         }
       }
     }
+    if (options.hooks) {
+      await model.runHooks("afterSync", {
+        ...options,
+        modelName: model.name,
+        transaction
+      });
+    }
   }
   static async createTable(tableName, attributes, options, model, parents) {
     let sql = "";

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.4.0-alpha.20241020033334",
+  "version": "1.4.0-alpha.20241023053303",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.4.0-alpha.20241020033334",
-    "@nocobase/utils": "1.4.0-alpha.20241020033334",
+    "@nocobase/logger": "1.4.0-alpha.20241023053303",
+    "@nocobase/utils": "1.4.0-alpha.20241023053303",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "e99a8cf94fd0cf26db7fe7f82745d6345d80c48b"
+  "gitHead": "7c6272531f271094ddac219755ac898dd33ff5ab"
 }