@nocobase/database 2.1.0-beta.13 → 2.1.0-beta.15

package/lib/eager-loading/eager-loading-tree.js

@@ -75,16 +75,20 @@ const queryParentSQL = /* @__PURE__ */ __name((options) => {
   const targetKeyField = collection.model.rawAttributes[targetKey].field;
   const queryInterface = db.sequelize.getQueryInterface();
   const q = queryInterface.quoteIdentifier.bind(queryInterface);
-  return `WITH RECURSIVE cte AS (
+  const placeholders = nodeIds.map((_, index) => `$${index + 1}`).join(", ");
+  return {
+    sql: `WITH RECURSIVE cte AS (
       SELECT ${q(targetKeyField)}, ${q(foreignKeyField)}
       FROM ${tableName}
-      WHERE ${q(targetKeyField)} IN ('${nodeIds.join("','")}')
+      WHERE ${q(targetKeyField)} IN (${placeholders})
       UNION ALL
       SELECT t.${q(targetKeyField)}, t.${q(foreignKeyField)}
       FROM ${tableName} AS t
       INNER JOIN cte ON t.${q(targetKeyField)} = cte.${q(foreignKeyField)}
       )
-      SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
+      SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`,
+    bind: nodeIds
+  };
 }, "queryParentSQL");
 const _EagerLoadingTree = class _EagerLoadingTree {
   root;
@@ -305,7 +309,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           });
           if (node.includeOption.recursively && instances.length > 0) {
             const targetKey = association.targetKey;
-            const sql = queryParentSQL({
+            const { sql, bind } = queryParentSQL({
               db: this.db,
               collection: collection2,
               foreignKey,
@@ -313,6 +317,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
               nodeIds: instances.map((instance) => instance.get(targetKey))
             });
             const results = await this.db.sequelize.query(sql, {
+              bind,
               type: "SELECT",
               transaction
             });

package/lib/repository.js

@@ -151,12 +151,13 @@ const _Repository = class _Repository {
         [import_sequelize.Op.and]: [options["where"] || {}, optionParser.filterByTkToWhereOption()]
       };
     }
+    const hasInclude = Array.isArray(options["include"]) && options["include"].length > 0;
     const queryOptions = {
-      ...options,
-      distinct: Boolean(this.collection.model.primaryKeyAttribute) && !this.collection.isMultiFilterTargetKey()
+      ...options
     };
-    if (Array.isArray(queryOptions.include) && queryOptions.include.length > 0) {
+    if (hasInclude) {
       queryOptions.include = (0, import_utils2.processIncludes)(queryOptions.include, this.collection.model);
+      queryOptions.distinct = Boolean(this.collection.model.primaryKeyAttribute) && !this.collection.isMultiFilterTargetKey();
     } else {
       delete queryOptions.include;
     }

package/lib/utils/field-validation.js

@@ -42,6 +42,19 @@ __export(field_validation_exports, {
 module.exports = __toCommonJS(field_validation_exports);
 var import_joi = __toESM(require("joi"));
 var import_lodash = __toESM(require("lodash"));
+function getFractionLength(value) {
+  const normalized = value.trim().replace(/,/g, "");
+  if (!normalized || /e/i.test(normalized)) {
+    return 0;
+  }
+  const unsignedValue = normalized.startsWith("+") || normalized.startsWith("-") ? normalized.slice(1) : normalized;
+  const dotIndex = unsignedValue.indexOf(".");
+  if (dotIndex < 0) {
+    return 0;
+  }
+  return unsignedValue.slice(dotIndex + 1).length;
+}
+__name(getFractionLength, "getFractionLength");
 function buildJoiSchema(validation, options) {
   const { type, rules } = validation;
   const { label, value } = options;
@@ -60,7 +73,21 @@ function buildJoiSchema(validation, options) {
     rules.forEach((rule) => {
       const args = import_lodash.default.cloneDeep(rule.args);
       if (rule.name === "precision") {
-        schema = schema.strict();
+        const limit = Number(args == null ? void 0 : args.limit);
+        schema = schema.custom((currentValue, helpers) => {
+          if (Number.isNaN(limit)) {
+            return currentValue;
+          }
+          const originalValue = helpers.original;
+          if (originalValue === null || originalValue === void 0 || originalValue === "") {
+            return currentValue;
+          }
+          if (getFractionLength(String(originalValue)) > limit) {
+            return helpers.error("number.precision", { limit });
+          }
+          return currentValue;
+        });
+        return;
       }
       if (!import_lodash.default.isEmpty(args)) {
         if (rule.name === "pattern" && !import_lodash.default.isRegExp(args.regex)) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-beta.13",
+  "version": "2.1.0-beta.15",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-beta.13",
-    "@nocobase/utils": "2.1.0-beta.13",
+    "@nocobase/logger": "2.1.0-beta.15",
+    "@nocobase/utils": "2.1.0-beta.15",
     "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": "691716e5f4e5f8bd3859d65bc8a29b4e3c32209b"
+  "gitHead": "dc1aceea6357e6ab149976c2a236fc4b6bee1370"
 }