kysely 0.27.1 → 0.27.3

package/dist/cjs/dialect/database-introspector.d.ts

@@ -58,4 +58,5 @@ export interface ColumnMetadata {
     readonly isAutoIncrementing: boolean;
     readonly isNullable: boolean;
     readonly hasDefaultValue: boolean;
+    readonly comment?: string;
 }

package/dist/cjs/dialect/mssql/mssql-introspector.js

@@ -16,8 +16,12 @@ class MssqlIntrospector {
             .selectFrom('sys.tables as tables')
             .leftJoin('sys.schemas as table_schemas', 'table_schemas.schema_id', 'tables.schema_id')
             .innerJoin('sys.columns as columns', 'columns.object_id', 'tables.object_id')
-            .innerJoin('sys.types as types', 'types.system_type_id', 'columns.system_type_id')
+            .innerJoin('sys.types as types', 'types.user_type_id', 'columns.user_type_id')
             .leftJoin('sys.schemas as type_schemas', 'type_schemas.schema_id', 'types.schema_id')
+            .leftJoin('sys.extended_properties as comments', (join) => join
+            .onRef('comments.major_id', '=', 'tables.object_id')
+            .onRef('comments.minor_id', '=', 'columns.column_id')
+            .on('comments.name', '=', 'MS_Description'))
             .$if(!options.withInternalKyselyTables, (qb) => qb
             .where('tables.name', '!=', migrator_js_1.DEFAULT_MIGRATION_TABLE)
             .where('tables.name', '!=', migrator_js_1.DEFAULT_MIGRATION_LOCK_TABLE))
@@ -38,13 +42,18 @@ class MssqlIntrospector {
             'types.is_nullable as type_is_nullable',
             'types.name as type_name',
             'type_schemas.name as type_schema_name',
+            'comments.value as column_comment',
         ])
             .unionAll(this.#db
             .selectFrom('sys.views as views')
             .leftJoin('sys.schemas as view_schemas', 'view_schemas.schema_id', 'views.schema_id')
             .innerJoin('sys.columns as columns', 'columns.object_id', 'views.object_id')
-            .innerJoin('sys.types as types', 'types.system_type_id', 'columns.system_type_id')
+            .innerJoin('sys.types as types', 'types.user_type_id', 'columns.user_type_id')
             .leftJoin('sys.schemas as type_schemas', 'type_schemas.schema_id', 'types.schema_id')
+            .leftJoin('sys.extended_properties as comments', (join) => join
+            .onRef('comments.major_id', '=', 'views.object_id')
+            .onRef('comments.minor_id', '=', 'columns.column_id')
+            .on('comments.name', '=', 'MS_Description'))
             .select([
             'views.name as table_name',
             'views.type as table_type',
@@ -59,6 +68,7 @@ class MssqlIntrospector {
             'types.is_nullable as type_is_nullable',
             'types.name as type_name',
             'type_schemas.name as type_schema_name',
+            'comments.value as column_comment',
         ]))
             .orderBy('table_schema_name')
             .orderBy('table_name')
@@ -86,6 +96,7 @@ class MssqlIntrospector {
                 isAutoIncrementing: rawColumn.column_is_identity,
                 isNullable: rawColumn.column_is_nullable && rawColumn.type_is_nullable,
                 name: rawColumn.column_name,
+                comment: rawColumn.column_comment ?? undefined,
             }));
         }
         return Object.values(tableDictionary);

package/dist/cjs/dialect/mssql/mssql-query-compiler.d.ts

@@ -1,11 +1,15 @@
 import { AddColumnNode } from '../../operation-node/add-column-node.js';
 import { AlterTableColumnAlterationNode } from '../../operation-node/alter-table-node.js';
 import { DropColumnNode } from '../../operation-node/drop-column-node.js';
