@nocobase/database 2.3.0-alpha.1 → 2.3.0-beta.10

package/lib/database.js

@@ -354,7 +354,7 @@ const _Database = class _Database extends import_events.EventEmitter {
             if (index.fields) {
               index.fields = index.fields.map((field) => {
                 if (field.name) {
-                  return { name: (0, import_utils3.snakeCase)(field.name), ...field };
+                  return { ...field, name: (0, import_utils3.snakeCase)(field.name) };
                 }
                 return (0, import_utils3.snakeCase)(field);
               });
@@ -772,7 +772,10 @@ const _Database = class _Database extends import_events.EventEmitter {
       },
       async onDump(dumper, collection) {
         try {
-          const viewDef = await collection.db.queryInterface.viewDef(collection.getTableNameWithSchemaAsString());
+          const viewDef = await collection.db.queryInterface.viewDef({
+            viewName: collection.model.tableName,
+            schema: collection.db.inDialect("postgres") ? collection.collectionSchema() : void 0
+          });
           dumper.writeSQLContent(`view-${collection.name}`, {
             sql: [
               `DROP VIEW IF EXISTS ${collection.getTableNameWithSchemaAsString()}`,

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

@@ -50,6 +50,23 @@ const pushAttribute = /* @__PURE__ */ __name((node, attribute) => {
     node.attributes.push(attribute);
   }
 }, "pushAttribute");
+const getRootModelOrderFields = /* @__PURE__ */ __name((node) => {
+  if (!import_lodash.default.isArray(node.order)) {
+    return [];
+  }
+  const fields = [];
+  for (const orderItem of node.order) {
+    if (!import_lodash.default.isArray(orderItem) || orderItem.length !== 2 || !import_lodash.default.isString(orderItem[0])) {
+      continue;
+    }
+    const fieldName = orderItem[0];
+    const attribute = node.model.rawAttributes[fieldName] || Object.values(node.model.rawAttributes).find((item) => item.field === fieldName);
+    if (attribute) {
+      fields.push(attribute.field || fieldName);
+    }
+  }
+  return fields;
+}, "getRootModelOrderFields");
 const EagerLoadingNodeProto = {
   afterBuild(db) {
     const collection = db.modelCollection.get(this.model);
@@ -218,11 +235,15 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           if (!primaryKeyField) {
             throw new Error(`Model ${node.model.name} does not have primary key`);
           }
+          const group = [`${node.model.name}.${primaryKeyField}`];
+          if (this.db.inDialect("mssql") || this.db.isMySQLCompatibleDialect()) {
+            group.push(...getRootModelOrderFields(node).map((field) => `${node.model.name}.${field}`));
+          }
           const ids2 = (await node.model.findAll({
             ...this.rootQueryOptions,
             includeIgnoreAttributes: false,
             attributes: [primaryKeyField],
-            group: `${node.model.name}.${primaryKeyField}`,
+            group: import_lodash.default.uniq(group),
             transaction,
             include: (0, import_utils.processIncludes)(includeForFilter, node.model),
             raw: true

package/lib/fields/belongs-to-many-field.js

@@ -128,6 +128,8 @@ const _BelongsToManyField = class _BelongsToManyField extends import_relation_fi
     let Through;
     if (database.hasCollection(through)) {
       Through = database.getCollection(through);
+      Through.options.sourceCollectionName ??= this.collection.name;
+      Through.options.targetCollectionName ??= this.target;
     } else {
       const throughCollectionOptions = {
         name: through,

package/lib/fields/field.js

@@ -41,7 +41,8 @@ __export(field_exports, {
 });
 module.exports = __toCommonJS(field_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_utils = require("../utils");
+var import_utils = require("@nocobase/utils");
+var import_utils2 = require("../utils");
 const _Field = class _Field {
   options;
   context;
@@ -94,7 +95,7 @@ const _Field = class _Field {
       return this.options.field;
     }
     if (this.database.options.underscored) {
-      return (0, import_utils.snakeCase)(this.name);
+      return (0, import_utils2.snakeCase)(this.name);
     }
     return this.name;
   }
@@ -156,6 +157,23 @@ const _Field = class _Field {
       Object.assign(opts, { type: this.database.sequelize.normalizeDataType(this.dataType) });
     }
     Object.assign(opts, this.additionalSequelizeOptions());
+    if (this.options.interface === "richText") {
+      const { name } = this;
+      const originalSetter = opts.set;
+      const sanitizeValue = /* @__PURE__ */ __name((value) => typeof value === "string" ? (0, import_utils.sanitizeRichTextHtml)(value) : value, "sanitizeValue");
+      opts.set = function(value) {
+        if (typeof originalSetter === "function") {
+          originalSetter.call(this, sanitizeValue(value));
+          const currentValue = this.getDataValue(name);
+          const sanitizedValue = sanitizeValue(currentValue);
+          if (!Object.is(sanitizedValue, currentValue)) {
+            this.setDataValue(name, sanitizedValue);
+          }
+          return;
+        }
+        this.setDataValue(name, sanitizeValue(value));
+      };
+    }
     return opts;
   }
   additionalSequelizeOptions() {

package/lib/model.js

@@ -43,6 +43,7 @@ __export(model_exports, {
 });
 module.exports = __toCommonJS(model_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_utils = require("@nocobase/utils");
 var import_sequelize = require("sequelize");
 var import_sync_runner = require("./sync-runner");
 const _ = import_lodash.default;
@@ -65,6 +66,9 @@ const _Model = class _Model extends import_sequelize.Model {
       } else {
         result[key] = values[key];
       }
+      if ((field == null ? void 0 : field.options.interface) === "richText" && typeof result[key] === "string") {
+        result[key] = (0, import_utils.sanitizeRichTextHtml)(result[key]);
+      }
     }
     return result;
   }

package/lib/operators/string.js

@@ -32,7 +32,11 @@ __export(string_exports, {
 module.exports = __toCommonJS(string_exports);
 var import_sequelize = require("sequelize");
 var import_utils = require("./utils");
-function escapeLike(value) {
+function escapeLike(value, ctx) {
+  if (ctx.db.sequelize.getDialect() === "mssql") {
+    const escapedValue = value.replaceAll("[", "[[]");
+    return escapedValue.replace(/[%_]/g, (character) => `[${character}]`);
+  }
   return value.replace(/[_%]/g, "\\$&");
 }
 __name(escapeLike, "escapeLike");
@@ -85,13 +89,13 @@ var string_default = {
     }
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`%${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
+        (item) => getFieldExpression(`%${escapeLike(item, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
       );
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
-    return getFieldExpression(`%${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
+    return getFieldExpression(`%${escapeLike(value, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
   },
   $notIncludes(value, ctx) {
     if (value === null) {
@@ -101,56 +105,56 @@ var string_default = {
     }
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`%${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
+        (item) => getFieldExpression(`%${escapeLike(item, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
       );
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
-    return getFieldExpression(`%${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
+    return getFieldExpression(`%${escapeLike(value, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
   },
   $startsWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
+        (item) => getFieldExpression(`${escapeLike(item, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
       );
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
-    return getFieldExpression(`${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
+    return getFieldExpression(`${escapeLike(value, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
   },
   $notStartsWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
+        (item) => getFieldExpression(`${escapeLike(item, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
       );
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
-    return getFieldExpression(`${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
+    return getFieldExpression(`${escapeLike(value, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
   },
   $endWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`%${escapeLike(item)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
+        (item) => getFieldExpression(`%${escapeLike(item, ctx)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
       );
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
-    return getFieldExpression(`%${escapeLike(value)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
+    return getFieldExpression(`%${escapeLike(value, ctx)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
   },
   $notEndWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`%${escapeLike(item)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
+        (item) => getFieldExpression(`%${escapeLike(item, ctx)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
       );
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
-    return getFieldExpression(`%${escapeLike(value)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
+    return getFieldExpression(`%${escapeLike(value, ctx)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
   }
 };

package/lib/query-interface/mysql-query-interface.d.ts

@@ -24,7 +24,10 @@ export default class MysqlQueryInterface extends QueryInterface {
         };
     }>;
     parseSQL(sql: string): any;
-    viewDef(viewName: string): Promise<string>;
+    viewDef(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<string>;
     showTableDefinition(tableInfo: TableInfo): Promise<any>;
     getAutoIncrementInfo(options: {
         tableInfo: TableInfo;

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

@@ -67,7 +67,7 @@ const _MysqlQueryInterface = class _MysqlQueryInterface extends import_query_int
   }
   async viewColumnUsage(options) {
     try {
-      const { ast } = this.parseSQL(await this.viewDef(options.viewName));
+      const { ast } = this.parseSQL(await this.viewDef(options));
       const columns = ast.columns;
       const results = [];
       for (const column of columns) {
@@ -90,8 +90,13 @@ const _MysqlQueryInterface = class _MysqlQueryInterface extends import_query_int
   parseSQL(sql) {
     return import_sql_parser.default.parse(sql);
   }
-  async viewDef(viewName) {
-    const viewDefinition = await this.db.sequelize.query(`SHOW CREATE VIEW ${viewName}`, { type: "SELECT" });
+  async viewDef(options) {
+    const tableName = options.schema ? {
+      schema: options.schema,
+      tableName: options.viewName
+    } : options.viewName;
+    const quotedViewName = this.db.utils.quoteTable(tableName);
+    const viewDefinition = await this.db.sequelize.query(`SHOW CREATE VIEW ${quotedViewName}`, { type: "SELECT" });
     const createView = viewDefinition[0]["Create View"];
     const regex = /(?<=AS\s)([\s\S]*)/i;
     const match = createView.match(regex);

package/lib/query-interface/postgres-query-interface.d.ts

@@ -30,9 +30,15 @@ export default class PostgresQueryInterface extends QueryInterface {
     listViews(options?: {
         schema?: string;
     }): Promise<[unknown[], unknown]>;
-    viewDef(viewName: string): Promise<string>;
+    viewDef(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<string>;
     parseSQL(sql: string): any;
-    viewColumnUsage(options: any): Promise<{
+    viewColumnUsage(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<{
         [view_column_name: string]: {
             column_name: string;
             table_name: string;

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

@@ -113,26 +113,33 @@ const _PostgresQueryInterface = class _PostgresQueryInterface extends import_que
   async listViews(options) {
     var _a;
     const targetSchema = (options == null ? void 0 : options.schema) || ((_a = this.db.options) == null ? void 0 : _a.schema) || "public";
-    const sql = targetSchema ? `
-      SELECT viewname as name, definition, schemaname as schema
-      FROM pg_views
-      WHERE schemaname = '${targetSchema}'
-      ORDER BY viewname;
-    ` : `
+    const sql = `
       SELECT viewname as name, definition, schemaname as schema
       FROM pg_views
-      WHERE schemaname NOT IN ('pg_catalog', 'information_schema')
+      WHERE schemaname = :targetSchema
       ORDER BY viewname;
     `;
-    return await this.db.sequelize.query(sql, { type: "SELECT" });
+    return await this.db.sequelize.query(sql, {
+      replacements: {
+        targetSchema
+      },
+      type: "SELECT"
+    });
   }
-  async viewDef(viewName) {
-    const [schema, name] = viewName.split(".");
+  async viewDef(options) {
+    const { viewName } = options;
+    const schema = options.schema || this.db.options.schema || "public";
     const viewDefQuery = await this.db.sequelize.query(
       `
-    select pg_get_viewdef(format('%I.%I', '${schema}', '${name}')::regclass, true) as definition
+    select pg_get_viewdef(format('%I.%I', :schema, :viewName)::regclass, true) as definition
     `,
-      { type: "SELECT" }
+      {
+        replacements: {
+          schema,
+          viewName
+        },
+        type: "SELECT"
+      }
     );
     return import_lodash.default.trim(viewDefQuery[0]["definition"]);
   }
@@ -142,15 +149,22 @@ const _PostgresQueryInterface = class _PostgresQueryInterface extends import_que
     });
   }
   async viewColumnUsage(options) {
-    const { viewName, schema = "public" } = options;
+    const { viewName } = options;
+    const schema = options.schema || this.db.options.schema || "public";
     const sql = `
       SELECT *
       FROM information_schema.view_column_usage
-      WHERE view_schema = '${schema}'
-        AND view_name = '${viewName}';
+      WHERE view_schema = :schema
+        AND view_name = :viewName;
     `;
-    const columnUsages = await this.db.sequelize.query(sql, { type: "SELECT" });
-    const def = await this.viewDef(`${schema}.${viewName}`);
+    const columnUsages = await this.db.sequelize.query(sql, {
+      replacements: {
+        schema,
+        viewName
+      },
+      type: "SELECT"
+    });
+    const def = await this.viewDef({ schema, viewName });
     try {
       const { ast } = this.parseSQL(def);
       const columns = ast[0].columns;

package/lib/query-interface/query-interface.d.ts

@@ -21,7 +21,10 @@ export default abstract class QueryInterface {
     abstract listViews(options?: {
         schema?: string;
     }): any;
-    abstract viewDef(viewName: string): Promise<string>;
+    abstract viewDef(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<string>;
     abstract viewColumnUsage(options: {
         viewName: string;
         schema?: string;

package/lib/query-interface/sqlite-query-interface.d.ts

@@ -24,7 +24,10 @@ export default class SqliteQueryInterface extends QueryInterface {
         };
     }>;
     parseSQL(sql: string): any;
-    viewDef(viewName: string): Promise<string>;
+    viewDef(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<string>;
     showTableDefinition(tableInfo: TableInfo): Promise<any>;
     getAutoIncrementInfo(options: {
         tableInfo: TableInfo;

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

@@ -70,7 +70,7 @@ const _SqliteQueryInterface = class _SqliteQueryInterface extends import_query_i
   }
   async viewColumnUsage(options) {
     try {
-      const { ast } = this.parseSQL(await this.viewDef(options.viewName));
+      const { ast } = this.parseSQL(await this.viewDef(options));
       const columns = ast.columns;
       const results = [];
       for (const column of columns) {
@@ -93,12 +93,15 @@ const _SqliteQueryInterface = class _SqliteQueryInterface extends import_query_i
   parseSQL(sql) {
     return import_sql_parser.default.parse(sql);
   }
-  async viewDef(viewName) {
+  async viewDef(options) {
     const viewDefinition = await this.db.sequelize.query(
       `SELECT sql
        FROM sqlite_master
-       WHERE name = '${viewName}' AND type = 'view'`,
+       WHERE name = :viewName AND type = 'view'`,
       {
+        replacements: {
+          viewName: options.viewName
+        },
         type: "SELECT"
       }
     );

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.3.0-alpha.1",
+  "version": "2.3.0-beta.10",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.3.0-alpha.1",
-    "@nocobase/utils": "2.3.0-alpha.1",
+    "@nocobase/logger": "2.3.0-beta.10",
+    "@nocobase/utils": "2.3.0-beta.10",
     "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": "2377df8ceb12549149017f7f14a61207bf6e49a2"
+  "gitHead": "7aa3dce6cf3201752882f7012c72997898015d89"
 }