@tachybase/database 1.6.13 → 1.6.14

package/lib/database.js

@@ -541,14 +541,23 @@ const _Database = class _Database extends import_node_events.EventEmitter {
     if (isMySQL) {
       await this.sequelize.query("SET FOREIGN_KEY_CHECKS = 0", null);
     }
-    if (this.options.schema && this.inDialect("postgres")) {
-      await this.sequelize.query(`CREATE SCHEMA IF NOT EXISTS "${this.options.schema}"`, null);
+    const isSQLite = this.inDialect("sqlite");
+    if (isSQLite) {
+      await this.sequelize.query("PRAGMA foreign_keys = OFF");
     }
-    const result = await this.sequelize.sync(options);
-    if (isMySQL) {
-      await this.sequelize.query("SET FOREIGN_KEY_CHECKS = 1", null);
+    try {
+      if (this.options.schema && this.inDialect("postgres")) {
+        await this.sequelize.query(`CREATE SCHEMA IF NOT EXISTS "${this.options.schema}"`, null);
+      }
+      return await this.sequelize.sync(options);
+    } finally {
+      if (isMySQL) {
+        await this.sequelize.query("SET FOREIGN_KEY_CHECKS = 1", null);
+      }
+      if (isSQLite) {
+        await this.sequelize.query("PRAGMA foreign_keys = ON");
+      }
     }
-    return result;
   }
   async clean(options) {
     const { drop, ...others } = options || {};

package/lib/fields/sort-field.js

@@ -55,58 +55,60 @@ const _SortField = class _SortField extends import_field.Field {
       }
     }, "onScopeChange");
     this.initRecordsSortValue = /* @__PURE__ */ __name(async ({ transaction }) => {
-      const orderField = (() => {
-        const model = this.collection.model;
-        if (model.primaryKeyAttribute) {
-          return model.primaryKeyAttribute;
-        }
-        if (model.rawAttributes["createdAt"]) {
-          return model.rawAttributes["createdAt"].field;
-        }
-        throw new Error(`can not find order key for collection ${this.collection.name}`);
-      })();
-      const needInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
-        const filter = {};
-        if (scopeKey2 && scopeValue) {
-          filter[scopeKey2] = scopeValue;
-        }
-        const totalCount = await this.collection.repository.count({
-          filter,
-          transaction
-        });
-        const emptyCount = await this.collection.repository.count({
-          filter: {
-            [this.name]: null,
-            ...filter
-          },
-          transaction
-        });
-        return emptyCount === totalCount && emptyCount > 0;
-      }, "needInit");
-      const doInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
-        const queryInterface = this.collection.db.sequelize.getQueryInterface();
-        if (scopeKey2) {
-          const scopeAttribute = this.collection.model.rawAttributes[scopeKey2];
-          if (!scopeAttribute) {
-            throw new Error(`can not find scope field ${scopeKey2} for collection ${this.collection.name}`);
+      try {
+        const orderField = (() => {
+          const model = this.collection.model;
+          if (model.primaryKeyAttribute) {
+            return model.primaryKeyAttribute;
           }
-          scopeKey2 = scopeAttribute.field;
-        }
-        const quotedOrderField = queryInterface.quoteIdentifier(orderField);
-        const sortColumnName = queryInterface.quoteIdentifier(this.collection.model.rawAttributes[this.name].field);
-        let sql;
-        const whereClause = scopeKey2 && scopeValue ? (() => {
-          const filteredScopeValue = scopeValue.filter((v) => v !== null);
-          if (filteredScopeValue.length === 0) {
-            return "";
+          if (model.rawAttributes["createdAt"]) {
+            return model.rawAttributes["createdAt"].field;
+          }
+          throw new Error(`can not find order key for collection ${this.collection.name}`);
+        })();
+        const needInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
+          const filter = {};
+          if (scopeKey2 != null && scopeValue != null) {
+            filter[scopeKey2] = scopeValue;
           }
-          const initialClause = `
-  WHERE ${queryInterface.quoteIdentifier(scopeKey2)} IN (${filteredScopeValue.map((v) => `'${v}'`).join(", ")})`;
-          const nullCheck = scopeValue.includes(null) ? ` OR ${queryInterface.quoteIdentifier(scopeKey2)} IS NULL` : "";
-          return initialClause + nullCheck;
-        })() : "";
-        if (this.collection.db.inDialect("postgres")) {
-          sql = `
+          const totalCount = await this.collection.repository.count({
+            filter,
+            transaction
+          });
+          const emptyCount = await this.collection.repository.count({
+            filter: {
+              [this.name]: null,
+              ...filter
+            },
+            transaction
+          });
+          return emptyCount === totalCount && emptyCount > 0;
+        }, "needInit");
+        const doInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
+          const queryInterface = this.collection.db.sequelize.getQueryInterface();
+          const escape = this.collection.db.sequelize.escape.bind(this.collection.db.sequelize);
+          if (scopeKey2) {
+            const scopeAttribute = this.collection.model.rawAttributes[scopeKey2];
+            if (!scopeAttribute) {
+              throw new Error(`can not find scope field ${scopeKey2} for collection ${this.collection.name}`);
+            }
+            scopeKey2 = scopeAttribute.field;
+          }
+          const quotedOrderField = queryInterface.quoteIdentifier(orderField);
+          const sortColumnName = queryInterface.quoteIdentifier(this.collection.model.rawAttributes[this.name].field);
+          let sql;
+          const whereClause = scopeKey2 != null && scopeValue != null ? (() => {
+            const filteredScopeValue = scopeValue.filter((v) => v !== null);
+            if (filteredScopeValue.length === 0) {
+              return "";
+            }
+            const initialClause = `
+  WHERE ${queryInterface.quoteIdentifier(scopeKey2)} IN (${filteredScopeValue.map((v) => escape(v)).join(", ")})`;
+            const nullCheck = scopeValue.includes(null) ? ` OR ${queryInterface.quoteIdentifier(scopeKey2)} IS NULL` : "";
+            return initialClause + nullCheck;
+          })() : "";
+          if (this.collection.db.inDialect("postgres")) {
+            sql = `
     UPDATE ${this.collection.quotedTableName()}
     SET ${sortColumnName} = ordered_table.new_sequence_number
     FROM (
@@ -116,8 +118,17 @@ const _SortField = class _SortField extends import_field.Field {
     ) AS ordered_table
     WHERE ${this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField};
   `;
-        } else if (this.collection.db.inDialect("sqlite")) {
-          sql = `
+          } else if (this.collection.db.inDialect("sqlite")) {
+            const outerWhere = scopeKey2 && scopeValue ? (() => {
+              const filtered = scopeValue.filter((v) => v !== null);
+              if (filtered.length === 0) return "";
+              let clause = `WHERE ${queryInterface.quoteIdentifier(scopeKey2)} IN (${filtered.map((v) => escape(v)).join(", ")})`;
+              if (scopeValue.includes(null)) {
+                clause += ` OR ${queryInterface.quoteIdentifier(scopeKey2)} IS NULL`;
+              }
+              return clause;
+            })() : "";
+            sql = `
     UPDATE ${this.collection.quotedTableName()}
     SET ${sortColumnName} = (
       SELECT new_sequence_number
@@ -127,10 +138,11 @@ const _SortField = class _SortField extends import_field.Field {
         ${whereClause}
       ) AS ordered_table
       WHERE ${this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField}
-    );
+    )
+    ${outerWhere};
   `;
-        } else if (this.collection.db.inDialect("mysql") || this.collection.db.inDialect("mariadb")) {
-          sql = `
+          } else if (this.collection.db.inDialect("mysql") || this.collection.db.inDialect("mariadb")) {
+            sql = `
     UPDATE ${this.collection.quotedTableName()}
     JOIN (
       SELECT *, ROW_NUMBER() OVER (${scopeKey2 ? `PARTITION BY ${queryInterface.quoteIdentifier(scopeKey2)}` : ""} ORDER BY ${quotedOrderField}) AS new_sequence_number
@@ -139,30 +151,39 @@ const _SortField = class _SortField extends import_field.Field {
     ) AS ordered_table ON ${this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField}
     SET ${this.collection.quotedTableName()}.${sortColumnName} = ordered_table.new_sequence_number;
   `;
-        }
-        await this.collection.db.sequelize.query(sql, {
-          transaction
-        });
-      }, "doInit");
-      const scopeKey = this.options.scopeKey;
-      if (scopeKey) {
-        const groups = await this.collection.repository.find({
-          attributes: [scopeKey],
-          group: [scopeKey],
-          raw: true,
-          transaction
-        });
-        const needInitGroups = [];
-        for (const group of groups) {
-          if (await needInit(scopeKey, group[scopeKey])) {
-            needInitGroups.push(group[scopeKey]);
           }
+          await this.collection.db.sequelize.query(sql, {
+            transaction
+          });
+        }, "doInit");
+        const scopeKey = this.options.scopeKey;
+        if (scopeKey) {
+          const groups = await this.collection.repository.find({
+            attributes: [scopeKey],
+            group: [scopeKey],
+            raw: true,
+            transaction
+          });
+          const needInitGroups = [];
+          for (const group of groups) {
+            if (await needInit(scopeKey, group[scopeKey])) {
+              needInitGroups.push(group[scopeKey]);
+            }
+          }
+          if (needInitGroups.length > 0) {
+            await doInit(scopeKey, needInitGroups);
+          }
+        } else if (await needInit()) {
+          await doInit();
         }
-        if (needInitGroups.length > 0) {
-          await doInit(scopeKey, needInitGroups);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        const isMissingTable = /no such table|relation .* does not exist|Table .* doesn't exist|No description found|SQLITE_ERROR/i.test(
+          msg
+        );
+        if (!isMissingTable) {
+          throw err;
         }
-      } else if (await needInit()) {
-        await doInit();
       }
     }, "initRecordsSortValue");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/database",
-  "version": "1.6.13",
+  "version": "1.6.14",
   "description": "",
   "homepage": "https://github.com/tegojs/tego#readme",
   "bugs": {
@@ -31,9 +31,9 @@
     "semver": "7.7.2",
     "sequelize": "^6.37.7",
     "umzug": "^3.8.2",
-    "@tachybase/logger": "1.6.13",
-    "@tachybase/utils": "1.6.13",
-    "@tachybase/globals": "1.6.13"
+    "@tachybase/globals": "1.6.14",
+    "@tachybase/logger": "1.6.14",
+    "@tachybase/utils": "1.6.14"
   },
   "devDependencies": {
     "@types/flat": "^5.0.5",