@nocobase/database 1.4.0-alpha.20241023053303 → 1.4.0-alpha.20241024133132

package/lib/database.d.ts

@@ -31,6 +31,7 @@ import { RelationRepository } from './relation-repository/relation-repository';
 import { Repository, TargetKey } from './repository';
 import { AfterDefineCollectionListener, BeforeDefineCollectionListener, CreateListener, CreateWithAssociationsListener, DatabaseAfterDefineCollectionEventType, DatabaseAfterRemoveCollectionEventType, DatabaseBeforeDefineCollectionEventType, DatabaseBeforeRemoveCollectionEventType, DestroyListener, EventType, ModelCreateEventTypes, ModelCreateWithAssociationsEventTypes, ModelDestroyEventTypes, ModelSaveEventTypes, ModelSaveWithAssociationsEventTypes, ModelUpdateEventTypes, ModelUpdateWithAssociationsEventTypes, ModelValidateEventTypes, RemoveCollectionListener, SaveListener, SaveWithAssociationsListener, SyncListener, UpdateListener, UpdateWithAssociationsListener, ValidateListener } from './types';
 import { BaseValueParser } from './value-parsers';
+import { BaseDialect } from './dialects/base-dialect';
 export type MergeOptions = merge.Options;
 export interface PendingOptions {
     field: RelationField;
@@ -65,25 +66,8 @@ export type AddMigrationsOptions = {
     directory: string;
 };
 type OperatorFunc = (value: any, ctx?: RegisterOperatorsContext) => any;
-export declare const DialectVersionAccessors: {
-    sqlite: {
-        sql: string;
-        get: (v: string) => string;
-    };
-    mysql: {
-        sql: string;
-        get: (v: string) => string;
-    };
-    mariadb: {
-        sql: string;
-        get: (v: string) => string;
-    };
-    postgres: {
-        sql: string;
-        get: (v: string) => string;
-    };
-};
 export declare class Database extends EventEmitter implements AsyncEmitter {
+    static dialects: Map<string, typeof BaseDialect>;
     sequelize: Sequelize;
     migrator: Umzug;
     migrations: Migrations;
@@ -111,7 +95,10 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     logger: Logger;
     interfaceManager: InterfaceManager;
     collectionFactory: CollectionFactory;
+    dialect: BaseDialect;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
+    static registerDialect(dialect: typeof BaseDialect): void;
+    static getDialect(name: string): typeof BaseDialect;
     constructor(options: DatabaseOptions);
     _instanceId: string;
     get instanceId(): string;
@@ -128,7 +115,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     /**
      * @internal
      */
-    sequelizeOptions(options: any): any;
+    sequelizeOptions(options: any): IDatabaseOptions;
     /**
      * @internal
      */
@@ -137,6 +124,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     addMigrations(options: AddMigrationsOptions): void;
     inDialect(...dialect: string[]): boolean;
     isMySQLCompatibleDialect(): boolean;
+    isPostgresCompatibleDialect(): boolean;
     /**
      * Add collection to database
      * @param options
@@ -187,7 +175,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     /**
      * @internal
      */
-    checkVersion(): Promise<boolean>;
+    checkVersion(): Promise<true | void>;
     /**
      * @internal
      */

package/lib/database.js

@@ -13,6 +13,7 @@ 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)
@@ -35,10 +36,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var database_exports = {};
 __export(database_exports, {
   Database: () => Database,
-  DialectVersionAccessors: () => DialectVersionAccessors,
   default: () => database_default,
   defineCollection: () => defineCollection,
   extend: () => extend,
@@ -55,7 +56,6 @@ var import_lodash = __toESM(require("lodash"));
 var import_nanoid = require("nanoid");
 var import_path = require("path");
 var import_safe_json_stringify = __toESM(require("safe-json-stringify"));
-var import_semver = __toESM(require("semver"));
 var import_sequelize = require("sequelize");
 var import_umzug = require("umzug");
 var import_collection_factory = require("./collection-factory");
@@ -77,33 +77,6 @@ var import_query_interface_builder = __toESM(require("./query-interface/query-in
 var import_utils3 = require("./utils");
 var import_value_parsers = require("./value-parsers");
 var import_view_collection = require("./view-collection");
-const DialectVersionAccessors = {
-  sqlite: {
-    sql: "select sqlite_version() as version",
-    get: /* @__PURE__ */ __name((v) => v, "get")
-  },
-  mysql: {
-    sql: "select version() as version",
-    get: /* @__PURE__ */ __name((v) => {
-      const m = /([\d+.]+)/.exec(v);
-      return m[0];
-    }, "get")
-  },
-  mariadb: {
-    sql: "select version() as version",
-    get: /* @__PURE__ */ __name((v) => {
-      const m = /([\d+.]+)/.exec(v);
-      return m[0];
-    }, "get")
-  },
-  postgres: {
-    sql: "select version() as version",
-    get: /* @__PURE__ */ __name((v) => {
-      const m = /([\d+.]+)/.exec(v);
-      return import_semver.default.minVersion(m[0]).version;
-    }, "get")
-  }
-};
 const _Database = class _Database extends import_events.EventEmitter {
   sequelize;
   migrator;
@@ -129,8 +102,20 @@ const _Database = class _Database extends import_events.EventEmitter {
   logger;
   interfaceManager = new import_interface_manager.InterfaceManager(this);
   collectionFactory = new import_collection_factory.CollectionFactory(this);
+  dialect;
+  static registerDialect(dialect) {
+    this.dialects.set(dialect.dialectName, dialect);
+  }
+  static getDialect(name) {
+    return this.dialects.get(name);
+  }
   constructor(options) {
     super();
+    const dialectClass = _Database.getDialect(options.dialect);
+    if (!dialectClass) {
+      throw new Error(`unsupported dialect ${options.dialect}`);
+    }
+    this.dialect = new dialectClass();
     const opts = {
       sync: {
         alter: {
@@ -285,18 +270,7 @@ const _Database = class _Database extends import_events.EventEmitter {
    * @internal
    */
   sequelizeOptions(options) {
-    if (options.dialect === "postgres") {
-      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;
+    return this.dialect.getSequelizeOptions(options);
   }
   /**
    * @internal
@@ -414,6 +388,9 @@ const _Database = class _Database extends import_events.EventEmitter {
   isMySQLCompatibleDialect() {
     return this.inDialect("mysql", "mariadb");
   }
+  isPostgresCompatibleDialect() {
+    return this.inDialect("postgres");
+  }
   /**
    * Add collection to database
    * @param options
@@ -769,6 +746,7 @@ const _Database = class _Database extends import_events.EventEmitter {
   }
 };
 __name(_Database, "Database");
+__publicField(_Database, "dialects", /* @__PURE__ */ new Map());
 let Database = _Database;
 function extendCollection(collectionOptions, mergeOptions) {
   return {
@@ -783,11 +761,11 @@ const defineCollection = /* @__PURE__ */ __name((collectionOptions) => {
   return collectionOptions;
 }, "defineCollection");
 (0, import_utils.applyMixins)(Database, [import_utils.AsyncEmitter]);
+(0, import_helpers.registerDialects)();
 var database_default = Database;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Database,
-  DialectVersionAccessors,
   defineCollection,
   extend,
   extendCollection

package/lib/dialects/base-dialect.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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 { Database, DatabaseOptions } from '../database';
+export interface DialectVersionGuard {
+    sql: string;
+    get: (v: string) => string;
+    version: string;
+}
+export declare abstract class BaseDialect {
+    static dialectName: string;
+    getSequelizeOptions(options: DatabaseOptions): import("../database").IDatabaseOptions;
+    checkDatabaseVersion(db: Database): Promise<boolean>;
+    getVersionGuard(): DialectVersionGuard;
+}

package/lib/dialects/base-dialect.js

@@ -0,0 +1,75 @@
+/**
+ * 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);
+var base_dialect_exports = {};
+__export(base_dialect_exports, {
+  BaseDialect: () => BaseDialect
+});
+module.exports = __toCommonJS(base_dialect_exports);
+var import_semver = __toESM(require("semver"));
+const _BaseDialect = class _BaseDialect {
+  getSequelizeOptions(options) {
+    return options;
+  }
+  async checkDatabaseVersion(db) {
+    var _a;
+    const versionGuard = this.getVersionGuard();
+    const result = await db.sequelize.query(versionGuard.sql, {
+      type: "SELECT"
+    });
+    const version = versionGuard.get((_a = result == null ? void 0 : result[0]) == null ? void 0 : _a.version);
+    const versionResult = import_semver.default.satisfies(version, versionGuard.version);
+    if (!versionResult) {
+      throw new Error(
+        `to use ${this.constructor.dialectName}, please ensure the version is ${versionGuard.version}, current version is ${version}`
+      );
+    }
+    return true;
+  }
+  getVersionGuard() {
+    throw new Error("not implemented");
+  }
+};
+__name(_BaseDialect, "BaseDialect");
+__publicField(_BaseDialect, "dialectName");
+let BaseDialect = _BaseDialect;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BaseDialect
+});

package/lib/dialects/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 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.
+ */
+export * from './base-dialect';

package/lib/dialects/index.js

@@ -0,0 +1,30 @@
+/**
+ * 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 dialects_exports = {};
+module.exports = __toCommonJS(dialects_exports);
+__reExport(dialects_exports, require("./base-dialect"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./base-dialect")
+});

package/lib/dialects/mariadb-dialect.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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 { BaseDialect } from './base-dialect';
+export declare class MariadbDialect extends BaseDialect {
+    static dialectName: string;
+    getVersionGuard(): {
+        sql: string;
+        get: (v: string) => string;
+        version: string;
+    };
+}

package/lib/dialects/mariadb-dialect.js

@@ -0,0 +1,54 @@
+/**
+ * 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 __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var mariadb_dialect_exports = {};
+__export(mariadb_dialect_exports, {
+  MariadbDialect: () => MariadbDialect
+});
+module.exports = __toCommonJS(mariadb_dialect_exports);
+var import_base_dialect = require("./base-dialect");
+const _MariadbDialect = class _MariadbDialect extends import_base_dialect.BaseDialect {
+  getVersionGuard() {
+    return {
+      sql: "select version() as version",
+      get: /* @__PURE__ */ __name((v) => {
+        const m = /([\d+.]+)/.exec(v);
+        return m[0];
+      }, "get"),
+      version: ">=10.9"
+    };
+  }
+};
+__name(_MariadbDialect, "MariadbDialect");
+__publicField(_MariadbDialect, "dialectName", "mariadb");
+let MariadbDialect = _MariadbDialect;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MariadbDialect
+});

package/lib/dialects/mysql-dialect.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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 { BaseDialect } from './base-dialect';
+export declare class MysqlDialect extends BaseDialect {
+    static dialectName: string;
+    getVersionGuard(): {
+        sql: string;
+        get: (v: string) => string;
+        version: string;
+    };
+}

package/lib/dialects/mysql-dialect.js

@@ -0,0 +1,54 @@
+/**
+ * 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 __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var mysql_dialect_exports = {};
+__export(mysql_dialect_exports, {
+  MysqlDialect: () => MysqlDialect
+});
+module.exports = __toCommonJS(mysql_dialect_exports);
+var import_base_dialect = require("./base-dialect");
+const _MysqlDialect = class _MysqlDialect extends import_base_dialect.BaseDialect {
+  getVersionGuard() {
+    return {
+      sql: "select version() as version",
+      get: /* @__PURE__ */ __name((v) => {
+        const m = /([\d+.]+)/.exec(v);
+        return m[0];
+      }, "get"),
+      version: ">=8.0.17"
+    };
+  }
+};
+__name(_MysqlDialect, "MysqlDialect");
+__publicField(_MysqlDialect, "dialectName", "mysql");
+let MysqlDialect = _MysqlDialect;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MysqlDialect
+});

package/lib/dialects/postgres-dialect.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 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 { BaseDialect } from './base-dialect';
+export declare class PostgresDialect extends BaseDialect {
+    static dialectName: string;
+    getSequelizeOptions(options: any): any;
+    getVersionGuard(): {
+        sql: string;
+        get: (v: string) => string;
+        version: string;
+    };
+}

package/lib/dialects/postgres-dialect.js

@@ -0,0 +1,77 @@
+/**
+ * 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);
+var postgres_dialect_exports = {};
+__export(postgres_dialect_exports, {
+  PostgresDialect: () => PostgresDialect
+});
+module.exports = __toCommonJS(postgres_dialect_exports);
+var import_semver = __toESM(require("semver"));
+var import_base_dialect = require("./base-dialect");
+const _PostgresDialect = class _PostgresDialect extends import_base_dialect.BaseDialect {
+  getSequelizeOptions(options) {
+    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;
+  }
+  getVersionGuard() {
+    return {
+      sql: "select version() as version",
+      get: /* @__PURE__ */ __name((v) => {
+        const m = /([\d+.]+)/.exec(v);
+        return import_semver.default.minVersion(m[0]).version;
+      }, "get"),
+      version: ">=10"
+    };
+  }
+};
+__name(_PostgresDialect, "PostgresDialect");
+__publicField(_PostgresDialect, "dialectName", "postgres");
+let PostgresDialect = _PostgresDialect;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PostgresDialect
+});