+import { OffsetNode } from '../../operation-node/offset-node.js';
+import { MergeQueryNode } from '../../operation-node/merge-query-node.js';
 import { DefaultQueryCompiler } from '../../query-compiler/default-query-compiler.js';
 export declare class MssqlQueryCompiler extends DefaultQueryCompiler {
     protected getCurrentParameterPlaceholder(): string;
+    protected visitOffset(node: OffsetNode): void;
     protected compileColumnAlterations(columnAlterations: readonly AlterTableColumnAlterationNode[]): void;
     protected visitAddColumn(node: AddColumnNode): void;
     protected visitDropColumn(node: DropColumnNode): void;
+    protected visitMergeQuery(node: MergeQueryNode): void;
     protected announcesNewColumnDataType(): boolean;
 }

package/dist/cjs/dialect/mssql/mssql-query-compiler.js

@@ -6,6 +6,10 @@ class MssqlQueryCompiler extends default_query_compiler_js_1.DefaultQueryCompile
     getCurrentParameterPlaceholder() {
         return `@${this.numParameters}`;
     }
+    visitOffset(node) {
+        super.visitOffset(node);
+        this.append(' rows');
+    }
     // mssql allows multi-column alterations in a single statement,
     // but you can only use the command keyword/s once.
     // it also doesn't support multiple kinds of commands in the same
@@ -57,6 +61,10 @@ class MssqlQueryCompiler extends default_query_compiler_js_1.DefaultQueryCompile
     visitDropColumn(node) {
         this.visitNode(node.column);
     }
+    visitMergeQuery(node) {
+        super.visitMergeQuery(node);
+        this.append(';');
+    }
     announcesNewColumnDataType() {
         return false;
     }

package/dist/cjs/dialect/mysql/mysql-introspector.js

@@ -33,6 +33,7 @@ class MysqlIntrospector {
             'columns.IS_NULLABLE',
             'columns.DATA_TYPE',
             'columns.EXTRA',
+            'columns.COLUMN_COMMENT',
         ])
             .where('columns.TABLE_SCHEMA', '=', (0, sql_js_1.sql) `database()`)
             .orderBy('columns.TABLE_NAME')
@@ -69,6 +70,7 @@ class MysqlIntrospector {
                 isNullable: it.IS_NULLABLE === 'YES',
                 isAutoIncrementing: it.EXTRA.toLowerCase().includes('auto_increment'),
                 hasDefaultValue: it.COLUMN_DEFAULT !== null,
+                comment: it.COLUMN_COMMENT === '' ? undefined : it.COLUMN_COMMENT,
             }));
             return tables;
         }, []);

package/dist/cjs/dialect/postgres/postgres-dialect-config.d.ts

@@ -52,7 +52,7 @@ export interface PostgresCursor<T> {
 }
 export type PostgresCursorConstructor = new <T>(sql: string, parameters: unknown[]) => PostgresCursor<T>;
 export interface PostgresQueryResult<R> {
-    command: 'UPDATE' | 'DELETE' | 'INSERT' | 'SELECT';
+    command: 'UPDATE' | 'DELETE' | 'INSERT' | 'SELECT' | 'MERGE';
     rowCount: number;
     rows: R[];
 }

package/dist/cjs/dialect/postgres/postgres-driver.js

@@ -74,7 +74,8 @@ class PostgresConnection {
             ]);
             if (result.command === 'INSERT' ||
                 result.command === 'UPDATE' ||
-                result.command === 'DELETE') {
+                result.command === 'DELETE' ||
+                result.command === 'MERGE') {
                 const numAffectedRows = BigInt(result.rowCount);
                 return {
                     // TODO: remove.

package/dist/cjs/dialect/postgres/postgres-introspector.js

@@ -38,6 +38,7 @@ class PostgresIntrospector {
             'ns.nspname as schema',
             'typ.typname as type',
             'dtns.nspname as type_schema',
+            (0, sql_js_1.sql) `col_description(a.attrelid, a.attnum)`.as('column_description'),
             // Detect if the column is auto incrementing by finding the sequence
             // that is created for `serial` and `bigserial` columns.
             this.#db
@@ -92,6 +93,7 @@ class PostgresIntrospector {
                 isNullable: !it.not_null,
                 isAutoIncrementing: !!it.auto_incrementing,
                 hasDefaultValue: it.has_default,
+                comment: it.column_description ?? undefined,
             }));
             return tables;
         }, []);

