@nocobase/database 1.0.0-alpha.13 → 1.0.0-alpha.15

package/lib/update-associations.js

@@ -401,7 +401,15 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
       newItems.push(instance);
     }
   }
-  model.setDataValue(key, setItems.concat(newItems));
+  for (const newItem of newItems) {
+    const existIndexInSetItems = setItems.findIndex((setItem) => setItem[targetKey] === newItem[targetKey]);
+    if (existIndexInSetItems !== -1) {
+      setItems[existIndexInSetItems] = newItem;
+    } else {
+      setItems.push(newItem);
+    }
+  }
+  model.setDataValue(key, setItems);
 }
 __name(updateMultipleAssociation, "updateMultipleAssociation");
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.15",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.0.0-alpha.13",
-    "@nocobase/utils": "1.0.0-alpha.13",
+    "@nocobase/logger": "1.0.0-alpha.15",
+    "@nocobase/utils": "1.0.0-alpha.15",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -22,6 +22,7 @@
     "mathjs": "^10.6.1",
     "nanoid": "^3.3.6",
     "node-fetch": "^2.6.7",
+    "node-sql-parser": "^4.18.0",
     "qs": "^6.11.2",
     "safe-json-stringify": "^1.2.0",
     "semver": "^7.3.7",
@@ -37,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "bd97adef70762a6691b5b58ca6572672a8cdf838"
+  "gitHead": "2793d371368e094ea2bba04cfbe9b9b73c44edba"
 }

package/lib/sql-collection/index.js

@@ -1,32 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var sql_collection_exports = {};
-module.exports = __toCommonJS(sql_collection_exports);
-__reExport(sql_collection_exports, require("./sql-model"), module.exports);
-__reExport(sql_collection_exports, require("./sql-collection"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ...require("./sql-model"),
-  ...require("./sql-collection")
-});

package/lib/sql-collection/query-generator.d.ts

@@ -1,18 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import { GroupOption, Order, ProjectionAlias, WhereOptions } from 'sequelize';
-import { SQLModel } from './sql-model';
-export declare function selectQuery(tableName: string, options: {
-    attributes?: (string | ProjectionAlias)[];
-    where?: WhereOptions;
-    order?: Order;
-    group?: GroupOption;
-    limit?: number;
-    offset?: number;
-}, model: SQLModel): string;

package/lib/sql-collection/query-generator.js

@@ -1,79 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var query_generator_exports = {};
-__export(query_generator_exports, {
-  selectQuery: () => selectQuery
-});
-module.exports = __toCommonJS(query_generator_exports);
-var import_utils = require("@nocobase/utils");
-function selectQuery(tableName, options, model) {
-  var _a;
-  options = options || {};
-  if (import_utils.lodash.isEmpty(options)) {
-    return `${model.sql};`;
-  }
-  const queryItems = [];
-  let attributes = options.attributes && options.attributes.slice();
-  if (attributes) {
-    const fields = Array.from(((_a = model.collection) == null ? void 0 : _a.fields.keys()) || []);
-    attributes = attributes.filter((attr) => attr === "*" || typeof attr !== "string" || fields.includes(attr));
-  }
-  attributes = this.escapeAttributes(attributes, { model });
-  attributes = attributes || ["*"];
-  if (Object.prototype.hasOwnProperty.call(options, "where")) {
-    options.where = this.getWhereConditions(options.where, tableName, model, options);
-    if (options.where) {
-      queryItems.push(` WHERE ${options.where}`);
-    }
-  }
-  if (options.group) {
-    options.group = Array.isArray(options.group) ? options.group.map((t) => this.aliasGrouping(t, model, tableName, options)).join(", ") : this.aliasGrouping(options.group, model, tableName, options);
-    if (options.group) {
-      queryItems.push(` GROUP BY ${options.group}`);
-    }
-  }
-  if (options.order) {
-    const orders = this.getQueryOrders(options, model, false);
-    if (orders.mainQueryOrder.length) {
-      queryItems.push(` ORDER BY ${orders.mainQueryOrder.join(", ")}`);
-    }
-  }
-  const limitOrder = this.addLimitAndOffset(options, model);
-  if (limitOrder) {
-    queryItems.push(limitOrder);
-  }
-  const query = `SELECT ${attributes.join(", ")} FROM (${model.sql}) ${this.getAliasToken()} ${this.quoteIdentifier(
-    model.name
-  )}${queryItems.join("")}`;
-  return `${query};`;
-}
-__name(selectQuery, "selectQuery");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  selectQuery
-});

