kysely 0.26.0 → 0.26.1

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

@@ -59,22 +59,24 @@ export interface WhereInterface<DB, TB extends keyof DB> {
      *
      * <!-- siteExample("where", "OR where", 30) -->
      *
-     * To combine conditions using `OR`, you can use the expression builder:
+     * To combine conditions using `OR`, you can use the expression builder.
+     * There are two ways to create `OR` expressions. Both are shown in this
+     * example:
      *
      * ```ts
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll()
-     *   .where(({ or, and, cmpr }) => or([
-     *     and([
-     *       cmpr('first_name', '=', 'Jennifer'),
-     *       cmpr('last_name', '=', 'Aniston')
-     *     ]),
-     *     and([
-     *       cmpr('first_name', '=', 'Sylvester'),
-     *       cmpr('last_name', '=', 'Stallone')
-     *     ])
+     *   // 1. Using the `or` method on the expression builder:
+     *   .where((eb) => eb.or([
+     *     eb('first_name', '=', 'Jennifer'),
+     *     eb('first_name', '=', 'Sylvester')
      *   ]))
+     *   // 2. Chaining expressions using the `or` method on the
+     *   // created expressions:
+     *   .where((eb) =>
+     *     eb('last_name', '=', 'Aniston').or('last_name', '=', 'Stallone')
+     *   )
      *   .execute()
      * ```
      *
@@ -84,9 +86,9 @@ export interface WhereInterface<DB, TB extends keyof DB> {
      * select *
      * from "person"
      * where (
-     *   ("first_name" = $1 AND "last_name" = $2)
-     *   OR
-     *   ("first_name" = $3 AND "last_name" = $4)
+     *   ("first_name" = $1 or "first_name" = $2)
+     *   and
+     *   ("last_name" = $3 or "last_name" = $4)
      * )
      * ```
      *
@@ -95,8 +97,12 @@ export interface WhereInterface<DB, TB extends keyof DB> {
      * You can add expressions conditionally like this:
      *
      * ```ts
+     * import { Expression, SqlBool } from 'kysely'
+     *
      * const firstName: string | undefined = 'Jennifer'
      * const lastName: string | undefined = 'Aniston'
+     * const under18 = true
+     * const over60 = true
      *
      * let query = db
      *   .selectFrom('person')
@@ -112,6 +118,23 @@ export interface WhereInterface<DB, TB extends keyof DB> {
      *   query = query.where('last_name', '=', lastName)
      * }
      *
+     * if (under18 || over60) {
+     *   // Conditional OR expressions can be added like this.
+     *   query = query.where((eb) => {
+     *     const ors: Expression<SqlBool>[] = []
+     *
+     *     if (under18) {
+     *       ors.push(eb('age', '<', 18))
+     *     }
+     *
+     *     if (over60) {
+     *       ors.push(eb('age', '>', 60))
+     *     }
+     *
+     *     return eb.or(ors)
+     *   })
+     * }
+     *
      * const persons = await query.execute()
      * ```
      *
@@ -176,10 +199,10 @@ export interface WhereInterface<DB, TB extends keyof DB> {
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll('person')
-     *   .where(({ cmpr, or, and, not, exists, selectFrom }) => and([
+     *   .where(({ eb, or, and, not, exists, selectFrom }) => and([
      *     or([
-     *       cmpr('first_name', '=', firstName),
-     *       cmpr('age', '<', maxAge)
+     *       eb('first_name', '=', firstName),
+     *       eb('age', '<', maxAge)
      *     ]),
      *     not(exists(
      *       selectFrom('pet')

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

@@ -266,7 +266,7 @@ export interface ExpressionBuilder<DB, TB extends keyof DB> {
      *
      * ```ts
      * db.selectFrom('person')
-     *   .where(({ cmpr, ref }) => cmpr(
+     *   .where(({ eb, ref }) => eb(
      *     ref('address', '->').key('state').key('abbr'),
      *     '=',
      *     'CA'

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

@@ -80,22 +80,24 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      *
      * <!-- siteExample("where", "OR where", 30) -->
      *
-     * To combine conditions using `OR`, you can use the expression builder:
+     * To combine conditions using `OR`, you can use the expression builder.
+     * There are two ways to create `OR` expressions. Both are shown in this
+     * example:
      *
      * ```ts
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll()
-     *   .where(({ or, and, cmpr }) => or([
-     *     and([
-     *       cmpr('first_name', '=', 'Jennifer'),
-     *       cmpr('last_name', '=', 'Aniston')
-     *     ]),
-     *     and([
-     *       cmpr('first_name', '=', 'Sylvester'),
-     *       cmpr('last_name', '=', 'Stallone')
-     *     ])
+     *   // 1. Using the `or` method on the expression builder:
+     *   .where((eb) => eb.or([
+     *     eb('first_name', '=', 'Jennifer'),
+     *     eb('first_name', '=', 'Sylvester')
      *   ]))
+     *   // 2. Chaining expressions using the `or` method on the
+     *   // created expressions:
+     *   .where((eb) =>
+     *     eb('last_name', '=', 'Aniston').or('last_name', '=', 'Stallone')
+     *   )
      *   .execute()
      * ```
      *
@@ -105,9 +107,9 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      * select *
      * from "person"
      * where (
-     *   ("first_name" = $1 AND "last_name" = $2)
-     *   OR
-     *   ("first_name" = $3 AND "last_name" = $4)
+     *   ("first_name" = $1 or "first_name" = $2)
+     *   and
+     *   ("last_name" = $3 or "last_name" = $4)
      * )
      * ```
      *
@@ -116,8 +118,12 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      * You can add expressions conditionally like this:
      *
      * ```ts
+     * import { Expression, SqlBool } from 'kysely'
+     *
      * const firstName: string | undefined = 'Jennifer'
      * const lastName: string | undefined = 'Aniston'
+     * const under18 = true
+     * const over60 = true
      *
      * let query = db
      *   .selectFrom('person')
@@ -133,6 +139,23 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      *   query = query.where('last_name', '=', lastName)
      * }
      *
+     * if (under18 || over60) {
+     *   // Conditional OR expressions can be added like this.
+     *   query = query.where((eb) => {
+     *     const ors: Expression<SqlBool>[] = []
+     *
+     *     if (under18) {
+     *       ors.push(eb('age', '<', 18))
+     *     }
+     *
+     *     if (over60) {
+     *       ors.push(eb('age', '>', 60))
+     *     }
+     *
+     *     return eb.or(ors)
+     *   })
+     * }
+     *
      * const persons = await query.execute()
      * ```
      *
@@ -197,10 +220,10 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll('person')
-     *   .where(({ cmpr, or, and, not, exists, selectFrom }) => and([
+     *   .where(({ eb, or, and, not, exists, selectFrom }) => and([
      *     or([
-     *       cmpr('first_name', '=', firstName),
-     *       cmpr('age', '<', maxAge)
+     *       eb('first_name', '=', firstName),
+     *       eb('age', '<', maxAge)
      *     ]),
      *     not(exists(
      *       selectFrom('pet')
@@ -821,7 +844,7 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
      * }
      * ```
      */
-    $if<O2>(condition: boolean, func: (qb: this) => DeleteQueryBuilder<DB, TB, O2>): O2 extends DeleteResult ? DeleteQueryBuilder<DB, TB, DeleteResult> : O2 extends O & infer E ? DeleteQueryBuilder<DB, TB, O & Partial<E>> : DeleteQueryBuilder<DB, TB, Partial<O2>>;
+    $if<O2>(condition: boolean, func: (qb: this) => DeleteQueryBuilder<any, any, O2>): O2 extends DeleteResult ? DeleteQueryBuilder<DB, TB, DeleteResult> : O2 extends O & infer E ? DeleteQueryBuilder<DB, TB, O & Partial<E>> : DeleteQueryBuilder<DB, TB, Partial<O2>>;
     /**
      * Change the output type of the query.
      *

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

@@ -539,7 +539,7 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
      * }
      * ```
      */
-    $if<O2>(condition: boolean, func: (qb: this) => InsertQueryBuilder<DB, TB, O2>): O2 extends InsertResult ? InsertQueryBuilder<DB, TB, InsertResult> : O2 extends O & infer E ? InsertQueryBuilder<DB, TB, O & Partial<E>> : InsertQueryBuilder<DB, TB, Partial<O2>>;
+    $if<O2>(condition: boolean, func: (qb: this) => InsertQueryBuilder<any, any, O2>): O2 extends InsertResult ? InsertQueryBuilder<DB, TB, InsertResult> : O2 extends O & infer E ? InsertQueryBuilder<DB, TB, O & Partial<E>> : InsertQueryBuilder<DB, TB, Partial<O2>>;
     /**
      * Change the output type of the query.
      *

package/dist/esm/query-builder/json-path-builder.d.ts

@@ -152,7 +152,7 @@ export declare class TraversedJSONPathBuilder<S, O> extends JSONPathBuilder<S, O
      * const result = await db
      *   .selectFrom('person')
      *   .select(eb =>
-     *     eb.cmpr('first_name', '=', 'Jennifer').as('is_jennifer')
+     *     eb('first_name', '=', 'Jennifer').as('is_jennifer')
      *   )
      *   .executeTakeFirstOrThrow()
      *

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

@@ -100,22 +100,24 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
      *
      * <!-- siteExample("where", "OR where", 30) -->
      *
-     * To combine conditions using `OR`, you can use the expression builder:
+     * To combine conditions using `OR`, you can use the expression builder.
+     * There are two ways to create `OR` expressions. Both are shown in this
+     * example:
      *
      * ```ts
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll()
-     *   .where(({ or, and, cmpr }) => or([
-     *     and([
-     *       cmpr('first_name', '=', 'Jennifer'),
-     *       cmpr('last_name', '=', 'Aniston')
-     *     ]),
-     *     and([
-     *       cmpr('first_name', '=', 'Sylvester'),
-     *       cmpr('last_name', '=', 'Stallone')
-     *     ])
+     *   // 1. Using the `or` method on the expression builder:
+     *   .where((eb) => eb.or([
+     *     eb('first_name', '=', 'Jennifer'),
+     *     eb('first_name', '=', 'Sylvester')
      *   ]))
+     *   // 2. Chaining expressions using the `or` method on the
+     *   // created expressions:
+     *   .where((eb) =>
+     *     eb('last_name', '=', 'Aniston').or('last_name', '=', 'Stallone')
+     *   )
      *   .execute()
      * ```
      *
@@ -125,9 +127,9 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
      * select *
      * from "person"
      * where (
-     *   ("first_name" = $1 AND "last_name" = $2)
-     *   OR
-     *   ("first_name" = $3 AND "last_name" = $4)
+     *   ("first_name" = $1 or "first_name" = $2)
+     *   and
+     *   ("last_name" = $3 or "last_name" = $4)
      * )
      * ```
      *
@@ -136,8 +138,12 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
      * You can add expressions conditionally like this:
      *
      * ```ts
+     * import { Expression, SqlBool } from 'kysely'
+     *
      * const firstName: string | undefined = 'Jennifer'
      * const lastName: string | undefined = 'Aniston'
+     * const under18 = true
+     * const over60 = true
      *
      * let query = db
      *   .selectFrom('person')
@@ -153,6 +159,23 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
      *   query = query.where('last_name', '=', lastName)
      * }
      *
+     * if (under18 || over60) {
+     *   // Conditional OR expressions can be added like this.
+     *   query = query.where((eb) => {
+     *     const ors: Expression<SqlBool>[] = []
+     *
+     *     if (under18) {
+     *       ors.push(eb('age', '<', 18))
+     *     }
+     *
+     *     if (over60) {
+     *       ors.push(eb('age', '>', 60))
+     *     }
+     *
+     *     return eb.or(ors)
+     *   })
+     * }
+     *
      * const persons = await query.execute()
      * ```
      *
@@ -217,10 +240,10 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll('person')
-     *   .where(({ cmpr, or, and, not, exists, selectFrom }) => and([
+     *   .where(({ eb, or, and, not, exists, selectFrom }) => and([
      *     or([
-     *       cmpr('first_name', '=', firstName),
-     *       cmpr('age', '<', maxAge)
+     *       eb('first_name', '=', firstName),
+     *       eb('age', '<', maxAge)
      *     ]),
      *     not(exists(
      *       selectFrom('pet')
@@ -468,22 +491,24 @@ export declare class OnConflictUpdateBuilder<DB, TB extends keyof DB> implements
      *
      * <!-- siteExample("where", "OR where", 30) -->
      *
-     * To combine conditions using `OR`, you can use the expression builder:
+     * To combine conditions using `OR`, you can use the expression builder.
+     * There are two ways to create `OR` expressions. Both are shown in this
+     * example:
      *
      * ```ts
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll()
-     *   .where(({ or, and, cmpr }) => or([
-     *     and([
-     *       cmpr('first_name', '=', 'Jennifer'),
-     *       cmpr('last_name', '=', 'Aniston')
-     *     ]),
-     *     and([
-     *       cmpr('first_name', '=', 'Sylvester'),
-     *       cmpr('last_name', '=', 'Stallone')
-     *     ])
+     *   // 1. Using the `or` method on the expression builder:
+     *   .where((eb) => eb.or([
+     *     eb('first_name', '=', 'Jennifer'),
+     *     eb('first_name', '=', 'Sylvester')
      *   ]))
+     *   // 2. Chaining expressions using the `or` method on the
+     *   // created expressions:
+     *   .where((eb) =>
+     *     eb('last_name', '=', 'Aniston').or('last_name', '=', 'Stallone')
+     *   )
      *   .execute()
      * ```
      *
@@ -493,9 +518,9 @@ export declare class OnConflictUpdateBuilder<DB, TB extends keyof DB> implements
      * select *
      * from "person"
      * where (
-     *   ("first_name" = $1 AND "last_name" = $2)
-     *   OR
-     *   ("first_name" = $3 AND "last_name" = $4)
+     *   ("first_name" = $1 or "first_name" = $2)
+     *   and
+     *   ("last_name" = $3 or "last_name" = $4)
      * )
      * ```
      *
@@ -504,8 +529,12 @@ export declare class OnConflictUpdateBuilder<DB, TB extends keyof DB> implements
      * You can add expressions conditionally like this:
      *
      * ```ts
+     * import { Expression, SqlBool } from 'kysely'
+     *
      * const firstName: string | undefined = 'Jennifer'
      * const lastName: string | undefined = 'Aniston'
+     * const under18 = true
+     * const over60 = true
      *
      * let query = db
      *   .selectFrom('person')
@@ -521,6 +550,23 @@ export declare class OnConflictUpdateBuilder<DB, TB extends keyof DB> implements
      *   query = query.where('last_name', '=', lastName)
      * }
      *
+     * if (under18 || over60) {
+     *   // Conditional OR expressions can be added like this.
+     *   query = query.where((eb) => {
+     *     const ors: Expression<SqlBool>[] = []
+     *
+     *     if (under18) {
+     *       ors.push(eb('age', '<', 18))
+     *     }
+     *
+     *     if (over60) {
+     *       ors.push(eb('age', '>', 60))
+     *     }
+     *
+     *     return eb.or(ors)
+     *   })
+     * }
+     *
      * const persons = await query.execute()
      * ```
      *
@@ -585,10 +631,10 @@ export declare class OnConflictUpdateBuilder<DB, TB extends keyof DB> implements
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll('person')
-     *   .where(({ cmpr, or, and, not, exists, selectFrom }) => and([
+     *   .where(({ eb, or, and, not, exists, selectFrom }) => and([
      *     or([
-     *       cmpr('first_name', '=', firstName),
-     *       cmpr('age', '<', maxAge)
+     *       eb('first_name', '=', firstName),
+     *       eb('age', '<', maxAge)
      *     ]),
      *     not(exists(
      *       selectFrom('pet')

package/dist/esm/query-builder/select-query-builder.d.ts

@@ -98,22 +98,24 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
      *
      * <!-- siteExample("where", "OR where", 30) -->
      *
-     * To combine conditions using `OR`, you can use the expression builder:
+     * To combine conditions using `OR`, you can use the expression builder.
+     * There are two ways to create `OR` expressions. Both are shown in this
+     * example:
      *
      * ```ts
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll()
-     *   .where(({ or, and, cmpr }) => or([
-     *     and([
-     *       cmpr('first_name', '=', 'Jennifer'),
-     *       cmpr('last_name', '=', 'Aniston')
-     *     ]),
-     *     and([
-     *       cmpr('first_name', '=', 'Sylvester'),
-     *       cmpr('last_name', '=', 'Stallone')
-     *     ])
+     *   // 1. Using the `or` method on the expression builder:
+     *   .where((eb) => eb.or([
+     *     eb('first_name', '=', 'Jennifer'),
+     *     eb('first_name', '=', 'Sylvester')
      *   ]))
+     *   // 2. Chaining expressions using the `or` method on the
+     *   // created expressions:
+     *   .where((eb) =>
+     *     eb('last_name', '=', 'Aniston').or('last_name', '=', 'Stallone')
+     *   )
      *   .execute()
      * ```
      *
@@ -123,9 +125,9 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
      * select *
      * from "person"
      * where (
-     *   ("first_name" = $1 AND "last_name" = $2)
-     *   OR
-     *   ("first_name" = $3 AND "last_name" = $4)
+     *   ("first_name" = $1 or "first_name" = $2)
+     *   and
+     *   ("last_name" = $3 or "last_name" = $4)
      * )
      * ```
      *
@@ -134,8 +136,12 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
      * You can add expressions conditionally like this:
      *
      * ```ts
+     * import { Expression, SqlBool } from 'kysely'
+     *
      * const firstName: string | undefined = 'Jennifer'
      * const lastName: string | undefined = 'Aniston'
+     * const under18 = true
+     * const over60 = true
      *
      * let query = db
      *   .selectFrom('person')
@@ -151,6 +157,23 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
      *   query = query.where('last_name', '=', lastName)
      * }
      *
+     * if (under18 || over60) {
+     *   // Conditional OR expressions can be added like this.
+     *   query = query.where((eb) => {
+     *     const ors: Expression<SqlBool>[] = []
+     *
+     *     if (under18) {
+     *       ors.push(eb('age', '<', 18))
+     *     }
+     *
+     *     if (over60) {
+     *       ors.push(eb('age', '>', 60))
+     *     }
+     *
+     *     return eb.or(ors)
+     *   })
+     * }
+     *
      * const persons = await query.execute()
      * ```
      *
@@ -215,10 +238,10 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
      * const persons = await db
      *   .selectFrom('person')
      *   .selectAll('person')
-     *   .where(({ cmpr, or, and, not, exists, selectFrom }) => and([
+     *   .where(({ eb, or, and, not, exists, selectFrom }) => and([
      *     or([
-     *       cmpr('first_name', '=', firstName),
-     *       cmpr('age', '<', maxAge)
+     *       eb('first_name', '=', firstName),
+     *       eb('age', '<', maxAge)
      *     ]),
      *     not(exists(
      *       selectFrom('pet')
@@ -467,7 +490,7 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
      * import { sql } from 'kysely'
      *
      * const persons = await db.selectFrom('person')
-     *   .select(({ selectFrom, or, cmpr }) => [
+     *   .select(({ eb, selectFrom, or }) => [
      *     // Select a correlated subquery
      *     selectFrom('pet')
      *       .whereRef('person.id', '=', 'pet.owner_id')
@@ -479,8 +502,8 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
      *     // Build and select an expression using
      *     // the expression builder
      *     or([
-     *       cmpr('first_name', '=', 'Jennifer'),
-     *       cmpr('first_name', '=', 'Arnold')
+     *       eb('first_name', '=', 'Jennifer'),
+     *       eb('first_name', '=', 'Arnold')
      *     ]).as('is_jennifer_or_arnold'),
      *
      *     // Select a raw sql expression
@@ -717,7 +740,7 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
      * ```
      */
     selectAll<T extends TB>(table: ReadonlyArray<T>): SelectQueryBuilder<DB, TB, O & AllSelection<DB, T>>;
-    selectAll<T extends TB>(table: T): SelectQueryBuilder<DB, TB, Selectable<DB[T]>>;
+    selectAll<T extends TB>(table: T): SelectQueryBuilder<DB, TB, O & Selectable<DB[T]>>;
     selectAll(): SelectQueryBuilder<DB, TB, O & AllSelection<DB, TB>>;
     /**
      * Joins another table to the query using an inner join.
@@ -1414,7 +1437,7 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
      *   )
      * ```
      */
-    $if<O2>(condition: boolean, func: (qb: this) => SelectQueryBuilder<DB, TB, O & O2>): SelectQueryBuilder<DB, TB, O & Partial<O2>>;
+    $if<O2>(condition: boolean, func: (qb: this) => SelectQueryBuilder<any, any, O & O2>): SelectQueryBuilder<DB, TB, O & Partial<O2>>;
     /**
      * Change the output type of the query.
      *

package/dist/esm/query-builder/select-query-builder.js

@@ -157,7 +157,7 @@ export class SelectQueryBuilder {
      * import { sql } from 'kysely'
      *
      * const persons = await db.selectFrom('person')
-     *   .select(({ selectFrom, or, cmpr }) => [
+     *   .select(({ eb, selectFrom, or }) => [
      *     // Select a correlated subquery
      *     selectFrom('pet')
      *       .whereRef('person.id', '=', 'pet.owner_id')
@@ -169,8 +169,8 @@ export class SelectQueryBuilder {
      *     // Build and select an expression using
      *     // the expression builder
      *     or([
-     *       cmpr('first_name', '=', 'Jennifer'),
-     *       cmpr('first_name', '=', 'Arnold')
+     *       eb('first_name', '=', 'Jennifer'),
+     *       eb('first_name', '=', 'Arnold')
      *     ]).as('is_jennifer_or_arnold'),
      *
      *     // Select a raw sql expression