package/dist/cjs/dialect/sqlite/sqlite-introspector.js

@@ -63,6 +63,7 @@ class SqliteIntrospector {
                 isNullable: !col.notnull,
                 isAutoIncrementing: col.name === autoIncrementCol,
                 hasDefaultValue: col.dflt_value != null,
+                comment: undefined,
             })),
         };
     }

package/dist/cjs/driver/database-connection.d.ts

@@ -14,7 +14,7 @@ export interface QueryResult<O> {
      */
     readonly numUpdatedOrDeletedRows?: bigint;
     /**
-     * This is defined for insert, update and delete queries and contains
+     * This is defined for insert, update, delete and merge queries and contains
      * the number of rows the query inserted/updated/deleted.
      */
     readonly numAffectedRows?: bigint;

package/dist/cjs/expression/expression-builder.d.ts

@@ -15,6 +15,7 @@ import { OperandExpression } from '../parser/expression-parser.js';
 import { RefTuple2, RefTuple3, RefTuple4, RefTuple5, ValTuple2, ValTuple3, ValTuple4, ValTuple5 } from '../parser/tuple-parser.js';
 import { Selectable } from '../util/column-type.js';
 import { KyselyTypeError } from '../util/type-error.js';
+import { DataTypeExpression } from '../parser/data-type-parser.js';
 export interface ExpressionBuilder<DB, TB extends keyof DB> {
     /**
      * Creates a binary expression.
@@ -194,7 +195,7 @@ export interface ExpressionBuilder<DB, TB extends keyof DB> {
     selectFrom<TE extends keyof DB & string>(from: TE[]): SelectQueryBuilder<DB, TB | ExtractTableAlias<DB, TE>, {}>;
     selectFrom<TE extends TableExpression<DB, TB>>(from: TE[]): SelectQueryBuilder<From<DB, TE>, FromTables<DB, TB, TE>, {}>;
     selectFrom<TE extends keyof DB & string>(from: TE): SelectQueryBuilder<DB, TB | ExtractTableAlias<DB, TE>, {}>;
-    selectFrom<TE extends AnyAliasedTable<DB>>(from: TE): SelectQueryBuilder<DB & PickTableWithAlias<DB, TE>, TB | ExtractTableAlias<DB, TE>, {}>;
+    selectFrom<TE extends AnyAliasedTable<DB>>(from: TE): SelectQueryBuilder<DB & PickTableWithAlias<DB, TE>, TB | ExtractTableAlias<DB & PickTableWithAlias<DB, TE>, TE>, {}>;
     selectFrom<TE extends TableExpression<DB, TB>>(from: TE): SelectQueryBuilder<From<DB, TE>, FromTables<DB, TB, TE>, {}>;
     /**
      * Creates a `case` statement/operator.
@@ -218,7 +219,7 @@ export interface ExpressionBuilder<DB, TB extends keyof DB> {
      *       .when('gender', '=', 'female')
      *       .then(
      *         eb
-     *           .case('martialStatus')
+     *           .case('maritalStatus')
      *           .when('single')
      *           .then('Ms.')
      *           .else('Mrs.')
@@ -238,7 +239,7 @@ export interface ExpressionBuilder<DB, TB extends keyof DB> {
      *   case
      *     when "gender" = $1 then $2
      *     when "gender" = $3 then
-     *       case "martialStatus"
+     *       case "maritalStatus"
      *         when $4 then $5
      *         else $6
      *       end
@@ -775,7 +776,7 @@ export interface ExpressionBuilder<DB, TB extends keyof DB> {
      * ```ts
      * db.selectFrom('person')
      *   .selectAll('person')
-     *   .where((eb) => parens(
+     *   .where((eb) => eb.parens(
      *     eb('age', '=', 1).or('age', '=', 2))
      *   ).and(
      *     eb('first_name', '=', 'Jennifer').or('first_name', '=', 'Arnold')
@@ -792,6 +793,31 @@ export interface ExpressionBuilder<DB, TB extends keyof DB> {
      */
     parens<RE extends ReferenceExpression<DB, TB>, OP extends BinaryOperatorExpression, VE extends OperandValueExpressionOrList<DB, TB, RE>>(lhs: RE, op: OP, rhs: VE): ExpressionWrapper<DB, TB, OP extends ComparisonOperator ? SqlBool : ExtractTypeFromReferenceExpression<DB, TB, RE>>;
     parens<T>(expr: Expression<T>): ExpressionWrapper<DB, TB, T>;
+    /**
+     * Creates a `cast(expr as dataType)` expression.
+     *
+     * Since Kysely can't know the mapping between javascript and database types,
+     * you need to provide both explicitly.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * db.selectFrom('person')
+     *   .select((eb) => [
+     *     'id',
+     *     'first_name',
+     *     eb.cast<number>('age', 'integer').as('age')
+     *   ])
+     * ```
+     *
+     * The generated SQL (PostgreSQL):
+     *
+     * ```sql
+     * select cast("age" as integer) as "age"
+     * from "person"
+     * ```
+     */
+    cast<T, RE extends ReferenceExpression<DB, TB> = ReferenceExpression<DB, TB>>(expr: RE, dataType: DataTypeExpression): ExpressionWrapper<DB, TB, T>;
     /**
      * See {@link QueryCreator.withSchema}
      *

package/dist/cjs/expression/expression-builder.js

@@ -23,6 +23,8 @@ const binary_operation_node_js_1 = require("../operation-node/binary-operation-n
 const and_node_js_1 = require("../operation-node/and-node.js");
 const tuple_node_js_1 = require("../operation-node/tuple-node.js");
 const json_path_node_js_1 = require("../operation-node/json-path-node.js");
+const data_type_parser_js_1 = require("../parser/data-type-parser.js");
+const cast_node_js_1 = require("../operation-node/cast-node.js");
 function createExpressionBuilder(executor = noop_query_executor_js_1.NOOP_QUERY_EXECUTOR) {
     function binary(lhs, op, rhs) {
         return new expression_wrapper_js_1.ExpressionWrapper((0, binary_operation_parser_js_1.parseValueBinaryOperation)(lhs, op, rhs));
@@ -109,6 +111,9 @@ function createExpressionBuilder(executor = noop_query_executor_js_1.NOOP_QUERY_
                 return new expression_wrapper_js_1.ExpressionWrapper(parens_node_js_1.ParensNode.create(node));
             }
         },
+        cast(expr, dataType) {
+            return new expression_wrapper_js_1.ExpressionWrapper(cast_node_js_1.CastNode.create((0, reference_parser_js_1.parseReferenceExpression)(expr), (0, data_type_parser_js_1.parseDataTypeExpression)(dataType)));
+        },
         withSchema(schema) {
             return createExpressionBuilder(executor.withPluginAtFront(new with_schema_plugin_js_1.WithSchemaPlugin(schema)));
         },

package/dist/cjs/index.d.ts

@@ -20,6 +20,8 @@ export * from './query-builder/on-conflict-builder.js';
 export * from './query-builder/aggregate-function-builder.js';
 export * from './query-builder/case-builder.js';
 export * from './query-builder/json-path-builder.js';
+export * from './query-builder/merge-query-builder.js';
+export * from './query-builder/merge-result.js';
 export * from './raw-builder/raw-builder.js';
 export * from './raw-builder/sql.js';
 export * from './query-executor/query-executor.js';
@@ -177,6 +179,10 @@ export * from './operation-node/json-path-leg-node.js';
 export * from './operation-node/json-path-node.js';
 export * from './operation-node/json-operator-chain-node.js';
 export * from './operation-node/tuple-node.js';
+export * from './operation-node/merge-query-node.js';
+export * from './operation-node/matched-node.js';
+export * from './operation-node/fetch-node.js';
+export * from './operation-node/top-node.js';
 export * from './util/column-type.js';
 export * from './util/compilable.js';
 export * from './util/explainable.js';
@@ -188,7 +194,7 @@ export { logOnce } from './util/log-once.js';
 export { SelectExpression, SelectCallback, SelectArg, Selection, CallbackSelection, } from './parser/select-parser.js';
 export { ReferenceExpression, ReferenceExpressionOrList, SimpleReferenceExpression, StringReference, ExtractTypeFromStringReference, ExtractTypeFromReferenceExpression, } from './parser/reference-parser.js';
 export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.js';
-export { TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
+export { SimpleTableReference, TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
 export { JoinReferenceExpression, JoinCallbackExpression, } from './parser/join-parser.js';
 export { InsertObject } from './parser/insert-values-parser.js';
 export { UpdateObject } from './parser/update-set-parser.js';

package/dist/cjs/index.js

@@ -38,6 +38,8 @@ __exportStar(require("./query-builder/on-conflict-builder.js"), exports);
 __exportStar(require("./query-builder/aggregate-function-builder.js"), exports);
 __exportStar(require("./query-builder/case-builder.js"), exports);
 __exportStar(require("./query-builder/json-path-builder.js"), exports);
+__exportStar(require("./query-builder/merge-query-builder.js"), exports);
+__exportStar(require("./query-builder/merge-result.js"), exports);
 __exportStar(require("./raw-builder/raw-builder.js"), exports);
 __exportStar(require("./raw-builder/sql.js"), exports);
 __exportStar(require("./query-executor/query-executor.js"), exports);
@@ -195,6 +197,10 @@ __exportStar(require("./operation-node/json-path-leg-node.js"), exports);
 __exportStar(require("./operation-node/json-path-node.js"), exports);
 __exportStar(require("./operation-node/json-operator-chain-node.js"), exports);
 __exportStar(require("./operation-node/tuple-node.js"), exports);
+__exportStar(require("./operation-node/merge-query-node.js"), exports);
+__exportStar(require("./operation-node/matched-node.js"), exports);
+__exportStar(require("./operation-node/fetch-node.js"), exports);
+__exportStar(require("./operation-node/top-node.js"), exports);
 __exportStar(require("./util/column-type.js"), exports);
 __exportStar(require("./util/compilable.js"), exports);
 __exportStar(require("./util/explainable.js"), exports);

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

@@ -1,6 +1,7 @@
 import { Kysely } from '../kysely.js';
 export declare const DEFAULT_MIGRATION_TABLE = "kysely_migration";
 export declare const DEFAULT_MIGRATION_LOCK_TABLE = "kysely_migration_lock";
+export declare const DEFAULT_ALLOW_UNORDERED_MIGRATIONS = false;
 export declare const MIGRATION_LOCK_ID = "migration_lock";
 export declare const NO_MIGRATIONS: NoMigrations;
 export interface Migration {
@@ -58,7 +59,7 @@ export declare class Migrator {
      * This method goes through all possible migrations provided by the provider and runs the
      * ones whose names come alphabetically after the last migration that has been run. If the
      * list of executed migrations doesn't match the beginning of the list of possible migrations
-     * an error is thrown.
+     * an error is returned.
      *
      * ### Examples
      *
@@ -197,6 +198,20 @@ export interface MigratorProps {
      * This only works on postgres.
      */
     readonly migrationTableSchema?: string;
+    /**
+     * Enforces whether or not migrations must be run in alpha-numeric order.
+     *
+     * When false, migrations must be run in their exact alpha-numeric order.
+     * This is checked against the migrations already run in the database
+     * (`migrationTableName'). This ensures your migrations are always run in
+     * the same order and is the safest option.
+     *
+     * When true, migrations are still run in alpha-numeric order, but
+     * the order is not checked against already-run migrations in the database.
+     * Kysely will simply run all migrations that haven't run yet, in alpha-numeric
+     * order.
+     */
+    readonly allowUnorderedMigrations?: boolean;
 }
 /**
  * All migration methods ({@link Migrator.migrateTo | migrateTo},
@@ -231,12 +246,13 @@ export interface MigrationResultSet {
      */
     readonly results?: MigrationResult[];
 }