package/lib/dialects/sqlite-dialect.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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 { BaseDialect } from './base-dialect';
+export declare class SqliteDialect extends BaseDialect {
+    static dialectName: string;
+    getVersionGuard(): {
+        sql: string;
+        get: (v: string) => string;
+        version: string;
+    };
+}

package/lib/dialects/sqlite-dialect.js

@@ -0,0 +1,51 @@
+/**
+ * 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 __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var sqlite_dialect_exports = {};
+__export(sqlite_dialect_exports, {
+  SqliteDialect: () => SqliteDialect
+});
+module.exports = __toCommonJS(sqlite_dialect_exports);
+var import_base_dialect = require("./base-dialect");
+const _SqliteDialect = class _SqliteDialect extends import_base_dialect.BaseDialect {
+  getVersionGuard() {
+    return {
+      sql: "select sqlite_version() as version",
+      get: /* @__PURE__ */ __name((v) => v, "get"),
+      version: "3.x"
+    };
+  }
+};
+__name(_SqliteDialect, "SqliteDialect");
+__publicField(_SqliteDialect, "dialectName", "sqlite");
+let SqliteDialect = _SqliteDialect;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SqliteDialect
+});

package/lib/helpers.d.ts

@@ -8,4 +8,5 @@
  */
 import { Database, IDatabaseOptions } from './database';
 export declare function parseDatabaseOptionsFromEnv(): Promise<IDatabaseOptions>;