package/lib/sql-collection/sql-collection.d.ts

@@ -1,16 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import { Collection, CollectionContext, CollectionOptions } from '../collection';
-export declare class SqlCollection extends Collection {
-    constructor(options: CollectionOptions, context: CollectionContext);
-    isSql(): boolean;
-    collectionSchema(): any;
-    get filterTargetKey(): string;
-    modelInit(): void;
-}

package/lib/sql-collection/sql-collection.js

@@ -1,90 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var sql_collection_exports = {};
-__export(sql_collection_exports, {
-  SqlCollection: () => SqlCollection
-});
-module.exports = __toCommonJS(sql_collection_exports);
-var import_collection = require("../collection");
-var import_sql_model = require("./sql-model");
-const _SqlCollection = class _SqlCollection extends import_collection.Collection {
-  constructor(options, context) {
-    options.autoGenId = false;
-    options.timestamps = false;
-    options.underscored = false;
-    super(options, context);
-  }
-  isSql() {
-    return true;
-  }
-  collectionSchema() {
-    return void 0;
-  }
-  /* istanbul ignore next -- @preserve */
-  get filterTargetKey() {
-    var _a;
-    const targetKey = ((_a = this.options) == null ? void 0 : _a.filterTargetKey) || "id";
-    if (targetKey && this.model.getAttributes()[targetKey]) {
-      return targetKey;
-    }
-    if (this.model.primaryKeyAttributes.length > 1) {
-      return null;
-    }
-    return this.model.primaryKeyAttribute;
-  }
-  modelInit() {
-    var _a;
-    const { autoGenId, sql } = this.options;
-    const model = (_a = class extends import_sql_model.SQLModel {
-    }, __name(_a, "model"), _a);
-    model.init(null, {
-      ...this.sequelizeModelOptions(),
-      schema: void 0
-    });
-    if (!autoGenId) {
-      model.removeAttribute("id");
-    }
-    model.sql = sql;
-    model.database = this.context.database;
-    model.collection = this;
-    this.model = new Proxy(model, {
-      get(target, prop) {
-        if (prop === "_schema") {
-          return void 0;
-        }
-        return Reflect.get(target, prop);
-      }
-    });
-  }
-};
-__name(_SqlCollection, "SqlCollection");
-let SqlCollection = _SqlCollection;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  SqlCollection
-});

package/lib/sql-collection/sql-model.d.ts

@@ -1,24 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import { Model } from '../model';
-export declare class SQLModel extends Model {
-    static sql: string;
-    static get queryInterface(): import("sequelize").QueryInterface;
-    static sync(): Promise<any>;
-    static inferFields(): {
-        [field: string]: {
-            type: string;
-            source: string;
-            collection: string;
-            interface: string;
-        };
-    };
-    private static parseTablesAndColumns;
-    private static getTableNameWithSchema;
-}

package/lib/sql-collection/sql-model.js

