kysely 0.17.3 → 0.19.0

package/dist/esm/index.d.ts

@@ -1,11 +1,162 @@
-export * from './index-nodeless.js';
-export * from './migration/file-migration-provider.js';
+export * from './kysely.js';
+export * from './query-creator.js';
+export * from './query-builder/where-interface.js';
+export * from './query-builder/join-interface.js';
+export * from './query-builder/returning-interface.js';
+export * from './query-builder/having-interface.js';
+export * from './query-builder/select-query-builder.js';
+export * from './query-builder/insert-query-builder.js';
+export * from './query-builder/update-query-builder.js';
+export * from './query-builder/delete-query-builder.js';
+export * from './query-builder/no-result-error.js';
+export * from './query-builder/join-builder.js';
+export * from './query-builder/expression-builder.js';
+export * from './query-builder/function-builder.js';
+export * from './query-builder/insert-result.js';
+export * from './query-builder/delete-result.js';
+export * from './query-builder/update-result.js';
+export * from './query-builder/on-conflict-builder.js';
+export * from './raw-builder/raw-builder.js';
+export * from './raw-builder/sql.js';
+export * from './query-executor/query-executor.js';
+export * from './query-executor/default-query-executor.js';
+export * from './query-executor/noop-query-executor.js';
+export * from './query-executor/query-executor-provider.js';
+export * from './query-compiler/default-query-compiler.js';
+export * from './query-compiler/compiled-query.js';
+export * from './schema/schema.js';
+export * from './schema/create-table-builder.js';
+export * from './schema/drop-table-builder.js';
+export * from './schema/create-index-builder.js';
+export * from './schema/drop-index-builder.js';
+export * from './schema/create-schema-builder.js';
+export * from './schema/drop-schema-builder.js';
+export * from './schema/column-definition-builder.js';
+export * from './schema/foreign-key-constraint-builder.js';
+export * from './schema/alter-table-builder.js';
+export * from './schema/create-view-builder.js';
+export * from './schema/drop-view-builder.js';
+export * from './dynamic/dynamic.js';
+export * from './driver/driver.js';
+export * from './driver/database-connection.js';
+export * from './driver/connection-provider.js';
+export * from './driver/default-connection-provider.js';
+export * from './driver/single-connection-provider.js';
+export * from './driver/dummy-driver.js';
+export * from './dialect/dialect.js';
+export * from './dialect/dialect-adapter.js';
+export * from './dialect/dialect-adapter-base.js';
+export * from './dialect/database-introspector.js';
 export * from './dialect/sqlite/sqlite-dialect.js';
 export * from './dialect/sqlite/sqlite-dialect-config.js';
 export * from './dialect/sqlite/sqlite-driver.js';
+export * from './dialect/postgres/postgres-query-compiler.js';
+export * from './dialect/postgres/postgres-introspector.js';
+export * from './dialect/postgres/postgres-adapter.js';
 export * from './dialect/mysql/mysql-dialect.js';
 export * from './dialect/mysql/mysql-dialect-config.js';
 export * from './dialect/mysql/mysql-driver.js';
+export * from './dialect/mysql/mysql-query-compiler.js';
+export * from './dialect/mysql/mysql-introspector.js';
+export * from './dialect/mysql/mysql-adapter.js';
 export * from './dialect/postgres/postgres-driver.js';
 export * from './dialect/postgres/postgres-dialect-config.js';
 export * from './dialect/postgres/postgres-dialect.js';