+type MigrationDirection = 'Up' | 'Down';
 export interface MigrationResult {
     readonly migrationName: string;
     /**
      * The direction in which this migration was executed.
      */
-    readonly direction: 'Up' | 'Down';
+    readonly direction: MigrationDirection;
     /**
      * The execution status.
      *
@@ -293,3 +309,4 @@ export interface MigrationInfo {
      */
     executedAt?: Date;
 }
+export {};

package/dist/cjs/migration/migrator.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Migrator = exports.NO_MIGRATIONS = exports.MIGRATION_LOCK_ID = exports.DEFAULT_MIGRATION_LOCK_TABLE = exports.DEFAULT_MIGRATION_TABLE = void 0;
+exports.Migrator = exports.NO_MIGRATIONS = exports.MIGRATION_LOCK_ID = exports.DEFAULT_ALLOW_UNORDERED_MIGRATIONS = exports.DEFAULT_MIGRATION_LOCK_TABLE = exports.DEFAULT_MIGRATION_TABLE = void 0;
 const noop_plugin_js_1 = require("../plugin/noop-plugin.js");
 const with_schema_plugin_js_1 = require("../plugin/with-schema/with-schema-plugin.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 exports.DEFAULT_MIGRATION_TABLE = 'kysely_migration';
 exports.DEFAULT_MIGRATION_LOCK_TABLE = 'kysely_migration_lock';
+exports.DEFAULT_ALLOW_UNORDERED_MIGRATIONS = false;
 exports.MIGRATION_LOCK_ID = 'migration_lock';
 exports.NO_MIGRATIONS = (0, object_utils_js_1.freeze)({ __noMigrations__: true });
 /**
@@ -72,7 +73,7 @@ class Migrator {
      * This method goes through all possible migrations provided by the provider and runs the
      * ones whose names come alphabetically after the last migration that has been run. If the
      * list of executed migrations doesn't match the beginning of the list of possible migrations
-     * an error is thrown.
+     * an error is returned.
      *
      * ### Examples
      *
@@ -109,7 +110,7 @@ class Migrator {
      * ```
      */
     async migrateToLatest() {
-        return this.#migrate(({ migrations }) => migrations.length - 1);
+        return this.#migrate(() => ({ direction: 'Up', step: Infinity }));
     }
     /**
      * Migrate up/down to a specific migration.
@@ -135,15 +136,27 @@ class Migrator {
      * ```
      */
     async migrateTo(targetMigrationName) {
-        return this.#migrate(({ migrations }) => {
+        return this.#migrate(({ migrations, executedMigrations, pendingMigrations, }) => {
             if (targetMigrationName === exports.NO_MIGRATIONS) {
-                return -1;
+                return { direction: 'Down', step: Infinity };
             }
-            const index = migrations.findIndex((it) => it.name === targetMigrationName);
-            if (index === -1) {
+            if (!migrations.find((m) => m.name === targetMigrationName)) {
                 throw new Error(`migration "${targetMigrationName}" doesn't exist`);
             }
-            return index;
+            const executedIndex = executedMigrations.indexOf(targetMigrationName);
+            const pendingIndex = pendingMigrations.findIndex((m) => m.name === targetMigrationName);
+            if (executedIndex !== -1) {
+                return {
+                    direction: 'Down',
+                    step: executedMigrations.length - executedIndex - 1,
+                };
+            }
+            else if (pendingIndex !== -1) {
+                return { direction: 'Up', step: pendingIndex + 1 };
+            }
+            else {
+                throw new Error(`migration "${targetMigrationName}" isn't executed or pending`);
+            }
         });
     }
     /**
@@ -161,7 +174,7 @@ class Migrator {
      * ```
      */
     async migrateUp() {
-        return this.#migrate(({ currentIndex, migrations }) => Math.min(currentIndex + 1, migrations.length - 1));
+        return this.#migrate(() => ({ direction: 'Up', step: 1 }));
     }
     /**
      * Migrate one step down.
@@ -178,12 +191,12 @@ class Migrator {
      * ```
      */
     async migrateDown() {
-        return this.#migrate(({ currentIndex }) => Math.max(currentIndex - 1, -1));
+        return this.#migrate(() => ({ direction: 'Down', step: 1 }));
     }