@@ -1,190 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-var sql_model_exports = {};
-__export(sql_model_exports, {
-  SQLModel: () => SQLModel
-});
-module.exports = __toCommonJS(sql_model_exports);
-var import_model = require("../model");
-var import_sql_parser = __toESM(require("../sql-parser"));
-var import_query_generator = require("./query-generator");
-const _SQLModel = class _SQLModel extends import_model.Model {
-  static get queryInterface() {
-    const queryInterface = this.sequelize.getQueryInterface();
-    const queryGenerator = queryInterface.queryGenerator;
-    const sqlGenerator = new Proxy(queryGenerator, {
-      get(target, prop) {
-        if (prop === "selectQuery") {
-          return import_query_generator.selectQuery.bind(target);
-        }
-        return Reflect.get(target, prop);
-      }
-    });
-    return new Proxy(queryInterface, {
-      get(target, prop) {
-        if (prop === "queryGenerator") {
-          return sqlGenerator;
-        }
-        return Reflect.get(target, prop);
-      }
-    });
-  }
-  static async sync() {
-  }
-  static inferFields() {
-    const tables = this.parseTablesAndColumns();
-    return tables.reduce((fields, { table, columns }) => {
-      const tableName = this.getTableNameWithSchema(table);
-      const collection = this.database.tableNameCollectionMap.get(tableName);
-      if (!collection) {
-        return fields;
-      }
-      const attributes = collection.model.getAttributes();
-      const sourceFields = {};
-      if (columns === "*") {
-        Object.values(attributes).forEach((attribute) => {
-          const field = collection.getField(attribute.fieldName);
-          if (!(field == null ? void 0 : field.options.interface)) {
-            return;
-          }
-          sourceFields[field.name] = {
-            collection: field.collection.name,
-            type: field.type,
-            source: `${field.collection.name}.${field.name}`,
-            interface: field.options.interface,
-            uiSchema: field.options.uiSchema
-          };
-        });
-      } else {
-        columns.forEach((column) => {
-          const modelField = Object.values(attributes).find((attribute) => attribute.field === column.name);
-          if (!modelField) {
-            return;
-          }
-          const field = collection.getField(modelField.fieldName);
-          if (!(field == null ? void 0 : field.options.interface)) {
-            return;
-          }
-          sourceFields[column.as || column.name] = {
-            collection: field.collection.name,
-            type: field.type,
-            source: `${field.collection.name}.${field.name}`,
-            interface: field.options.interface,
-            uiSchema: field.options.uiSchema
-          };
-        });
-      }
-      return { ...fields, ...sourceFields };
-    }, {});
-  }
-  static parseTablesAndColumns() {
-    let { ast } = import_sql_parser.default.parse(this.sql);
-    if (Array.isArray(ast)) {
-      ast = ast[0];
-    }
-    ast.from = ast.from || [];
-    ast.columns = ast.columns || [];
-    if (ast.with) {
-      ast.with.forEach((withItem) => {
-        const as = withItem.name;
-        const withAst = withItem.stmt.ast;
-        ast.from.push(...withAst.from.map((f) => ({ ...f, as })));
-        ast.columns.push(
-          ...withAst.columns.map((c) => ({
-            ...c,
-            expr: {
-              ...c.expr,
-              table: as
-            }
-          }))
-        );
-      });
-    }
-    if (ast.columns === "*") {
-      const tables = /* @__PURE__ */ new Set();
-      ast.from.forEach((fromItem) => {
-        tables.add(fromItem.table);
-      });
-      return Array.from(tables).map((table) => ({ table, columns: "*" }));
-    }
-    const tableAliases = {};
-    ast.from.forEach((fromItem) => {
-      if (!fromItem.as) {
-        return;
-      }
-      tableAliases[fromItem.as] = fromItem.table;
-    });
-    const columns = ast.columns.reduce(
-      (tableMp, column) => {
-        if (column.expr.type !== "column_ref") {
-          return tableMp;
-        }
-        const table = column.expr.table;
-        const name = tableAliases[table] || table;
-        const columnAttr = { name: column.expr.column, as: column.as };
-        if (!tableMp[name]) {
-          tableMp[name] = [columnAttr];
-        } else {
-          tableMp[name].push(columnAttr);
-        }
-        return tableMp;
-      },
-      {}
-    );
-    return Object.entries(columns).filter(([_, columns2]) => columns2).map(([table, columns2]) => ({ table, columns: columns2 }));
-  }
-  static getTableNameWithSchema(table) {
-    if (this.database.inDialect("postgres") && !table.includes(".")) {
-      const schema = process.env.DB_SCHEMA || "public";
-      return `${schema}.${table}`;
-    }
-    return table;
-  }
-};
-__name(_SQLModel, "SQLModel");
-__publicField(_SQLModel, "sql");
-let SQLModel = _SQLModel;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  SQLModel
-});