+export * from './dialect/sqlite/sqlite-query-compiler.js';
+export * from './dialect/sqlite/sqlite-introspector.js';
+export * from './dialect/sqlite/sqlite-adapter.js';
+export * from './query-compiler/default-query-compiler.js';
+export * from './query-compiler/query-compiler.js';
+export * from './migration/migrator.js';
+export * from './migration/file-migration-provider.js';
+export * from './plugin/kysely-plugin.js';
+export * from './plugin/camel-case/camel-case-plugin.js';
+export * from './plugin/deduplicate-joins/deduplicate-joins-plugin.js';
+export * from './operation-node/add-column-node.js';
+export * from './operation-node/add-constraint-node.js';
+export * from './operation-node/alias-node.js';
+export * from './operation-node/alter-column-node.js';
+export * from './operation-node/alter-table-node.js';
+export * from './operation-node/and-node.js';
+export * from './operation-node/check-constraint-node.js';
+export * from './operation-node/column-definition-node.js';
+export * from './operation-node/column-node.js';
+export * from './operation-node/column-update-node.js';
+export * from './operation-node/common-table-expression-node.js';
+export * from './operation-node/common-table-expression-name-node.js';
+export * from './operation-node/constraint-node.js';
+export * from './operation-node/create-index-node.js';
+export * from './operation-node/create-schema-node.js';
+export * from './operation-node/create-table-node.js';
+export * from './operation-node/create-view-node.js';
+export * from './operation-node/data-type-node.js';
+export * from './operation-node/default-value-node.js';
+export * from './operation-node/delete-query-node.js';
+export * from './operation-node/drop-column-node.js';
+export * from './operation-node/drop-constraint-node.js';
+export * from './operation-node/drop-index-node.js';
+export * from './operation-node/drop-schema-node.js';
+export * from './operation-node/drop-table-node.js';
+export * from './operation-node/drop-view-node.js';
+export * from './operation-node/filter-node.js';
+export * from './operation-node/foreign-key-constraint-node.js';
+export * from './operation-node/from-node.js';
+export * from './operation-node/generated-node.js';
+export * from './operation-node/group-by-item-node.js';
+export * from './operation-node/group-by-node.js';
+export * from './operation-node/having-node.js';
+export * from './operation-node/identifier-node.js';
+export * from './operation-node/insert-query-node.js';
+export * from './operation-node/join-node.js';
+export * from './operation-node/limit-node.js';
+export * from './operation-node/list-node.js';
+export * from './operation-node/modify-column-node.js';
+export * from './operation-node/offset-node.js';
+export * from './operation-node/on-conflict-node.js';
+export * from './operation-node/on-duplicate-key-node.js';
+export * from './operation-node/on-node.js';
+export * from './operation-node/operation-node-source.js';
+export * from './operation-node/operation-node-transformer.js';
+export * from './operation-node/operation-node-utils.js';
+export * from './operation-node/operation-node-visitor.js';
+export * from './operation-node/operation-node.js';
+export * from './operation-node/operator-node.js';
+export * from './operation-node/or-node.js';
+export * from './operation-node/order-by-item-node.js';
+export * from './operation-node/order-by-node.js';
+export * from './operation-node/parens-node.js';
+export * from './operation-node/primary-constraint-node.js';
+export * from './operation-node/primitive-value-list-node.js';
+export * from './operation-node/query-node.js';
+export * from './operation-node/raw-node.js';
+export * from './operation-node/reference-node.js';
+export * from './operation-node/references-node.js';
+export * from './operation-node/rename-column-node.js';
+export * from './operation-node/returning-node.js';
+export * from './operation-node/select-all-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/selection-node.js';
+export * from './operation-node/table-node.js';
+export * from './operation-node/union-node.js';
+export * from './operation-node/unique-constraint-node.js';
+export * from './operation-node/update-query-node.js';
+export * from './operation-node/value-list-node.js';
+export * from './operation-node/value-node.js';
+export * from './operation-node/values-node.js';
+export * from './operation-node/where-node.js';
+export * from './operation-node/with-node.js';
+export * from './util/column-type.js';
+export * from './util/compilable.js';
+export * from './util/log.js';
+export { AnyColumn, UnknownRow, AnySelectQueryBuilder, } from './util/type-utils.js';
+export { SelectExpression, SelectExpressionOrList, Selection, } from './parser/select-parser.js';
+export { ReferenceExpression, ReferenceExpressionOrList, } from './parser/reference-parser.js';
+export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.js';
+export { FilterValueExpression, FilterValueExpressionOrList, ExistsExpression, FilterOperator, } from './parser/filter-parser.js';
+export { TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
+export { JoinReferenceExpression, JoinCallbackExpression, } from './parser/join-parser.js';
+export { InsertObject } from './parser/insert-values-parser.js';
+export { MutationObject } from './parser/update-set-parser.js';
+export { OrderByExpression, OrderByDirectionExpression, } from './parser/order-by-parser.js';
+export { UnionExpression } from './parser/union-parser.js';

package/dist/esm/index.js

@@ -1,12 +1,152 @@
 /// <reference types="./index.d.ts" />
-export * from './index-nodeless.js';
-export * from './migration/file-migration-provider.js';
+export * from './kysely.js';
+export * from './query-creator.js';
+export * from './query-builder/where-interface.js';
+export * from './query-builder/join-interface.js';
+export * from './query-builder/returning-interface.js';
+export * from './query-builder/having-interface.js';
+export * from './query-builder/select-query-builder.js';
+export * from './query-builder/insert-query-builder.js';
+export * from './query-builder/update-query-builder.js';
+export * from './query-builder/delete-query-builder.js';
+export * from './query-builder/no-result-error.js';
+export * from './query-builder/join-builder.js';
+export * from './query-builder/expression-builder.js';
+export * from './query-builder/function-builder.js';
+export * from './query-builder/insert-result.js';
+export * from './query-builder/delete-result.js';
+export * from './query-builder/update-result.js';
+export * from './query-builder/on-conflict-builder.js';
+export * from './raw-builder/raw-builder.js';
+export * from './raw-builder/sql.js';
+export * from './query-executor/query-executor.js';
+export * from './query-executor/default-query-executor.js';
+export * from './query-executor/noop-query-executor.js';
+export * from './query-executor/query-executor-provider.js';
+export * from './query-compiler/default-query-compiler.js';
+export * from './query-compiler/compiled-query.js';
+export * from './schema/schema.js';
+export * from './schema/create-table-builder.js';
+export * from './schema/drop-table-builder.js';
+export * from './schema/create-index-builder.js';
+export * from './schema/drop-index-builder.js';
+export * from './schema/create-schema-builder.js';
+export * from './schema/drop-schema-builder.js';
+export * from './schema/column-definition-builder.js';
+export * from './schema/foreign-key-constraint-builder.js';
+export * from './schema/alter-table-builder.js';
+export * from './schema/create-view-builder.js';
+export * from './schema/drop-view-builder.js';
+export * from './dynamic/dynamic.js';
+export * from './driver/driver.js';
+export * from './driver/database-connection.js';
+export * from './driver/connection-provider.js';
+export * from './driver/default-connection-provider.js';
+export * from './driver/single-connection-provider.js';
+export * from './driver/dummy-driver.js';
+export * from './dialect/dialect.js';
+export * from './dialect/dialect-adapter.js';
+export * from './dialect/dialect-adapter-base.js';
+export * from './dialect/database-introspector.js';
 export * from './dialect/sqlite/sqlite-dialect.js';
 export * from './dialect/sqlite/sqlite-dialect-config.js';
 export * from './dialect/sqlite/sqlite-driver.js';
+export * from './dialect/postgres/postgres-query-compiler.js';
+export * from './dialect/postgres/postgres-introspector.js';
+export * from './dialect/postgres/postgres-adapter.js';
 export * from './dialect/mysql/mysql-dialect.js';
 export * from './dialect/mysql/mysql-dialect-config.js';
 export * from './dialect/mysql/mysql-driver.js';
+export * from './dialect/mysql/mysql-query-compiler.js';
+export * from './dialect/mysql/mysql-introspector.js';
+export * from './dialect/mysql/mysql-adapter.js';
 export * from './dialect/postgres/postgres-driver.js';
 export * from './dialect/postgres/postgres-dialect-config.js';
 export * from './dialect/postgres/postgres-dialect.js';
+export * from './dialect/sqlite/sqlite-query-compiler.js';
+export * from './dialect/sqlite/sqlite-introspector.js';
+export * from './dialect/sqlite/sqlite-adapter.js';
+export * from './query-compiler/default-query-compiler.js';
+export * from './query-compiler/query-compiler.js';
+export * from './migration/migrator.js';
+export * from './migration/file-migration-provider.js';
+export * from './plugin/kysely-plugin.js';
+export * from './plugin/camel-case/camel-case-plugin.js';
+export * from './plugin/deduplicate-joins/deduplicate-joins-plugin.js';
+export * from './operation-node/add-column-node.js';
+export * from './operation-node/add-constraint-node.js';
+export * from './operation-node/alias-node.js';
+export * from './operation-node/alter-column-node.js';
+export * from './operation-node/alter-table-node.js';
+export * from './operation-node/and-node.js';
+export * from './operation-node/check-constraint-node.js';
+export * from './operation-node/column-definition-node.js';
+export * from './operation-node/column-node.js';
+export * from './operation-node/column-update-node.js';
+export * from './operation-node/common-table-expression-node.js';
+export * from './operation-node/common-table-expression-name-node.js';
+export * from './operation-node/constraint-node.js';
+export * from './operation-node/create-index-node.js';
+export * from './operation-node/create-schema-node.js';
+export * from './operation-node/create-table-node.js';
+export * from './operation-node/create-view-node.js';
+export * from './operation-node/data-type-node.js';
+export * from './operation-node/default-value-node.js';
+export * from './operation-node/delete-query-node.js';
+export * from './operation-node/drop-column-node.js';
+export * from './operation-node/drop-constraint-node.js';
+export * from './operation-node/drop-index-node.js';
+export * from './operation-node/drop-schema-node.js';
+export * from './operation-node/drop-table-node.js';
+export * from './operation-node/drop-view-node.js';
+export * from './operation-node/filter-node.js';
+export * from './operation-node/foreign-key-constraint-node.js';
+export * from './operation-node/from-node.js';
+export * from './operation-node/generated-node.js';
+export * from './operation-node/group-by-item-node.js';
+export * from './operation-node/group-by-node.js';
+export * from './operation-node/having-node.js';
+export * from './operation-node/identifier-node.js';
+export * from './operation-node/insert-query-node.js';
+export * from './operation-node/join-node.js';
+export * from './operation-node/limit-node.js';
+export * from './operation-node/list-node.js';
+export * from './operation-node/modify-column-node.js';
+export * from './operation-node/offset-node.js';
+export * from './operation-node/on-conflict-node.js';
+export * from './operation-node/on-duplicate-key-node.js';
+export * from './operation-node/on-node.js';
+export * from './operation-node/operation-node-source.js';
+export * from './operation-node/operation-node-transformer.js';
+export * from './operation-node/operation-node-utils.js';
+export * from './operation-node/operation-node-visitor.js';
+export * from './operation-node/operation-node.js';
+export * from './operation-node/operator-node.js';
+export * from './operation-node/or-node.js';
+export * from './operation-node/order-by-item-node.js';
+export * from './operation-node/order-by-node.js';
+export * from './operation-node/parens-node.js';
+export * from './operation-node/primary-constraint-node.js';
+export * from './operation-node/primitive-value-list-node.js';
+export * from './operation-node/query-node.js';
+export * from './operation-node/raw-node.js';
+export * from './operation-node/reference-node.js';
+export * from './operation-node/references-node.js';
+export * from './operation-node/rename-column-node.js';
+export * from './operation-node/returning-node.js';
+export * from './operation-node/select-all-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/selection-node.js';
+export * from './operation-node/table-node.js';
+export * from './operation-node/union-node.js';
+export * from './operation-node/unique-constraint-node.js';
+export * from './operation-node/update-query-node.js';
+export * from './operation-node/value-list-node.js';
+export * from './operation-node/value-node.js';
+export * from './operation-node/values-node.js';
+export * from './operation-node/where-node.js';
+export * from './operation-node/with-node.js';
+export * from './util/column-type.js';
+export * from './util/compilable.js';
+export * from './util/log.js';

package/dist/esm/migration/file-migration-provider.d.ts

@@ -1,18 +1,23 @@
 import { Migration, MigrationProvider } from './migrator.js';
 /**
- * Reads all migrations from a folder.
+ * Reads all migrations from a folder in node.js.
  *
  * ### Examples
  *
  * ```ts
- * new FileMigrationProvider(
- *   'path/to/migrations/folder'
- * )
+ * import { promises as fs } from 'fs'
+ * import path from 'path'
+ *
+ * new FileMigrationProvider({
+ *   fs,
+ *   path,
+ *   migrationFolder: 'path/to/migrations/folder'
+ * })
  * ```
  */
 export declare class FileMigrationProvider implements MigrationProvider {
     #private;
-    constructor(migrationFolderPath: string);
+    constructor(props: FileMigrationProviderProps);
     /**
      * Returns all migrations, old and new.
      *
@@ -27,3 +32,14 @@ export declare class FileMigrationProvider implements MigrationProvider {
      */
     getMigrations(): Promise<Record<string, Migration>>;
 }
+export interface FileMigrationProviderFS {
+    readdir(path: string): Promise<string[]>;
+}
+export interface FileMigrationProviderPath {
+    join(...path: string[]): string;
+}
+export interface FileMigrationProviderProps {
+    fs: FileMigrationProviderFS;
+    path: FileMigrationProviderPath;
+    migrationFolder: string;
+}

package/dist/esm/migration/file-migration-provider.js

@@ -1,32 +1,33 @@
 /// <reference types="./file-migration-provider.d.ts" />
 import { isFunction, isObject } from '../util/object-utils.js';
 /**
- * Reads all migrations from a folder.
+ * Reads all migrations from a folder in node.js.
  *
  * ### Examples
  *
  * ```ts
- * new FileMigrationProvider(
- *   'path/to/migrations/folder'
- * )
+ * import { promises as fs } from 'fs'
+ * import path from 'path'
+ *
+ * new FileMigrationProvider({
+ *   fs,
+ *   path,
+ *   migrationFolder: 'path/to/migrations/folder'
+ * })
  * ```
  */
 export class FileMigrationProvider {
-    #migrationFolderPath;
-    constructor(migrationFolderPath) {
-        this.#migrationFolderPath = migrationFolderPath;
+    #props;
+    constructor(props) {
+        this.#props = props;
     }
     async getMigrations() {
-        // Import these dynamically so that we don't have any top level
-        // node dependencies.
-        const fs = await import('fs/promises');
-        const path = await import('path');
         const migrations = {};
-        const files = await fs.readdir(this.#migrationFolderPath);
+        const files = await this.#props.fs.readdir(this.#props.migrationFolder);
         for (const fileName of files) {
             if ((fileName.endsWith('.js') || fileName.endsWith('.ts')) &&
                 !fileName.endsWith('.d.ts')) {
-                const migration = await import(path.join(this.#migrationFolderPath, fileName));
+                const migration = await import(this.#props.path.join(this.#props.migrationFolder, fileName));
                 if (isMigration(migration)) {
                     migrations[fileName.substring(0, fileName.length - 3)] = migration;
                 }

package/dist/esm/migration/migrator.d.ts

@@ -1,6 +1,6 @@
 import { Kysely } from '../kysely.js';
-export declare const MIGRATION_TABLE = "kysely_migration";
-export declare const MIGRATION_LOCK_TABLE = "kysely_migration_lock";
+export declare const DEFAULT_MIGRATION_TABLE = "kysely_migration";
+export declare const DEFAULT_MIGRATION_LOCK_TABLE = "kysely_migration_lock";
 export declare const MIGRATION_LOCK_ID = "migration_lock";
 export declare const NO_MIGRATIONS: NoMigrations;
 export interface Migration {
@@ -148,6 +148,48 @@ export declare class Migrator {
 export interface MigratorProps {
     readonly db: Kysely<any>;
     readonly provider: MigrationProvider;
+    /**
+     * The name of the internal migration table. Defaults to `kysely_migration`.
+     *
+     * If you do specify this, you need to ALWAYS use the same value. Kysely doesn't
+     * support changing the table on the fly. If you run the migrator even once with a
+     * table name X and then change the table name to Y, kysely will create a new empty
+     * migration table and attempt to run the migrations again, which will obviously
+     * fail.
+     *
+     * If you do specify this, ALWAYS ALWAYS use the same value from the beginning of
+     * the project, to the end of time or prepare to manually migrate the migration
+     * tables.
+     */
+    readonly migrationTableName?: string;
+    /**
+     * The name of the internal migration lock table. Defaults to `kysely_migration_lock`.
+     *
+     * If you do specify this, you need to ALWAYS use the same value. Kysely doesn't
+     * support changing the table on the fly. If you run the migrator even once with a
+     * table name X and then change the table name to Y, kysely will create a new empty
+     * lock table.
+     *
+     * If you do specify this, ALWAYS ALWAYS use the same value from the beginning of
+     * the project, to the end of time or prepare to manually migrate the migration
+     * tables.
+     */
+    readonly migrationLockTableName?: string;
+    /**
+     * The schema of the internal migration tables. Defaults to the default schema
+     * on dialects that support schemas.
+     *
+     * If you do specify this, you need to ALWAYS use the same value. Kysely doesn't
+     * support changing the schema on the fly. If you run the migrator even once with a
+     * schema name X and then change the schema name to Y, kysely will create a new empty
+     * migration tables in the new schema and attempt to run the migrations again, which
+     * will obviously fail.
+     *
+     * If you do specify this, ALWAYS ALWAYS use the same value from the beginning of
+     * the project, to the end of time or prepare to manually migrate the migration
+     * tables.
+     */
+    readonly migrationTableSchema?: string;
 }
 /**
  * All migration methods ({@link Migrator.migrateTo | migrateTo},

package/dist/esm/migration/migrator.js

@@ -1,7 +1,9 @@
 /// <reference types="./migrator.d.ts" />
+import { NoopPlugin } from '../plugin/noop-plugin.js';
+import { WithSchemaPlugin } from '../plugin/with-schema/with-schema-plugin.js';
 import { freeze, getLast } from '../util/object-utils.js';
-export const MIGRATION_TABLE = 'kysely_migration';
-export const MIGRATION_LOCK_TABLE = 'kysely_migration_lock';
+export const DEFAULT_MIGRATION_TABLE = 'kysely_migration';
+export const DEFAULT_MIGRATION_LOCK_TABLE = 'kysely_migration_lock';
 export const MIGRATION_LOCK_ID = 'migration_lock';
 export const NO_MIGRATIONS = freeze({ __noMigrations__: true });
 /**
@@ -35,9 +37,10 @@ export class Migrator {
      * The returned array is sorted by migration name.
      */
     async getMigrations() {
-        const executedMigrations = (await this.#doesTableExists(MIGRATION_TABLE))
+        const executedMigrations = (await this.#doesTableExists(this.#migrationTable))
             ? await this.#props.db
-                .selectFrom(MIGRATION_TABLE)
+                .withPlugin(this.#schemaPlugin)
+                .selectFrom(this.#migrationTable)
                 .select(['name', 'timestamp'])
                 .execute()
             : [];
@@ -182,16 +185,61 @@ export class Migrator {
             return { error };
         }
     }
+    get #migrationTableSchema() {
+        return this.#props.migrationTableSchema;
+    }
+    get #migrationTable() {
+        return this.#props.migrationTableName ?? DEFAULT_MIGRATION_TABLE;
+    }
+    get #migrationLockTable() {
+        return this.#props.migrationLockTableName ?? DEFAULT_MIGRATION_LOCK_TABLE;
+    }
+    get #schemaPlugin() {
+        if (this.#migrationTableSchema) {
+            return new WithSchemaPlugin(this.#migrationTableSchema);
+        }
+        return new NoopPlugin();
+    }
     async #ensureMigrationTablesExists() {
+        await this.#ensureMigrationTableSchemaExists();
         await this.#ensureMigrationTableExists();
         await this.#ensureMigrationLockTableExists();
         await this.#ensureLockRowExists();
     }
+    async #ensureMigrationTableSchemaExists() {
+        if (!this.#migrationTableSchema) {
+            // Use default schema. Nothing to do.
+            return;
+        }
+        if (!(await this.#doesSchemaExists())) {
+            try {
+                await this.#props.db.schema
+                    .createSchema(this.#migrationTableSchema)
+                    .ifNotExists()
+                    .execute();
+            }
+            catch (error) {
+                // At least on PostgreSQL, `if not exists` doesn't guarantee the `create schema`
+                // query doesn't throw if the schema already exits. That's why we check if
+                // the schema exist here and ignore the error if it does.
+                if (!(await this.#doesSchemaExists())) {
+                    throw error;
+                }
+            }
+        }
+    }
     async #ensureMigrationTableExists() {
-        if (!(await this.#doesTableExists(MIGRATION_TABLE))) {
+        if (!(await this.#doesTableExists(this.#migrationTable))) {
             try {
+                if (this.#migrationTableSchema) {
+                    await this.#props.db.schema
+                        .createSchema(this.#migrationTableSchema)
+                        .ifNotExists()
+                        .execute();
+                }
                 await this.#props.db.schema
-                    .createTable(MIGRATION_TABLE)
+                    .withPlugin(this.#schemaPlugin)
+                    .createTable(this.#migrationTable)
                     .ifNotExists()
                     .addColumn('name', 'varchar(255)', (col) => col.notNull().primaryKey())
                     // The migration run time as ISO string. This is not a real date type as we
@@ -203,17 +251,18 @@ export class Migrator {
                 // At least on PostgreSQL, `if not exists` doesn't guarantee the `create table`
                 // query doesn't throw if the table already exits. That's why we check if
                 // the table exist here and ignore the error if it does.
-                if (!(await this.#doesTableExists(MIGRATION_TABLE))) {
+                if (!(await this.#doesTableExists(this.#migrationTable))) {
                     throw error;
                 }
             }
         }
     }
     async #ensureMigrationLockTableExists() {
-        if (!(await this.#doesTableExists(MIGRATION_LOCK_TABLE))) {
+        if (!(await this.#doesTableExists(this.#migrationLockTable))) {
             try {
                 await this.#props.db.schema
-                    .createTable(MIGRATION_LOCK_TABLE)
+                    .withPlugin(this.#schemaPlugin)
+                    .createTable(this.#migrationLockTable)
                     .ifNotExists()
                     .addColumn('id', 'varchar(255)', (col) => col.notNull().primaryKey())
                     .addColumn('is_locked', 'integer', (col) => col.notNull().defaultTo(0))
@@ -223,7 +272,7 @@ export class Migrator {
                 // At least on PostgreSQL, `if not exists` doesn't guarantee the `create table`
                 // query doesn't throw if the table already exits. That's why we check if
                 // the table exist here and ignore the error if it does.
-                if (!(await this.#doesTableExists(MIGRATION_LOCK_TABLE))) {
+                if (!(await this.#doesTableExists(this.#migrationLockTable))) {
                     throw error;
                 }
             }
@@ -233,7 +282,8 @@ export class Migrator {
         if (!(await this.#doesLockRowExists())) {
             try {
                 await this.#props.db
-                    .insertInto(MIGRATION_LOCK_TABLE)
+                    .withPlugin(this.#schemaPlugin)
+                    .insertInto(this.#migrationLockTable)
                     .values({ id: MIGRATION_LOCK_ID, is_locked: 0 })
                     .execute();
             }
@@ -244,15 +294,21 @@ export class Migrator {
             }
         }
     }
+    async #doesSchemaExists() {
+        const schemas = await this.#props.db.introspection.getSchemas();
+        return schemas.some((it) => it.name === this.#migrationTableSchema);
+    }
     async #doesTableExists(tableName) {
-        const metadata = await this.#props.db.introspection.getMetadata({
+        const schema = this.#migrationTableSchema;
+        const tables = await this.#props.db.introspection.getTables({
             withInternalKyselyTables: true,
         });
-        return !!metadata.tables.find((it) => it.name === tableName);
+        return tables.some((it) => it.name === tableName && (!schema || it.schema === schema));
     }
     async #doesLockRowExists() {
         const lockRow = await this.#props.db
-            .selectFrom(MIGRATION_LOCK_TABLE)
+            .withPlugin(this.#schemaPlugin)
+            .selectFrom(this.#migrationLockTable)
             .where('id', '=', MIGRATION_LOCK_ID)
             .select('id')
             .executeTakeFirst();
@@ -310,7 +366,8 @@ export class Migrator {
     }
     async #getExecutedMigrations(db) {
         const executedMigrations = await db
-            .selectFrom(MIGRATION_TABLE)
+            .withPlugin(this.#schemaPlugin)
+            .selectFrom(this.#migrationTable)
             .select('name')
             .orderBy('name')
             .execute();
@@ -346,7 +403,8 @@ export class Migrator {
                 if (migration.down) {
                     await migration.down(db);
                     await db
-                        .deleteFrom(MIGRATION_TABLE)
+                        .withPlugin(this.#schemaPlugin)
+                        .deleteFrom(this.#migrationTable)
                         .where('name', '=', migration.name)
                         .execute();
                     results[i] = {
@@ -384,7 +442,8 @@ export class Migrator {
             try {
                 await migration.up(db);
                 await db
-                    .insertInto(MIGRATION_TABLE)
+                    .withPlugin(this.#schemaPlugin)
+                    .insertInto(this.#migrationTable)
                     .values({
                     name: migration.name,
                     timestamp: new Date().toISOString(),