kysely 0.15.3 → 0.16.3

package/README.md

@@ -303,9 +303,6 @@ need to depend on a typescript compiler, which most production environments don'
 have. You will probably want to add a simple migration script to your projects like this:
 
 ```ts
-import * as path from 'path'
-import * as fs from 'fs/promises'
-
 import {
   Kysely,
   Migrator,
@@ -323,14 +320,9 @@ async function migrateToLatest() {
 
   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'
+      'some/path/to/migrations'
     )
   })
 

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

@@ -4,7 +4,7 @@ import { ColumnDataType } from '../operation-node/data-type-node.js';
  */
 export interface DatabaseIntrospector {
     /**
-     * Get the database metadata such as the names of the tables and columns.
+     * Get the database metadata such as table and column names.
      */
     getMetadata(options?: DatabaseMetadataOptions): Promise<DatabaseMetadata>;
 }

package/dist/cjs/dialect/dialect-adapter-base.d.ts

@@ -20,7 +20,7 @@ export declare abstract class DialectAdapterBase implements DialectAdapter {
     get supportsReturning(): boolean;
     /**
      * This method is used to acquire a lock for the migrations so that
-     * it's not possible for two migration processes to run in parallel.
+     * it's not possible for two migration operations to run in parallel.
      *
      * Most dialects have explicit locks that can be used, like advisory locks
      * in PostgreSQL and the get_lock function in MySQL.

package/dist/cjs/dialect/dialect-adapter.d.ts

@@ -21,7 +21,7 @@ export interface DialectAdapter {
     readonly supportsReturning: boolean;
     /**
      * This method is used to acquire a lock for the migrations so that
-     * it's not possible for two migration processes to run in parallel.
+     * it's not possible for two migration operations to run in parallel.
      *
      * Most dialects have explicit locks that can be used, like advisory locks
      * in PostgreSQL and the get_lock function in MySQL.

package/dist/cjs/dialect/dialect.d.ts

@@ -24,8 +24,8 @@ export interface Dialect {
      */
     createAdapter(): DialectAdapter;
     /**
-     * Creates a database introspector that can be used to get the database metadata
-     * such as the tables and columns that exist in the database.
+     * Creates a database introspector that can be used to get database metadata
+     * such as the table names and column names of those tables.
      *
      * `db` never has any plugins installed. It's created using
      * {@link Kysely.withoutPlugins}.

package/dist/cjs/dialect/mysql/mysql-adapter.d.ts

@@ -14,7 +14,7 @@ export declare class MysqlAdapter extends DialectAdapterBase {
     get supportsReturning(): boolean;
     /**
      * This method is used to acquire a lock for the migrations so that
-     * it's not possible for two migration processes to run in parallel.
+     * it's not possible for two migration operations to run in parallel.
      *
      * Most dialects have explicit locks that can be used, like advisory locks
      * in PostgreSQL and the get_lock function in MySQL.

package/dist/cjs/dialect/mysql/mysql-dialect.d.ts

@@ -28,8 +28,8 @@ export declare class MysqlDialect implements Dialect {
      */
     createAdapter(): DialectAdapter;
     /**
-     * Creates a database introspector that can be used to get the database metadata
-     * such as the tables and columns that exist in the database.
+     * Creates a database introspector that can be used to get database metadata
+     * such as the table names and column names of those tables.
      *
      * `db` never has any plugins installed. It's created using
      * {@link Kysely.withoutPlugins}.

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

@@ -4,7 +4,7 @@ export declare class MysqlIntrospector implements DatabaseIntrospector {
     #private;
     constructor(db: Kysely<any>);
     /**
-     * Get the database metadata such as the names of the tables and columns.
+     * Get the database metadata such as table and column names.
      */
     getMetadata(options?: DatabaseMetadataOptions): Promise<DatabaseMetadata>;
 }

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

@@ -14,7 +14,7 @@ export declare class PostgresAdapter extends DialectAdapterBase {
     get supportsReturning(): boolean;
     /**
      * This method is used to acquire a lock for the migrations so that
-     * it's not possible for two migration processes to run in parallel.
+     * it's not possible for two migration operations to run in parallel.
      *
      * Most dialects have explicit locks that can be used, like advisory locks
      * in PostgreSQL and the get_lock function in MySQL.

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

@@ -34,8 +34,8 @@ export declare class PostgresDialect implements Dialect {
      */
     createAdapter(): DialectAdapter;
     /**
-     * Creates a database introspector that can be used to get the database metadata
-     * such as the tables and columns that exist in the database.
+     * Creates a database introspector that can be used to get database metadata
+     * such as the table names and column names of those tables.
      *
      * `db` never has any plugins installed. It's created using
      * {@link Kysely.withoutPlugins}.

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

@@ -4,7 +4,7 @@ export declare class PostgresIntrospector implements DatabaseIntrospector {
     #private;
     constructor(db: Kysely<any>);
     /**
-     * Get the database metadata such as the names of the tables and columns.
+     * Get the database metadata such as table and column names.
      */
     getMetadata(options?: DatabaseMetadataOptions): Promise<DatabaseMetadata>;
 }

package/dist/cjs/dialect/sqlite/sqlite-adapter.d.ts

@@ -13,7 +13,7 @@ export declare class SqliteAdapter implements DialectAdapterBase {
     get supportsReturning(): boolean;
     /**
      * This method is used to acquire a lock for the migrations so that
-     * it's not possible for two migration processes to run in parallel.
+     * it's not possible for two migration operations to run in parallel.
      *
      * Most dialects have explicit locks that can be used, like advisory locks
      * in PostgreSQL and the get_lock function in MySQL.

package/dist/cjs/dialect/sqlite/sqlite-dialect.d.ts

@@ -28,8 +28,8 @@ export declare class SqliteDialect implements Dialect {
      */
     createAdapter(): DialectAdapter;
     /**
-     * Creates a database introspector that can be used to get the database metadata
-     * such as the tables and columns that exist in the database.
+     * Creates a database introspector that can be used to get database metadata
+     * such as the table names and column names of those tables.
      *
      * `db` never has any plugins installed. It's created using
      * {@link Kysely.withoutPlugins}.

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

@@ -4,7 +4,7 @@ export declare class SqliteIntrospector implements DatabaseIntrospector {
     #private;
     constructor(db: Kysely<any>);
     /**
-     * Get the database metadata such as the names of the tables and columns.
+     * Get the database metadata such as table and column names.
      */
     getMetadata(options?: DatabaseMetadataOptions): Promise<DatabaseMetadata>;
 }

package/dist/cjs/kysely.js

@@ -59,9 +59,11 @@ const private_symbols_js_1 = require("./util/private-symbols.js");
 class Kysely extends query_creator_js_1.QueryCreator {
     #props;
     constructor(args) {
+        let superProps;
+        let props;
         if (isKyselyProps(args)) {
-            super({ executor: args.executor, parseContext: args.parseContext });
-            this.#props = (0, object_utils_js_1.freeze)({ ...args });
+            superProps = { executor: args.executor, parseContext: args.parseContext };
+            props = { ...args };
         }
         else {
             const dialect = args.dialect;
@@ -73,15 +75,17 @@ class Kysely extends query_creator_js_1.QueryCreator {
             const runtimeDriver = new runtime_driver_js_1.RuntimeDriver(driver, log);
             const connectionProvider = new default_connection_provider_js_1.DefaultConnectionProvider(runtimeDriver);
             const executor = new default_query_executor_js_1.DefaultQueryExecutor(compiler, connectionProvider, args.plugins ?? []);
-            super({ executor, parseContext });
-            this.#props = (0, object_utils_js_1.freeze)({
+            superProps = { executor, parseContext };
+            props = {
                 config: args,
                 executor,
                 dialect,
                 driver: runtimeDriver,
                 parseContext,
-            });
+            };
         }
+        super(superProps);
+        this.#props = (0, object_utils_js_1.freeze)(props);
     }
     /**
      * Returns the {@link SchemaModule} module for building database schema.

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

@@ -1,41 +1,18 @@
 import { Migration, MigrationProvider } from './migrator.js';
-/**
- * A function that takes a folder path and returns names of the
- * files insider that folder.
- */
-export declare type ReadDir = (migrationFolderPath: string) => Promise<string[]>;
-/**
- * A function that combines two file path parts into a single file path.
- *
- * ```ts
- * joinPath('/some/path', 'file.ts')
- * // ==> '/some/path/file.ts'
- * ```
- */
-export declare type JoinPath = (part1: string, part2: string) => string;
 /**
  * Reads all migrations from a folder.
  *
- * You need to provide a function for reading files in a folder and a function for
- * joining file paths together. The API is like this to make Kysely independent of
- * node.js or any other environment. See the example usage on node.js below.
- *
  * ### Examples
  *
  * ```ts