-export declare function checkDatabaseVersion(db: Database): Promise<boolean>;
+export declare function checkDatabaseVersion(db: Database): Promise<void>;
+export declare function registerDialects(): void;

package/lib/helpers.js

@@ -38,11 +38,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helpers_exports = {};
 __export(helpers_exports, {
   checkDatabaseVersion: () => checkDatabaseVersion,
-  parseDatabaseOptionsFromEnv: () => parseDatabaseOptionsFromEnv
+  parseDatabaseOptionsFromEnv: () => parseDatabaseOptionsFromEnv,
+  registerDialects: () => registerDialects
 });
 module.exports = __toCommonJS(helpers_exports);
+var import_database = require("./database");
 var import_fs = __toESM(require("fs"));
-var import_semver = __toESM(require("semver"));
+var import_mysql_dialect = require("./dialects/mysql-dialect");
+var import_sqlite_dialect = require("./dialects/sqlite-dialect");
+var import_mariadb_dialect = require("./dialects/mariadb-dialect");
+var import_postgres_dialect = require("./dialects/postgres-dialect");
 /* istanbul ignore file -- @preserve */
 function getEnvValue(key, defaultValue) {
   return process.env[key] || defaultValue;
@@ -121,57 +126,19 @@ function customLogger(queryString, queryObject) {
   }
 }
 __name(customLogger, "customLogger");
