kysely 0.13.0 → 0.15.1

package/dist/cjs/migration/{migration.js → migrator.js}

@@ -1,25 +1,125 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrationModule = exports.NO_MIGRATIONS = exports.MIGRATION_LOCK_ID = exports.MIGRATION_LOCK_TABLE = exports.MIGRATION_TABLE = void 0;
-const path = require("path");
-const fs_1 = require("fs");
+exports.Migrator = exports.NO_MIGRATIONS = exports.MIGRATION_LOCK_ID = exports.MIGRATION_LOCK_TABLE = exports.MIGRATION_TABLE = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
+const private_symbols_js_1 = require("../util/private-symbols.js");
 exports.MIGRATION_TABLE = 'kysely_migration';
 exports.MIGRATION_LOCK_TABLE = 'kysely_migration_lock';
 exports.MIGRATION_LOCK_ID = 'migration_lock';
 exports.NO_MIGRATIONS = (0, object_utils_js_1.freeze)({ __noMigrations__: true });
-class MigrationModule {
-    #db;
-    #adapter;
-    constructor(db, adapter) {
-        this.#db = db;
-        this.#adapter = adapter;
+/**
+ * A class for running migrations.
+ *
+ * ### Example
+ *
+ * This example uses the {@link FileMigrationProvider} that reads migrations
+ * files from a single folder. You can easily implement your own
+ * {@link MigrationProvider} if you want to provide migrations some
+ * other way.
+ *
+ * ```ts
+ * const migrator = new Migrator({
+ *   db,
+ *   // The constructor signature of FileMigrationProvider is a
+ *   // bit weird to keep Kysely independent of node.js or any
+ *   // other environment.
+ *   provider: new FileMigrationProvider(
+ *     fs.readdir,
+ *     path.join,
+ *     // Path to the folder that contains all your migrations.
+ *     'migrations'
+ *   )
+ * })
+ * ```
+ */
+class Migrator {
+    #props;
+    constructor(props) {
+        this.#props = (0, object_utils_js_1.freeze)(props);
     }
-    async migrateToLatest(migrationsOrFolderPath) {
-        return this.#migrate(migrationsOrFolderPath, ({ migrations }) => migrations.length - 1);
+    /**
+     * Runs all migrations that have not yet been run.
+     *
+     * This method returns a {@link MigrationResultSet} instance and _never_ throws.
+     * {@link MigrationResultSet.error} holds the error if something went wrong.
+     * {@link MigrationResultSet.results} contains information about which migrations
+     * were executed and which failed. See the examples below.
+     *
+     * 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.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * import * as path from 'path'
+     * import * as fs from 'fs/promises'
+     *
+     * const db = new Kysely<Database>({
+     *   dialect: new PostgresDialect({
+     *     host: 'localhost',
+     *     database: 'kysely_test',
+     *   }),
+     * })
+     *
+     * const migrator = new Migrator({
+     *   db,
+     *   // The constructor signature of FileMigrationProvider is a
+     *   // bit weird to keep Kysely independent of node.js or any
+     *   // other environment.
+     *   provider: new FileMigrationProvider(
+     *     fs.readdir,
+     *     path.join,
+     *     // Path to the folder that contains all your migrations.
+     *     'migrations'
+     *   )
+     * })
+     *
+     * const { error, results } = await migrator.migrateToLatest()
+     *
+     * results?.forEach((it) => {
+     *   if (it.status === 'Success') {
+     *     console.log(`migration "${it.migrationName}" was executed successfully`)
+     *   } else if (it.status === 'Error') {
+     *     console.error(`failed to execute migration "${it.migrationName}"`)
+     *   }
+     * })
+     *
+     * if (error) {
+     *   console.error('failed to run `migrateToLatest`')
+     *   console.error(error)
+     * }
+     * ```
+     */
+    async migrateToLatest() {
+        return this.#migrate(({ migrations }) => migrations.length - 1);
     }
-    async migrateTo(migrationsOrFolderPath, targetMigrationName) {
-        return this.#migrate(migrationsOrFolderPath, ({ migrations }) => {
+    /**
+     * Migrate up/down to a specific migration.
+     *
+     * This method returns a {@link MigrationResultSet} instance and _never_ throws.
+     * {@link MigrationResultSet.error} holds the error if something went wrong.
+     * {@link MigrationResultSet.results} contains information about which migrations
+     * were executed and which failed.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * await migrator.migrateTo('some_migration')
+     * ```
+     *
+     * If you specify the name of the first migration, this method migrates
+     * down to the first migration, but doesn't run the `down` method of
+     * the first migration. In case you want to migrate all the way down,
+     * you can use a special constant `NO_MIGRATIONS`:
+     *
+     * ```ts
+     * await migrator.migrateTo(NO_MIGRATIONS)
+     * ```
+     */
+    async migrateTo(targetMigrationName) {
+        return this.#migrate(({ migrations }) => {
             if (targetMigrationName === exports.NO_MIGRATIONS) {
                 return -1;
             }
@@ -30,16 +130,44 @@ class MigrationModule {
             return index;
         });
     }
-    async migrateUp(migrationsOrFolderPath) {
-        return this.#migrate(migrationsOrFolderPath, ({ currentIndex, migrations }) => Math.min(currentIndex + 1, migrations.length - 1));
+    /**
+     * Migrate one step up.
+     *
+     * This method returns a {@link MigrationResultSet} instance and _never_ throws.
+     * {@link MigrationResultSet.error} holds the error if something went wrong.
+     * {@link MigrationResultSet.results} contains information about which migrations
+     * were executed and which failed.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * await migrator.migrateUp()
+     * ```
+     */
+    async migrateUp() {
+        return this.#migrate(({ currentIndex, migrations }) => Math.min(currentIndex + 1, migrations.length - 1));
     }
-    async migrateDown(migrationsOrFolderPath) {
-        return this.#migrate(migrationsOrFolderPath, ({ currentIndex }) => Math.max(currentIndex - 1, -1));
+    /**
+     * Migrate one step down.
+     *
+     * This method returns a {@link MigrationResultSet} instance and _never_ throws.
+     * {@link MigrationResultSet.error} holds the error if something went wrong.
+     * {@link MigrationResultSet.results} contains information about which migrations
+     * were executed and which failed.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * await migrator.migrateDown()
+     * ```
+     */
+    async migrateDown() {
+        return this.#migrate(({ currentIndex }) => Math.max(currentIndex - 1, -1));
     }
-    async #migrate(migrationsOrFolderPath, getTargetMigration) {
+    async #migrate(getTargetMigrationIndex) {
         try {
             await this.#ensureMigrationTablesExists();
-            return await this.#runMigrations(migrationsOrFolderPath, getTargetMigration);
+            return await this.#runMigrations(getTargetMigrationIndex);
         }
         catch (error) {
             if (error instanceof MigrationResultSetError) {
@@ -56,7 +184,7 @@ class MigrationModule {
     async #ensureMigrationTableExists() {
         if (!(await this.#doesTableExists(exports.MIGRATION_TABLE))) {
             try {
-                await this.#db.schema
+                await this.#props.db.schema
                     .createTable(exports.MIGRATION_TABLE)
                     .ifNotExists()
                     .addColumn('name', 'varchar(255)', (col) => col.notNull().primaryKey())
@@ -78,7 +206,7 @@ class MigrationModule {
     async #ensureMigrationLockTableExists() {
         if (!(await this.#doesTableExists(exports.MIGRATION_LOCK_TABLE))) {
             try {
-                await this.#db.schema
+                await this.#props.db.schema
                     .createTable(exports.MIGRATION_LOCK_TABLE)
                     .ifNotExists()
                     .addColumn('id', 'varchar(255)', (col) => col.notNull().primaryKey())
@@ -98,7 +226,7 @@ class MigrationModule {
     async #ensureLockRowExists() {
         if (!(await this.#doesLockRowExists())) {
             try {
-                await this.#db
+                await this.#props.db
                     .insertInto(exports.MIGRATION_LOCK_TABLE)
                     .values({ id: exports.MIGRATION_LOCK_ID })
                     .execute();
@@ -111,28 +239,28 @@ class MigrationModule {
         }
     }
     async #doesTableExists(tableName) {
-        const metadata = await this.#db.introspection.getMetadata({
+        const metadata = await this.#props.db.introspection.getMetadata({
             withInternalKyselyTables: true,
         });
         return !!metadata.tables.find((it) => it.name === tableName);
     }
     async #doesLockRowExists() {
-        const lockRow = await this.#db
+        const lockRow = await this.#props.db
             .selectFrom(exports.MIGRATION_LOCK_TABLE)
             .where('id', '=', exports.MIGRATION_LOCK_ID)
             .select('id')
             .executeTakeFirst();
         return !!lockRow;
     }
-    async #runMigrations(migrationsOrFolderPath, getTargetMigration) {
+    async #runMigrations(getTargetMigrationIndex) {
         const run = async (db) => {
             try {
-                await this.#adapter.acquireMigrationLock(db);
-                const state = await this.#getState(db, migrationsOrFolderPath);
+                await this.#props.db[private_symbols_js_1.PRIVATE_ADAPTER].acquireMigrationLock(db);
+                const state = await this.#getState(db);
                 if (state.migrations.length === 0) {
                     return { results: [] };
                 }
-                const targetIndex = getTargetMigration(state);
+                const targetIndex = getTargetMigrationIndex(state);
                 if (targetIndex === undefined) {
                     return { results: [] };
                 }
@@ -145,18 +273,18 @@ class MigrationModule {
                 return { results: [] };
             }
             finally {
-                await this.#adapter.releaseMigrationLock(db);
+                await this.#props.db[private_symbols_js_1.PRIVATE_ADAPTER].releaseMigrationLock(db);
             }
         };
-        if (this.#adapter.supportsTransactionalDdl) {
-            return this.#db.transaction().execute(run);
+        if (this.#props.db[private_symbols_js_1.PRIVATE_ADAPTER].supportsTransactionalDdl) {
+            return this.#props.db.transaction().execute(run);
         }
         else {
-            return this.#db.connection().execute(run);
+            return this.#props.db.connection().execute(run);
         }
     }
-    async #getState(db, migrationsOrFolderPath) {
-        const migrations = await this.#resolveMigrations(migrationsOrFolderPath);
+    async #getState(db) {
+        const migrations = await this.#resolveMigrations();
         const executedMigrations = await this.#getExecutedMigrations(db);
         this.#ensureMigrationsNotCorrupted(migrations, executedMigrations);
         return (0, object_utils_js_1.freeze)({
@@ -164,10 +292,8 @@ class MigrationModule {
             currentIndex: migrations.findIndex((it) => it.name === (0, object_utils_js_1.getLast)(executedMigrations)),
         });
     }
-    async #resolveMigrations(migrationsOrFolderPath) {
-        const allMigrations = (0, object_utils_js_1.isString)(migrationsOrFolderPath)
-            ? await this.#readMigrationsFromFolder(migrationsOrFolderPath)
-            : migrationsOrFolderPath;
+    async #resolveMigrations() {
+        const allMigrations = await this.#props.provider.getMigrations();
         return Object.keys(allMigrations)
             .sort()
             .map((name) => ({
@@ -175,20 +301,6 @@ class MigrationModule {
             name,
         }));
     }
-    async #readMigrationsFromFolder(migrationsFolderPath) {
-        const files = await fs_1.promises.readdir(migrationsFolderPath);
-        const migrations = {};
-        for (const file of files) {
-            if ((file.endsWith('.js') || file.endsWith('.ts')) &&
-                !file.endsWith('.d.ts')) {
-                const migration = await Promise.resolve().then(() => require(path.join(migrationsFolderPath, file)));
-                if (isMigration(migration)) {
-                    migrations[file.substring(0, file.length - 3)] = migration;
-                }
-            }
-        }
-        return migrations;
-    }
     async #getExecutedMigrations(db) {
         const executedMigrations = await db
             .selectFrom(exports.MIGRATION_TABLE)
@@ -204,7 +316,7 @@ class MigrationModule {
             }
         }
         // Now we know all executed migrations exist in the `migrations` list.
-        // Next we need to make sure that the executed migrations are the first
+        // Next we need to make sure that the executed migratiosns are the first
         // ones in the migration list.
         for (let i = 0; i < executedMigrations.length; ++i) {
             if (migrations[i].name !== executedMigrations[i]) {
@@ -292,7 +404,7 @@ class MigrationModule {
         return { results };
     }
 }
-exports.MigrationModule = MigrationModule;
+exports.Migrator = Migrator;
 class MigrationResultSetError extends Error {
     #resultSet;
     constructor(result) {
@@ -303,6 +415,3 @@ class MigrationResultSetError extends Error {
         return this.#resultSet;
     }
 }
-function isMigration(obj) {
-    return (0, object_utils_js_1.isObject)(obj) && (0, object_utils_js_1.isFunction)(obj.up);
-}

package/dist/cjs/operation-node/check-constraint-node.d.ts

@@ -11,5 +11,5 @@ export interface CheckConstraintNode extends OperationNode {
  */
 export declare const CheckConstraintNode: Readonly<{
     is(node: OperationNode): node is CheckConstraintNode;
-    create(expressionSql: string, constraintName?: string | undefined): CheckConstraintNode;
+    create(expression: RawNode, constraintName?: string | undefined): CheckConstraintNode;
 }>;

package/dist/cjs/operation-node/check-constraint-node.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CheckConstraintNode = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
-const raw_node_js_1 = require("./raw-node.js");
 const identifier_node_js_1 = require("./identifier-node.js");
 /**
  * @internal
@@ -11,10 +10,10 @@ exports.CheckConstraintNode = (0, object_utils_js_1.freeze)({
     is(node) {
         return node.kind === 'CheckConstraintNode';
     },
-    create(expressionSql, constraintName) {
+    create(expression, constraintName) {
         return (0, object_utils_js_1.freeze)({
             kind: 'CheckConstraintNode',
-            expression: raw_node_js_1.RawNode.createWithSql(expressionSql),
+            expression,
             name: constraintName ? identifier_node_js_1.IdentifierNode.create(constraintName) : undefined,
         });
     },

package/dist/cjs/operation-node/column-definition-node.d.ts

@@ -2,7 +2,7 @@ import { CheckConstraintNode } from './check-constraint-node.js';
 import { ColumnNode } from './column-node.js';
 import { DataTypeNode } from './data-type-node.js';
 import { DefaultValueNode } from './default-value-node.js';
-import { GeneratedAlwaysAsNode } from './generated-always-as-node.js';
+import { GeneratedNode } from './generated-node.js';
 import { OperationNode } from './operation-node.js';
 import { RawNode } from './raw-node.js';
 import { ReferencesNode } from './references-node.js';
@@ -19,7 +19,7 @@ export interface ColumnDefinitionNode extends OperationNode {
     readonly notNull?: boolean;
     readonly defaultTo?: DefaultValueNode;
     readonly check?: CheckConstraintNode;
-    readonly generatedAlwaysAs?: GeneratedAlwaysAsNode;
+    readonly generated?: GeneratedNode;
     readonly unsigned?: boolean;
 }
 /**

package/dist/cjs/operation-node/data-type-node.d.ts

@@ -1,5 +1,5 @@
 import { OperationNode } from './operation-node.js';
-export declare type ColumnDataType = 'varchar' | `varchar(${number})` | 'text' | 'integer' | 'int2' | 'int4' | 'int8' | 'bigint' | 'boolean' | 'real' | 'double precision' | 'float4' | 'float8' | 'decimal' | `decimal(${number}, ${number})` | 'numeric' | `numeric(${number}, ${number})` | 'binary' | 'date' | 'datetime' | 'time' | 'timetz' | 'timestamp' | 'timestamptz' | 'serial' | 'bigserial' | 'uuid' | 'json' | 'jsonb';
+export declare type ColumnDataType = 'varchar' | `varchar(${number})` | 'text' | 'integer' | 'int2' | 'int4' | 'int8' | 'bigint' | 'boolean' | 'real' | 'double precision' | 'float4' | 'float8' | 'decimal' | `decimal(${number}, ${number})` | 'numeric' | `numeric(${number}, ${number})` | 'binary' | 'date' | 'datetime' | 'time' | 'timetz' | 'timestamp' | 'timestamptz' | 'serial' | 'bigserial' | 'uuid' | 'json' | 'jsonb' | 'blob';
 export declare type DataTypeParams = Omit<DataTypeNode, 'kind' | 'dataType'>;
 export interface DataTypeNode extends OperationNode {
     readonly kind: 'DataTypeNode';

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

@@ -0,0 +1,20 @@
+import { OperationNode } from './operation-node.js';
+import { RawNode } from './raw-node.js';
+export declare type GeneratedNodeParams = Omit<GeneratedNode, 'kind' | 'expression'>;
+export interface GeneratedNode extends OperationNode {
+    readonly kind: 'GeneratedNode';
+    readonly byDefault?: boolean;
+    readonly always?: boolean;
+    readonly identity?: boolean;
+    readonly stored?: boolean;
+    readonly expression?: RawNode;
+}
+/**
+ * @internal
+ */
+export declare const GeneratedNode: Readonly<{
+    is(node: OperationNode): node is GeneratedNode;
+    create(params: GeneratedNodeParams): GeneratedNode;
+    createWithExpression(expression: RawNode): GeneratedNode;
+    cloneWith(node: GeneratedNode, params: GeneratedNodeParams): GeneratedNode;
+}>;

package/dist/cjs/operation-node/generated-node.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GeneratedNode = void 0;
+const object_utils_js_1 = require("../util/object-utils.js");
+/**
+ * @internal
+ */
+exports.GeneratedNode = (0, object_utils_js_1.freeze)({
+    is(node) {
+        return node.kind === 'GeneratedNode';
+    },
+    create(params) {
+        return (0, object_utils_js_1.freeze)({
+            kind: 'GeneratedNode',
+            ...params,
+        });
+    },
+    createWithExpression(expression) {
+        return (0, object_utils_js_1.freeze)({
+            kind: 'GeneratedNode',
+            always: true,
+            expression,
+        });
+    },
+    cloneWith(node, params) {
+        return (0, object_utils_js_1.freeze)({
+            ...node,
+            ...params,
+        });
+    },
+});

package/dist/cjs/operation-node/on-conflict-node.d.ts

@@ -1,13 +1,19 @@
 import { ColumnNode } from './column-node.js';
 import { ColumnUpdateNode } from './column-update-node.js';
 import { IdentifierNode } from './identifier-node.js';
+import { FilterExpressionNode } from './operation-node-utils.js';
 import { OperationNode } from './operation-node.js';
-export declare type OnConflictNodeProps = Omit<OnConflictNode, 'kind'>;
+import { RawNode } from './raw-node.js';
+import { WhereNode } from './where-node.js';
+export declare type OnConflictNodeProps = Omit<OnConflictNode, 'kind' | 'indexWhere' | 'updateWhere'>;
 export interface OnConflictNode extends OperationNode {
     readonly kind: 'OnConflictNode';
     readonly columns?: ReadonlyArray<ColumnNode>;
     readonly constraint?: IdentifierNode;
+    readonly indexExpression?: RawNode;
+    readonly indexWhere?: WhereNode;
     readonly updates?: ReadonlyArray<ColumnUpdateNode>;
+    readonly updateWhere?: WhereNode;
     readonly doNothing?: boolean;
 }
 /**
@@ -15,5 +21,10 @@ export interface OnConflictNode extends OperationNode {
  */
 export declare const OnConflictNode: Readonly<{
     is(node: OperationNode): node is OnConflictNode;
-    create(props: OnConflictNodeProps): OnConflictNode;
+    create(): OnConflictNode;
+    cloneWith(node: OnConflictNode, props: OnConflictNodeProps): OnConflictNode;
+    cloneWithIndexWhere(node: OnConflictNode, filter: FilterExpressionNode): OnConflictNode;
+    cloneWithIndexOrWhere(node: OnConflictNode, filter: FilterExpressionNode): OnConflictNode;
+    cloneWithUpdateWhere(node: OnConflictNode, filter: FilterExpressionNode): OnConflictNode;
+    cloneWithUpdateOrWhere(node: OnConflictNode, filter: FilterExpressionNode): OnConflictNode;
 }>;

package/dist/cjs/operation-node/on-conflict-node.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnConflictNode = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
+const where_node_js_1 = require("./where-node.js");
 /**
  * @internal
  */
@@ -9,10 +10,47 @@ exports.OnConflictNode = (0, object_utils_js_1.freeze)({
     is(node) {
         return node.kind === 'OnConflictNode';
     },
-    create(props) {
+    create() {
         return (0, object_utils_js_1.freeze)({
             kind: 'OnConflictNode',
+        });
+    },
+    cloneWith(node, props) {
+        return (0, object_utils_js_1.freeze)({
+            ...node,
             ...props,
         });
     },
+    cloneWithIndexWhere(node, filter) {
+        return (0, object_utils_js_1.freeze)({
+            ...node,
+            indexWhere: node.indexWhere
+                ? where_node_js_1.WhereNode.cloneWithFilter(node.indexWhere, 'And', filter)
+                : where_node_js_1.WhereNode.create(filter),
+        });
+    },
+    cloneWithIndexOrWhere(node, filter) {
+        return (0, object_utils_js_1.freeze)({
+            ...node,
+            indexWhere: node.indexWhere
+                ? where_node_js_1.WhereNode.cloneWithFilter(node.indexWhere, 'Or', filter)
+                : where_node_js_1.WhereNode.create(filter),
+        });
+    },
+    cloneWithUpdateWhere(node, filter) {
+        return (0, object_utils_js_1.freeze)({
+            ...node,
+            updateWhere: node.updateWhere
+                ? where_node_js_1.WhereNode.cloneWithFilter(node.updateWhere, 'And', filter)
+                : where_node_js_1.WhereNode.create(filter),
+        });
+    },
+    cloneWithUpdateOrWhere(node, filter) {
+        return (0, object_utils_js_1.freeze)({
+            ...node,
+            updateWhere: node.updateWhere
+                ? where_node_js_1.WhereNode.cloneWithFilter(node.updateWhere, 'Or', filter)
+                : where_node_js_1.WhereNode.create(filter),
+        });
+    },
 });

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

@@ -61,7 +61,7 @@ import { OnDuplicateKeyNode } from './on-duplicate-key-node.js';
 import { UnionNode } from './union-node.js';
 import { CreateViewNode } from './create-view-node.js';
 import { DropViewNode } from './drop-view-node.js';
-import { GeneratedAlwaysAsNode } from './generated-always-as-node.js';
+import { GeneratedNode } from './generated-node.js';
 import { DefaultValueNode } from './default-value-node.js';
 import { OnNode } from './on-node.js';
 import { ValuesNode } from './values-node.js';
@@ -156,7 +156,7 @@ export declare class OperationNodeTransformer {
     protected transformDropConstraint(node: DropConstraintNode): DropConstraintNode;
     protected transformCreateView(node: CreateViewNode): CreateViewNode;
     protected transformDropView(node: DropViewNode): DropViewNode;
-    protected transformGeneratedAlwaysAs(node: GeneratedAlwaysAsNode): GeneratedAlwaysAsNode;
+    protected transformGenerated(node: GeneratedNode): GeneratedNode;
     protected transformDefaultValue(node: DefaultValueNode): DefaultValueNode;
     protected transformOn(node: OnNode): OnNode;
     protected transformDataType(node: DataTypeNode): DataTypeNode;

package/dist/cjs/operation-node/operation-node-transformer.js

@@ -96,7 +96,7 @@ class OperationNodeTransformer {
         UnionNode: this.transformUnion.bind(this),
         CreateViewNode: this.transformCreateView.bind(this),
         DropViewNode: this.transformDropView.bind(this),
-        GeneratedAlwaysAsNode: this.transformGeneratedAlwaysAs.bind(this),
+        GeneratedNode: this.transformGenerated.bind(this),
         DefaultValueNode: this.transformDefaultValue.bind(this),
         OnNode: this.transformOn.bind(this),
         ValuesNode: this.transformValues.bind(this),
@@ -288,7 +288,7 @@ class OperationNodeTransformer {
             unsigned: node.unsigned,
             defaultTo: this.transformNode(node.defaultTo),
             check: this.transformNode(node.check),
-            generatedAlwaysAs: this.transformNode(node.generatedAlwaysAs),
+            generated: this.transformNode(node.generated),
         };
     }
     transformAddColumn(node) {
@@ -364,7 +364,10 @@ class OperationNodeTransformer {
             kind: 'OnConflictNode',
             columns: this.transformNodeList(node.columns),
             constraint: this.transformNode(node.constraint),
+            indexExpression: this.transformNode(node.indexExpression),
+            indexWhere: this.transformNode(node.indexWhere),
             updates: this.transformNodeList(node.updates),
+            updateWhere: this.transformNode(node.updateWhere),
             doNothing: node.doNothing,
         };
     }
@@ -563,11 +566,14 @@ class OperationNodeTransformer {
             materialized: node.materialized,
         };
     }
-    transformGeneratedAlwaysAs(node) {
+    transformGenerated(node) {
         return {
-            kind: 'GeneratedAlwaysAsNode',
-            expression: this.transformNode(node.expression),
+            kind: 'GeneratedNode',
+            byDefault: node.byDefault,
+            always: node.always,
+            identity: node.identity,
             stored: node.stored,
+            expression: this.transformNode(node.expression),
         };
     }
     transformDefaultValue(node) {

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

@@ -61,7 +61,7 @@ import { OnDuplicateKeyNode } from './on-duplicate-key-node.js';
 import { UnionNode } from './union-node.js';
 import { CreateViewNode } from './create-view-node.js';
 import { DropViewNode } from './drop-view-node.js';
-import { GeneratedAlwaysAsNode } from './generated-always-as-node.js';
+import { GeneratedNode } from './generated-node.js';
 import { DefaultValueNode } from './default-value-node.js';
 import { OnNode } from './on-node.js';
 import { ValuesNode } from './values-node.js';
@@ -132,7 +132,7 @@ export declare abstract class OperationNodeVisitor {
     protected abstract visitOperator(node: OperatorNode): void;
     protected abstract visitCreateView(node: CreateViewNode): void;
     protected abstract visitDropView(node: DropViewNode): void;
-    protected abstract visitGeneratedAlwaysAs(node: GeneratedAlwaysAsNode): void;
+    protected abstract visitGenerated(node: GeneratedNode): void;
     protected abstract visitDefaultValue(node: DefaultValueNode): void;
     protected abstract visitOn(node: OnNode): void;
     protected abstract visitValues(node: ValuesNode): void;

package/dist/cjs/operation-node/operation-node-visitor.js

@@ -70,7 +70,7 @@ class OperationNodeVisitor {
         UnionNode: this.visitUnion.bind(this),
         CreateViewNode: this.visitCreateView.bind(this),
         DropViewNode: this.visitDropView.bind(this),
-        GeneratedAlwaysAsNode: this.visitGeneratedAlwaysAs.bind(this),
+        GeneratedNode: this.visitGenerated.bind(this),
         DefaultValueNode: this.visitDefaultValue.bind(this),
         OnNode: this.visitOn.bind(this),
         ValuesNode: this.visitValues.bind(this),

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

@@ -1,4 +1,4 @@
-export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedAlwaysAsNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode';
+export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode';
 export interface OperationNode {
     readonly kind: OperationNodeKind;
 }

package/dist/cjs/parser/insert-values-parser.d.ts

@@ -1,12 +1,12 @@
 import { ColumnNode } from '../operation-node/column-node.js';
-import { GeneratedPlaceholder } from '../util/type-utils.js';
 import { ParseContext } from './parse-context.js';
 import { ValueExpression } from './value-parser.js';
 import { ValuesNode } from '../operation-node/values-node.js';
+import { NonNullableInsertKeys, NullableInsertKeys, InsertType } from '../util/column-type.js';
 export declare type InsertObject<DB, TB extends keyof DB> = {
-    [C in keyof DB[TB]]: InsertValueExpression<DB, TB, DB[TB][C]>;
+    [C in NonNullableInsertKeys<DB[TB]>]: ValueExpression<DB, TB, InsertType<DB[TB][C]>>;
+} & {
+    [C in NullableInsertKeys<DB[TB]>]?: ValueExpression<DB, TB, InsertType<DB[TB][C]>>;
 };
 export declare type InsertObjectOrList<DB, TB extends keyof DB> = InsertObject<DB, TB> | ReadonlyArray<InsertObject<DB, TB>>;
-declare type InsertValueExpression<DB, TB extends keyof DB, T> = ValueExpression<DB, TB, T> | GeneratedPlaceholder;
 export declare function parseInsertObjectOrList(ctx: ParseContext, args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ValuesNode];
-export {};