@nocobase/database 0.14.0-alpha.7 → 0.14.0-alpha.8

package/lib/collection.js

@@ -466,7 +466,12 @@ const _Collection = class _Collection extends import_events.EventEmitter {
       }
     });
     for (const model of models) {
-      await model.sync(syncOptions);
+      await model.sync(syncOptions || {
+        force: false,
+        alter: {
+          drop: false
+        }
+      });
     }
   }
   isInherited() {

package/lib/database.d.ts

@@ -35,6 +35,8 @@ export interface IDatabaseOptions extends Options {
     migrator?: any;
     usingBigIntForId?: boolean;
     underscored?: boolean;
+    customHooks?: any;
+    instanceId?: string;
 }
 export type DatabaseOptions = IDatabaseOptions;
 interface RegisterOperatorsContext {
@@ -86,7 +88,9 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     pendingFields: Map<string, FieldTypes.RelationField[]>;
     modelCollection: Map<ModelStatic<any>, Collection<any, any>>;
     tableNameCollectionMap: Map<string, Collection<any, any>>;
+    context: any;
     queryInterface: QueryInterface;
+    _instanceId: string;
     utils: DatabaseUtils;
     referenceMap: ReferencesMap;
     inheritanceMap: InheritanceMap;
@@ -101,6 +105,8 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     collectionGroupManager: CollectionGroupManager;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
     constructor(options: DatabaseOptions);
+    get instanceId(): string;
+    setContext(context: any): void;
     setLogger(logger: Logger): void;
     sequelizeOptions(options: any): any;
     initListener(): void;

package/lib/database.js

@@ -41,6 +41,7 @@ var import_events = require("events");
 var import_exponential_backoff = require("exponential-backoff");
 var import_glob = __toESM(require("glob"));
 var import_lodash = __toESM(require("lodash"));
+var import_nanoid = require("nanoid");
 var import_path = require("path");
 var import_semver = __toESM(require("semver"));
 var import_sequelize = require("sequelize");
@@ -59,10 +60,10 @@ var import_migration = require("./migration");
 var import_model_hook = require("./model-hook");
 var import_operators = __toESM(require("./operators"));
 var import_query_interface_builder = __toESM(require("./query-interface/query-interface-builder"));
+var import_sql_collection = require("./sql-collection/sql-collection");
 var import_utils2 = require("./utils");
 var import_value_parsers = require("./value-parsers");
 var import_view_collection = require("./view-collection");
-var import_sql_collection = require("./sql-collection/sql-collection");
 const DialectVersionAccessors = {
   sqlite: {
     sql: "select sqlite_version() as version",
@@ -122,7 +123,9 @@ const _Database = class _Database extends import_events.EventEmitter {
   pendingFields = /* @__PURE__ */ new Map();
   modelCollection = /* @__PURE__ */ new Map();
   tableNameCollectionMap = /* @__PURE__ */ new Map();
+  context = {};
   queryInterface;
+  _instanceId;
   utils = new import_database_utils.default(this);
   referenceMap = new import_ReferencesMap.default();
   inheritanceMap = new import_inherited_map.default();
@@ -144,6 +147,11 @@ const _Database = class _Database extends import_events.EventEmitter {
       },
       ...import_lodash.default.clone(options)
     };
+    if (!options.instanceId) {
+      this._instanceId = (0, import_nanoid.nanoid)();
+    } else {
+      this._instanceId = options.instanceId;
+    }
     if (options.storage && options.storage !== ":memory:") {
       if (!(0, import_path.isAbsolute)(options.storage)) {
         opts.storage = (0, import_path.resolve)(process.cwd(), options.storage);
@@ -158,7 +166,8 @@ const _Database = class _Database extends import_events.EventEmitter {
       require("pg").defaults.parseInt8 = true;
     }
     this.options = opts;
-    this.sequelize = new import_sequelize.Sequelize(this.sequelizeOptions(this.options));
+    const sequelizeOptions = this.sequelizeOptions(this.options);
+    this.sequelize = new import_sequelize.Sequelize(sequelizeOptions);
     this.queryInterface = (0, import_query_interface_builder.default)(this);
     this.collections = /* @__PURE__ */ new Map();
     this.modelHook = new import_model_hook.ModelHook(this);
@@ -216,16 +225,26 @@ const _Database = class _Database extends import_events.EventEmitter {
     this.initListener();
     (0, import_utils2.patchSequelizeQueryInterface)(this);
   }
+  get instanceId() {
+    return this._instanceId;
+  }
+  setContext(context) {
+    this.context = context;
+  }
   setLogger(logger) {
     this.logger = logger;
   }
   sequelizeOptions(options) {
     if (options.dialect === "postgres") {
-      options.hooks = {
-        afterConnect: async (connection) => {
-          await connection.query("SET search_path TO public;");
-        }
-      };
+      if (!options.hooks) {
+        options.hooks = {};
+      }
+      if (!options.hooks["afterConnect"]) {
+        options.hooks["afterConnect"] = [];
+      }
+      options.hooks["afterConnect"].push(async (connection) => {
+        await connection.query("SET search_path TO public;");
+      });
     }
     return options;
   }
@@ -444,7 +463,7 @@ const _Database = class _Database extends import_events.EventEmitter {
     }
   }
   buildFieldValueParser(field, ctx) {
-    const Parser = this.fieldValueParsers.has(field.type) ? this.fieldValueParsers.get(field.type) : this.fieldValueParsers.get("default");
+    const Parser = field && this.fieldValueParsers.has(field.type) ? this.fieldValueParsers.get(field.type) : this.fieldValueParsers.get("default");
     const parser = new Parser(field, ctx);
     return parser;
   }
@@ -577,10 +596,16 @@ const _Database = class _Database extends import_events.EventEmitter {
     return this.sequelize.connectionManager.pool._draining;
   }
   async close() {
+    var _a, _b;
     if (this.isSqliteMemory()) {
       return;
     }
-    return this.sequelize.close();
+    await this.emitAsync("beforeClose", this);
+    const closeResult = this.sequelize.close();
+    if ((_b = (_a = this.options) == null ? void 0 : _a.customHooks) == null ? void 0 : _b["afterClose"]) {
+      await this.options.customHooks["afterClose"](this);
+    }
+    return closeResult;
   }
   on(event, listener) {
     const type = this.modelHook.match(event);

package/lib/mock-database.js

@@ -1,6 +1,8 @@
+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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 mock_database_exports = {};
 __export(mock_database_exports, {
@@ -26,11 +36,13 @@ module.exports = __toCommonJS(mock_database_exports);
 var import_utils = require("@nocobase/utils");
 var import_path = require("path");
 var import_database = require("./database");
+var import_node_fetch = __toESM(require("node-fetch"));
+var import_path2 = __toESM(require("path"));
+var import_nanoid = require("nanoid");
 const _MockDatabase = class _MockDatabase extends import_database.Database {
   constructor(options) {
     super({
       storage: ":memory:",
-      tablePrefix: `mock_${(0, import_utils.uid)(6)}_`,
       dialect: "sqlite",
       ...options
     });
@@ -72,7 +84,39 @@ function customLogger(queryString, queryObject) {
 __name(customLogger, "customLogger");
 function mockDatabase(options = {}) {
   const dbOptions = (0, import_utils.merge)(getConfigByEnv(), options);
-  return new MockDatabase(dbOptions);
+  if (process.env["DB_TEST_PREFIX"]) {
+    let configKey = "database";
+    if (dbOptions.dialect === "sqlite") {
+      configKey = "storage";
+    } else {
+      configKey = "database";
+    }
+    const shouldChange = /* @__PURE__ */ __name(() => {
+      if (dbOptions.dialect === "sqlite") {
+        return !dbOptions[configKey].includes(process.env["DB_TEST_PREFIX"]);
+      }
+      return !dbOptions[configKey].startsWith(process.env["DB_TEST_PREFIX"]);
+    }, "shouldChange");
+    if (dbOptions[configKey] && shouldChange()) {
+      const nanoid = (0, import_nanoid.customAlphabet)("1234567890abcdefghijklmnopqrstuvwxyz", 10);
+      const instanceId = `d_${nanoid()}`;
+      const databaseName = `${process.env["DB_TEST_PREFIX"]}_${instanceId}`;
+      if (dbOptions.dialect === "sqlite") {
+        dbOptions.storage = import_path2.default.resolve(import_path2.default.dirname(dbOptions.storage), databaseName);
+      } else {
+        dbOptions.database = databaseName;
+      }
+    }
+    if (process.env["DB_TEST_DISTRIBUTOR_PORT"]) {
+      dbOptions.hooks = dbOptions.hooks || {};
+      dbOptions.hooks.beforeConnect = async (config) => {
+        const url = `http://127.0.0.1:${process.env["DB_TEST_DISTRIBUTOR_PORT"]}/acquire?via=${db.instanceId}&name=${config.database}`;
+        await (0, import_node_fetch.default)(url);
+      };
+    }
+  }
+  const db = new MockDatabase(dbOptions);
+  return db;
 }
 __name(mockDatabase, "mockDatabase");
 // Annotate the CommonJS export names for ESM import in node:

package/lib/model.js

@@ -141,6 +141,9 @@ const _Model = class _Model extends import_sequelize.Model {
     if (this.collection.isView()) {
       return;
     }
+    if (this.collection.options.sync === false) {
+      return;
+    }
     const model = this;
     const _schema = model._schema;
     if (_schema && _schema != "public") {

package/lib/repository.js

@@ -361,7 +361,7 @@ const _Repository = class _Repository {
     const { records } = options;
     const instances = [];
     for (const values of records) {
-      const instance = await this.create({ values, transaction: transaction2 });
+      const instance = await this.create({ ...options, values, transaction: transaction2 });
       instances.push(instance);
     }
     return instances;

package/lib/update-guard.js

@@ -105,6 +105,9 @@ const _UpdateGuard = class _UpdateGuard {
    * @param values
    */
   sanitize(values) {
+    if (values === null || values === void 0) {
+      return values;
+    }
     values = import_lodash.default.clone(values);
     if (!this.model) {
       throw new Error("please set model first");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.14.0-alpha.7",
+  "version": "0.14.0-alpha.8",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.14.0-alpha.7",
-    "@nocobase/utils": "0.14.0-alpha.7",
+    "@nocobase/logger": "0.14.0-alpha.8",
+    "@nocobase/utils": "0.14.0-alpha.8",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "dayjs": "^1.11.8",
@@ -18,18 +18,20 @@
     "glob": "^7.1.6",
     "graphlib": "^2.1.8",
     "mathjs": "^10.6.1",
+    "nanoid": "^3.3.6",
     "qs": "^6.11.2",
     "semver": "^7.3.7",
     "sequelize": "^6.26.0",
     "umzug": "^3.1.1"
   },
   "devDependencies": {
-    "@types/glob": "^7.2.0"
+    "@types/glob": "^7.2.0",
+    "node-fetch": "^2.6.7"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "dc958417d27ed0753439bcef192be91a03dfc30f"
+  "gitHead": "59c82fef6e34707802b5841f5ec4d9b3b6b68abb"
 }