-const dialectVersionAccessors = {
-  sqlite: {
-    sql: "select sqlite_version() as version",
-    get: /* @__PURE__ */ __name((v) => v, "get"),
-    version: "3.x"
-  },
-  mysql: {
-    sql: "select version() as version",
-    get: /* @__PURE__ */ __name((v) => {
-      const m = /([\d+.]+)/.exec(v);
-      return m[0];
-    }, "get"),
-    version: ">=8.0.17"
-  },
-  mariadb: {
-    sql: "select version() as version",
-    get: /* @__PURE__ */ __name((v) => {
-      const m = /([\d+.]+)/.exec(v);
-      return m[0];
-    }, "get"),
-    version: ">=10.9"
-  },
-  postgres: {
-    sql: "select version() as version",
-    get: /* @__PURE__ */ __name((v) => {
-      const m = /([\d+.]+)/.exec(v);
-      return import_semver.default.minVersion(m[0]).version;
-    }, "get"),
-    version: ">=10"
-  }
-};
 async function checkDatabaseVersion(db) {
-  var _a;
-  const dialect = db.sequelize.getDialect();
-  const accessor = dialectVersionAccessors[dialect];
-  if (!accessor) {
-    throw new Error(`unsupported dialect ${dialect}`);
-  }
-  const result = await db.sequelize.query(accessor.sql, {
-    type: "SELECT"
-  });
-  const version = accessor.get((_a = result == null ? void 0 : result[0]) == null ? void 0 : _a.version);
-  const versionResult = import_semver.default.satisfies(version, accessor.version);
-  if (!versionResult) {
-    throw new Error(`to use ${dialect}, please ensure the version is ${accessor.version}`);
-  }
-  return true;
+  await db.dialect.checkDatabaseVersion(db);
 }
 __name(checkDatabaseVersion, "checkDatabaseVersion");