-    async #migrate(getTargetMigrationIndex) {
+    async #migrate(getMigrationDirectionAndStep) {
         try {
             await this.#ensureMigrationTablesExists();
-            return await this.#runMigrations(getTargetMigrationIndex);
+            return await this.#runMigrations(getMigrationDirectionAndStep);
         }
         catch (error) {
             if (error instanceof MigrationResultSetError) {
@@ -201,6 +214,9 @@ class Migrator {
     get #migrationLockTable() {
         return this.#props.migrationLockTableName ?? exports.DEFAULT_MIGRATION_LOCK_TABLE;
     }
+    get #allowUnorderedMigrations() {
+        return (this.#props.allowUnorderedMigrations ?? exports.DEFAULT_ALLOW_UNORDERED_MIGRATIONS);
+    }
     get #schemaPlugin() {
         if (this.#migrationTableSchema) {
             return new with_schema_plugin_js_1.WithSchemaPlugin(this.#migrationTableSchema);
@@ -311,7 +327,7 @@ class Migrator {
             .executeTakeFirst();
         return !!lockRow;
     }
-    async #runMigrations(getTargetMigrationIndex) {
+    async #runMigrations(getMigrationDirectionAndStep) {
         const adapter = this.#props.db.getExecutor().adapter;
         const lockOptions = (0, object_utils_js_1.freeze)({
             lockTable: this.#props.migrationLockTableName ?? exports.DEFAULT_MIGRATION_LOCK_TABLE,
@@ -325,15 +341,15 @@ class Migrator {
                 if (state.migrations.length === 0) {
                     return { results: [] };
                 }
-                const targetIndex = getTargetMigrationIndex(state);
-                if (targetIndex === undefined) {
+                const { direction, step } = getMigrationDirectionAndStep(state);
+                if (step <= 0) {
                     return { results: [] };
                 }
-                if (targetIndex < state.currentIndex) {
-                    return await this.#migrateDown(db, state, targetIndex);
+                if (direction === 'Down') {
+                    return await this.#migrateDown(db, state, step);
                 }
-                else if (targetIndex > state.currentIndex) {
-                    return await this.#migrateUp(db, state, targetIndex);
+                else if (direction === 'Up') {
+                    return await this.#migrateUp(db, state, step);
                 }
                 return { results: [] };
             }
@@ -351,10 +367,21 @@ class Migrator {
     async #getState(db) {
         const migrations = await this.#resolveMigrations();
         const executedMigrations = await this.#getExecutedMigrations(db);
-        this.#ensureMigrationsNotCorrupted(migrations, executedMigrations);
+        this.#ensureNoMissingMigrations(migrations, executedMigrations);
+        if (!this.#allowUnorderedMigrations) {
+            this.#ensureMigrationsInOrder(migrations, executedMigrations);
+        }
+        const pendingMigrations = this.#getPendingMigrations(migrations, executedMigrations);
         return (0, object_utils_js_1.freeze)({
             migrations,
-            currentIndex: migrations.findIndex((it) => it.name === (0, object_utils_js_1.getLast)(executedMigrations)),
+            executedMigrations,
+            lastMigration: (0, object_utils_js_1.getLast)(executedMigrations),
+            pendingMigrations,
+        });
+    }
+    #getPendingMigrations(migrations, executedMigrations) {
+        return migrations.filter((migration) => {
+            return !executedMigrations.includes(migration.name);
         });
     }
     async #resolveMigrations() {
@@ -371,36 +398,43 @@ class Migrator {
             .withPlugin(this.#schemaPlugin)
             .selectFrom(this.#migrationTable)
             .select('name')
-            .orderBy('name')
+            .orderBy(['timestamp', 'name'])
             .execute();
         return executedMigrations.map((it) => it.name);
     }
-    #ensureMigrationsNotCorrupted(migrations, executedMigrations) {
+    #ensureNoMissingMigrations(migrations, executedMigrations) {
+        // Ensure all executed migrations exist in the `migrations` list.
         for (const executed of executedMigrations) {
             if (!migrations.some((it) => it.name === executed)) {
                 throw new Error(`corrupted migrations: previously executed migration ${executed} is missing`);
             }
         }
-        // Now we know all executed migrations exist in the `migrations` list.
-        // Next we need to make sure that the executed migratiosns are the first
-        // ones in the migration list.
+    }
+    #ensureMigrationsInOrder(migrations, executedMigrations) {
+        // Ensure the executed migrations are the first ones in the migration list.
         for (let i = 0; i < executedMigrations.length; ++i) {
             if (migrations[i].name !== executedMigrations[i]) {
                 throw new Error(`corrupted migrations: expected previously executed migration ${executedMigrations[i]} to be at index ${i} but ${migrations[i].name} was found in its place. New migrations must always have a name that comes alphabetically after the last executed migration.`);
             }
         }
     }
-    async #migrateDown(db, state, targetIndex) {
-        const results = [];
-        for (let i = state.currentIndex; i > targetIndex; --i) {
-            results.push({
-                migrationName: state.migrations[i].name,
+    async #migrateDown(db, state, step) {
+        const migrationsToRollback = state.executedMigrations
+            .slice()
+            .reverse()
+            .slice(0, step)
+            .map((name) => {
+            return state.migrations.find((it) => it.name === name);
+        });
+        const results = migrationsToRollback.map((migration) => {
+            return {
+                migrationName: migration.name,
                 direction: 'Down',
                 status: 'NotExecuted',
-            });
-        }
+            };
+        });
         for (let i = 0; i < results.length; ++i) {
-            const migration = state.migrations.find((it) => it.name === results[i].migrationName);
+            const migration = migrationsToRollback[i];
             try {
                 if (migration.down) {
                     await migration.down(db);
@@ -430,17 +464,17 @@ class Migrator {
         }
         return { results };
     }
-    async #migrateUp(db, state, targetIndex) {
-        const results = [];
-        for (let i = state.currentIndex + 1; i <= targetIndex; ++i) {
-            results.push({
-                migrationName: state.migrations[i].name,
+    async #migrateUp(db, state, step) {
+        const migrationsToRun = state.pendingMigrations.slice(0, step);
+        const results = migrationsToRun.map((migration) => {
+            return {
+                migrationName: migration.name,
                 direction: 'Up',
                 status: 'NotExecuted',
-            });
-        }
-        for (let i = 0; i < results.length; ++i) {
-            const migration = state.migrations.find((it) => it.name === results[i].migrationName);
+            };
+        });
+        for (let i = 0; i < results.length; i++) {
+            const migration = state.pendingMigrations[i];
             try {
                 await migration.up(db);
                 await db

package/dist/cjs/operation-node/add-index-node.js

@@ -13,7 +13,7 @@ exports.AddIndexNode = (0, object_utils_js_1.freeze)({
     create(name) {
         return (0, object_utils_js_1.freeze)({
             kind: 'AddIndexNode',
-            name: identifier_node_js_1.IdentifierNode.create(name)
+            name: identifier_node_js_1.IdentifierNode.create(name),
         });
     },
     cloneWith(node, props) {

package/dist/cjs/operation-node/cast-node.d.ts

@@ -0,0 +1,13 @@
+import { OperationNode } from './operation-node.js';
+export interface CastNode extends OperationNode {
+    readonly kind: 'CastNode';
+    readonly expression: OperationNode;
+    readonly dataType: OperationNode;
+}
+/**
+ * @internal
+ */
+export declare const CastNode: Readonly<{
+    is(node: OperationNode): node is CastNode;
+    create(expression: OperationNode, dataType: OperationNode): CastNode;
+}>;