- * import * as path from 'path'
- * import * as fs from 'fs/promises'
- *
  * new FileMigrationProvider(
- *   fs.readdir,
- *   path.join,
- *   path.join(__dirname, 'migrations')
+ *   'path/to/migrations/folder'
  * )
  * ```
  */
 export declare class FileMigrationProvider implements MigrationProvider {
     #private;
-    constructor(readDir: ReadDir, joinPath: JoinPath, migrationFolderPath: string);
+    constructor(migrationFolderPath: string);
     /**
      * Returns all migrations, old and new.
      *

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

@@ -5,39 +5,30 @@ const object_utils_js_1 = require("../util/object-utils.js");
 /**
  * Reads all migrations from a folder.
  *
- * You need to provide a function for reading files in a folder and a function for
- * joining file paths together. The API is like this to make Kysely independent of
- * node.js or any other environment. See the example usage on node.js below.
- *
  * ### Examples
  *
  * ```ts
- * import * as path from 'path'
- * import * as fs from 'fs/promises'
- *
  * new FileMigrationProvider(
- *   fs.readdir,
- *   path.join,
- *   path.join(__dirname, 'migrations')
+ *   'path/to/migrations/folder'
  * )
  * ```
  */
 class FileMigrationProvider {
-    #readDir;
-    #joinPath;
     #migrationFolderPath;
-    constructor(readDir, joinPath, migrationFolderPath) {
-        this.#readDir = readDir;
-        this.#joinPath = joinPath;
+    constructor(migrationFolderPath) {
         this.#migrationFolderPath = migrationFolderPath;
     }
     async getMigrations() {
+        // Import these dynamically so that we don't have any top level
+        // node dependencies.
+        const fs = await Promise.resolve().then(() => require('fs/promises'));
+        const path = await Promise.resolve().then(() => require('path'));
         const migrations = {};
-        const files = await this.#readDir(this.#migrationFolderPath);
+        const files = await fs.readdir(this.#migrationFolderPath);
         for (const fileName of files) {
             if ((fileName.endsWith('.js') || fileName.endsWith('.ts')) &&
                 !fileName.endsWith('.d.ts')) {
-                const migration = await Promise.resolve().then(() => require(this.#joinPath(this.#migrationFolderPath, fileName)));
+                const migration = await Promise.resolve().then(() => require(path.join(this.#migrationFolderPath, fileName)));
                 if (isMigration(migration)) {
                     migrations[fileName.substring(0, fileName.length - 3)] = migration;
                 }

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

@@ -26,14 +26,9 @@ export interface Migration {
  * ```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'
