@nocobase/database 1.2.6-alpha → 1.2.8-alpha

package/lib/query-interface/mysql-query-interface.js

@@ -113,8 +113,8 @@ const _MysqlQueryInterface = class _MysqlQueryInterface extends import_query_int
     const results = await this.db.sequelize.query(sql, { type: "SELECT", transaction });
     let currentVal = results[0]["currentVal"];
     if (currentVal === null) {
-      const maxSql = `SELECT MAX(${fieldName}) as currentVal
-                      FROM ${tableInfo.tableName};`;
+      const maxSql = `SELECT MAX(\`${fieldName}\`) as currentVal
+                      FROM \`${tableInfo.tableName}\`;`;
       const maxResults = await this.db.sequelize.query(maxSql, { type: "SELECT", transaction });
       currentVal = maxResults[0]["currentVal"];
     }
@@ -124,8 +124,10 @@ const _MysqlQueryInterface = class _MysqlQueryInterface extends import_query_int
   }
   async setAutoIncrementVal(options) {
     const { tableInfo, columnName, seqName, currentVal, transaction } = options;
-    const sql = `ALTER TABLE ${this.quoteIdentifier(tableInfo.tableName)} AUTO_INCREMENT = ${currentVal};`;
-    await this.db.sequelize.query(sql, { transaction });
+    if (currentVal) {
+      const sql = `ALTER TABLE ${this.quoteIdentifier(tableInfo.tableName)} AUTO_INCREMENT = ${currentVal};`;
+      await this.db.sequelize.query(sql, { transaction });
+    }
   }
 };
 __name(_MysqlQueryInterface, "MysqlQueryInterface");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.2.6-alpha",
+  "version": "1.2.8-alpha",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.2.6-alpha",
-    "@nocobase/utils": "1.2.6-alpha",
+    "@nocobase/logger": "1.2.8-alpha",
+    "@nocobase/utils": "1.2.8-alpha",
     "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": "c3a33ebeeb5ca33c0612946e3999cbbb2b7b5dae"
+  "gitHead": "23132ae9e60c152ea61b77a6371a41c684d4041a"
 }