+function registerDialects() {
+  [import_sqlite_dialect.SqliteDialect, import_mysql_dialect.MysqlDialect, import_mariadb_dialect.MariadbDialect, import_postgres_dialect.PostgresDialect].forEach((dialect) => {
+    import_database.Database.registerDialect(dialect);
+  });
+}
+__name(registerDialects, "registerDialects");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkDatabaseVersion,
-  parseDatabaseOptionsFromEnv
+  parseDatabaseOptionsFromEnv,
+  registerDialects
 });

package/lib/index.d.ts

@@ -37,3 +37,4 @@ export * from './helpers';
 export { default as sqlParser, SQLParserTypes } from './sql-parser';
 export * from './interfaces';
 export { default as fieldTypeMap } from './view/field-type-map';
+export * from './dialects';

package/lib/index.js

@@ -92,6 +92,7 @@ __reExport(src_exports, require("./helpers"), module.exports);
 var import_sql_parser = __toESM(require("./sql-parser"));
 __reExport(src_exports, require("./interfaces"), module.exports);
 var import_field_type_map = __toESM(require("./view/field-type-map"));
+__reExport(src_exports, require("./dialects"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseError,
@@ -139,5 +140,6 @@ var import_field_type_map = __toESM(require("./view/field-type-map"));
   ...require("./view-collection"),
   ...require("./view/view-inference"),
   ...require("./helpers"),
-  ...require("./interfaces")
+  ...require("./interfaces"),
+  ...require("./dialects")
 });

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

@@ -50,6 +50,9 @@ function buildQueryInterface(db) {
     postgres: import_postgres_query_interface.default,
     sqlite: import_sqlite_query_interface.default
   };
+  if (db.isPostgresCompatibleDialect()) {
+    return new import_postgres_query_interface.default(db);
+  }
   const dialect = db.options.dialect;
   if (!map[dialect]) {
     return null;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.4.0-alpha.20241023053303",
+  "version": "1.4.0-alpha.20241024133132",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.4.0-alpha.20241023053303",
-    "@nocobase/utils": "1.4.0-alpha.20241023053303",
+    "@nocobase/logger": "1.4.0-alpha.20241024133132",
+    "@nocobase/utils": "1.4.0-alpha.20241024133132",
     "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": "7c6272531f271094ddac219755ac898dd33ff5ab"
+  "gitHead": "d127161994b06678d2d41f406fe73221242a1a05"
 }