+ *     'some/path/to/migrations'
  *   )
  * })
  * ```
@@ -57,9 +52,6 @@ export declare class Migrator {
      * ### Examples
      *
      * ```ts
-     * import * as path from 'path'
-     * import * as fs from 'fs/promises'
-     *
      * const db = new Kysely<Database>({
      *   dialect: new PostgresDialect({
      *     host: 'localhost',
@@ -69,14 +61,9 @@ export declare class Migrator {
      *
      * 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'
+     *     'some/path/to/migrations'
      *   )
      * })
      *

package/dist/cjs/migration/migrator.js

@@ -20,14 +20,9 @@ exports.NO_MIGRATIONS = (0, object_utils_js_1.freeze)({ __noMigrations__: true }
  * ```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'
+ *     'some/path/to/migrations'
  *   )
  * })
  * ```
@@ -53,9 +48,6 @@ class Migrator {
      * ### Examples
      *
      * ```ts
-     * import * as path from 'path'
-     * import * as fs from 'fs/promises'
-     *
      * const db = new Kysely<Database>({
      *   dialect: new PostgresDialect({
      *     host: 'localhost',
@@ -65,14 +57,9 @@ class Migrator {
      *
      * 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'
+     *     'some/path/to/migrations'
      *   )
      * })
      *

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

@@ -1,5 +1,5 @@
-import { CheckConstraintNode } from "./check-constraint-node";
-import { ForeignKeyConstraintNode } from "./foreign-key-constraint-node";
-import { PrimaryKeyConstraintNode } from "./primary-constraint-node";
-import { UniqueConstraintNode } from "./unique-constraint-node";
+import { CheckConstraintNode } from './check-constraint-node.js';
+import { ForeignKeyConstraintNode } from './foreign-key-constraint-node.js';
+import { PrimaryKeyConstraintNode } from './primary-constraint-node.js';
+import { UniqueConstraintNode } from './unique-constraint-node.js';
 export declare type ConstraintNode = PrimaryKeyConstraintNode | UniqueConstraintNode | CheckConstraintNode | ForeignKeyConstraintNode;

package/dist/cjs/parser/join-parser.d.ts

@@ -1,11 +1,11 @@
 import { JoinNode, JoinType } from '../operation-node/join-node.js';
 import { AnyColumn, AnyColumnWithTable } from '../util/type-utils.js';
-import { ExtractAliasFromTableExpression, TableExpressionDatabase } from './table-parser.js';
+import { TableExpressionDatabase, TableExpressionTables } from './table-parser.js';
 import { JoinBuilder } from '../query-builder/join-builder.js';
 import { ParseContext } from './parse-context.js';
 export declare type JoinReferenceExpression<DB, TB extends keyof DB, TE> = AnyJoinColumn<DB, TB, TE> | AnyJoinColumnWithTable<DB, TB, TE>;
-export declare type JoinCallbackExpression<DB, TB extends keyof DB, TE> = (join: JoinBuilder<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>>) => JoinBuilder<any, any>;
-declare type AnyJoinColumn<DB, TB extends keyof DB, TE> = AnyColumn<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>>;
-declare type AnyJoinColumnWithTable<DB, TB extends keyof DB, TE> = AnyColumnWithTable<TableExpressionDatabase<DB, TE>, TB | ExtractAliasFromTableExpression<DB, TE>>;
+export declare type JoinCallbackExpression<DB, TB extends keyof DB, TE> = (join: JoinBuilder<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>>) => JoinBuilder<any, any>;
+declare type AnyJoinColumn<DB, TB extends keyof DB, TE> = AnyColumn<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>>;
+declare type AnyJoinColumnWithTable<DB, TB extends keyof DB, TE> = AnyColumnWithTable<TableExpressionDatabase<DB, TE>, TableExpressionTables<DB, TB, TE>>;
 export declare function parseJoin(ctx: ParseContext, joinType: JoinType, args: any[]): JoinNode;
 export {};

package/dist/cjs/plugin/camel-case/camel-case-plugin.js

@@ -111,5 +111,5 @@ class CamelCasePlugin {
 }
 exports.CamelCasePlugin = CamelCasePlugin;
 function canMap(obj) {
-    return (0, object_utils_js_1.isObject)(obj) && !(obj instanceof Date) && !Buffer.isBuffer(obj);
+    return (0, object_utils_js_1.isObject)(obj) && !(0, object_utils_js_1.isDate)(obj) && !(0, object_utils_js_1.isBuffer)(obj);
 }

package/dist/cjs/query-builder/delete-query-builder.d.ts

@@ -473,13 +473,13 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      * and "pet"."name" = $1
      * ```
      *
-     * You can join a subquery by providing a function as the first
-     * argument:
+     * You can join a subquery by providing a select query (or a callback)
+     * as the first argument:
      *
      * ```ts
      * await db.selectFrom('person')
      *   .innerJoin(
-     *     (qb) => qb.selectFrom('pet')
+     *     qb.selectFrom('pet')
      *       .select(['owner_id', 'name'])
      *       .where('name', '=', 'Doggo')
      *       .as('doggos'),

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

@@ -3,6 +3,8 @@ import { TableExpression, TableExpressionDatabase, TableExpressionTables } from
 import { NoopQueryExecutor } from '../query-executor/noop-query-executor.js';
 import { ParseContext } from '../parser/parse-context.js';
 import { FunctionBuilder } from './function-builder.js';
+import { RawBuilder } from '../index-nodeless.js';
+import { ExtractTypeFromReferenceExpression, StringReference } from '../parser/reference-parser.js';
 export declare class ExpressionBuilder<DB, TB extends keyof DB> {
     #private;
     constructor(props: ExpressionBuilderProps);
@@ -44,6 +46,8 @@ export declare class ExpressionBuilder<DB, TB extends keyof DB> {
      * The query builder returned by this method is typed in a way that you can refer to
      * all tables of the parent query in addition to the subquery's tables.
      *
+     * This method accepts all the same inputs as {@link QueryCreator.selectFrom}.
+     *
      * ### Examples
      *
      * This example shows that you can refer to both `pet.owner_id` and `person.id`
@@ -86,6 +90,44 @@ export declare class ExpressionBuilder<DB, TB extends keyof DB> {
      * See {@link QueryCreator.withSchema}
      */
     withSchema(schema: string): ExpressionBuilder<DB, TB>;
+    /**
+     * See {@link QueryCreator.raw}.
+     */
+    raw<T = unknown>(sql: string, parameters?: unknown[]): RawBuilder<T>;
+    /**
+     * This can be used to reference columns.
+     *
+     * ### Examples
+     *
+     * In the next example we use the `ref` method to reference
+     * columns of the virtual table `excluded` in a type-safe way
+     * to create an upsert operation:
+     *
+     * ```ts
+     * db.insertInto('person')
+     *   .values(person)
+     *   .onConflict(oc => oc
+     *     .column('id')
+     *     .doUpdateSet({
+     *       first_name: (eb) => eb.ref('excluded.first_name'),
+     *       last_name: (eb) => eb.ref('excluded.last_name')
+     *     })
+     *   )
+     * ```
+     *
+     * In the next example we use `ref` in a raw expression. Unless you
+     * want to be as type-safe as possible, this is probably overkill:
+     *
+     * ```ts
+     * db.update('pet').set({
+     *   name: (eb) => eb.raw('concat(?, ?)', [
+     *     eb.ref('pet.name'),
+     *     suffix,
+     *   ])
+     * })
+     * ```
+     */
+    ref<RE extends StringReference<DB, TB>>(reference: RE): RawBuilder<ExtractTypeFromReferenceExpression<DB, TB, RE>>;
 }
 export interface ExpressionBuilderProps {
     readonly executor: NoopQueryExecutor;

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

@@ -8,6 +8,7 @@ const with_schema_plugin_js_1 = require("../plugin/with-schema/with-schema-plugi
 const query_id_js_1 = require("../util/query-id.js");
 const object_utils_js_1 = require("../util/object-utils.js");
 const function_builder_js_1 = require("./function-builder.js");
+const index_nodeless_js_1 = require("../index-nodeless.js");
 class ExpressionBuilder {
     #props;
     constructor(props) {
@@ -64,5 +65,52 @@ class ExpressionBuilder {
             executor: this.#props.executor.withPluginAtFront(new with_schema_plugin_js_1.WithSchemaPlugin(schema)),
         });
     }
+    /**
+     * See {@link QueryCreator.raw}.
+     */
+    raw(sql, parameters) {
+        return new index_nodeless_js_1.RawBuilder({
+            queryId: (0, query_id_js_1.createQueryId)(),
+            executor: this.#props.executor,
+            sql,
+            parameters,
+        });
+    }
+    /**
+     * This can be used to reference columns.
+     *
+     * ### Examples
+     *
+     * In the next example we use the `ref` method to reference
+     * columns of the virtual table `excluded` in a type-safe way
+     * to create an upsert operation:
+     *
+     * ```ts
+     * db.insertInto('person')
+     *   .values(person)
+     *   .onConflict(oc => oc
+     *     .column('id')
+     *     .doUpdateSet({
+     *       first_name: (eb) => eb.ref('excluded.first_name'),
+     *       last_name: (eb) => eb.ref('excluded.last_name')
+     *     })
+     *   )
+     * ```
+     *
+     * In the next example we use `ref` in a raw expression. Unless you
+     * want to be as type-safe as possible, this is probably overkill:
+     *
+     * ```ts
+     * db.update('pet').set({
+     *   name: (eb) => eb.raw('concat(?, ?)', [
+     *     eb.ref('pet.name'),
+     *     suffix,
+     *   ])
+     * })
+     * ```
+     */
+    ref(reference) {
+        return this.raw('??', [reference]);
+    }
 }
 exports.ExpressionBuilder = ExpressionBuilder;

package/dist/cjs/query-builder/insert-query-builder.d.ts

@@ -342,6 +342,22 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
      * values ($1, $2)
      * on conflict ("name") do nothing
      * ```
+     *
+     * You can refer to the columns of the virtual `excluded` table
+     * in a type-safe way using a callback and the `ref` method of
+     * `ExpressionBuilder`:
+     *
+     * ```ts
+     * db.insertInto('person')
+     *   .values(person)
+     *   .onConflict(oc => oc
+     *     .column('id')
+     *     .doUpdateSet({
+     *       first_name: (eb) => eb.ref('excluded.first_name'),
+     *       last_name: (eb) => eb.ref('excluded.last_name')
+     *     })
+     *   )
+     * ```
      */
     onConflict(callback: (builder: OnConflictBuilder<DB, TB>) => OnConflictDoNothingBuilder<DB, TB> | OnConflictUpdateBuilder<DB, TB>): InsertQueryBuilder<DB, TB, O>;
     /**

package/dist/cjs/query-builder/insert-query-builder.js

@@ -248,6 +248,22 @@ class InsertQueryBuilder {
      * values ($1, $2)
      * on conflict ("name") do nothing
      * ```
+     *
+     * You can refer to the columns of the virtual `excluded` table
+     * in a type-safe way using a callback and the `ref` method of
+     * `ExpressionBuilder`:
+     *
+     * ```ts
+     * db.insertInto('person')
+     *   .values(person)
+     *   .onConflict(oc => oc
+     *     .column('id')
+     *     .doUpdateSet({
+     *       first_name: (eb) => eb.ref('excluded.first_name'),
+     *       last_name: (eb) => eb.ref('excluded.last_name')
+     *     })
+     *   )
+     * ```
      */
     onConflict(callback) {
         return new InsertQueryBuilder({

package/dist/cjs/query-builder/join-interface.d.ts

@@ -80,13 +80,13 @@ export interface JoinInterface<DB, TB extends keyof DB> {
      * and "pet"."name" = $1
      * ```
      *
-     * You can join a subquery by providing a function as the first
-     * argument:
+     * You can join a subquery by providing a select query (or a callback)
+     * as the first argument:
      *
      * ```ts
      * await db.selectFrom('person')
      *   .innerJoin(
-     *     (qb) => qb.selectFrom('pet')
+     *     qb.selectFrom('pet')
      *       .select(['owner_id', 'name'])
      *       .where('name', '=', 'Doggo')
      *       .as('doggos'),

package/dist/cjs/query-builder/on-conflict-builder.d.ts

@@ -377,14 +377,16 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
      * do update set "first_name" = $3
      * ```
      */
-    doUpdateSet(updates: MutationObject<DB, TB>): OnConflictUpdateBuilder<{
-        [K in keyof DB | 'excluded']: K extends keyof DB ? DB[K] : DB[TB];
-    }, TB | 'excluded'>;
+    doUpdateSet(updates: MutationObject<OnConflictDatabase<DB, TB>, OnConflictTables<TB>>): OnConflictUpdateBuilder<OnConflictDatabase<DB, TB>, OnConflictTables<TB>>;
 }
 export interface OnConflictBuilderProps {
     readonly onConflictNode: OnConflictNode;
     readonly parseContext: ParseContext;
 }
+export declare type OnConflictDatabase<DB, TB extends keyof DB> = {
+    [K in keyof DB | 'excluded']: K extends keyof DB ? DB[K] : DB[TB];
+};
+export declare type OnConflictTables<TB> = TB | 'excluded';
 export declare class OnConflictDoNothingBuilder<DB, TB extends keyof DB> implements OperationNodeSource {
     #private;
     constructor(props: OnConflictBuilderProps);