kysely 0.16.8 → 0.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/README.md +23 -11
- package/dist/cjs/dialect/mysql/mysql-adapter.js +3 -4
- package/dist/cjs/dialect/mysql/mysql-introspector.js +2 -1
- package/dist/cjs/dialect/postgres/postgres-adapter.js +3 -2
- package/dist/cjs/dialect/sqlite/sqlite-introspector.js +2 -1
- package/dist/cjs/index-nodeless.d.ts +2 -0
- package/dist/cjs/index-nodeless.js +2 -0
- package/dist/cjs/kysely.d.ts +3 -6
- package/dist/cjs/kysely.js +9 -14
- package/dist/cjs/migration/migrator.d.ts +22 -0
- package/dist/cjs/migration/migrator.js +27 -5
- package/dist/cjs/operation-node/delete-query-node.d.ts +7 -0
- package/dist/cjs/operation-node/delete-query-node.js +15 -0
- package/dist/cjs/operation-node/operation-node-transformer.js +1 -1
- package/dist/cjs/operation-node/raw-node.d.ts +4 -2
- package/dist/cjs/operation-node/raw-node.js +8 -2
- package/dist/cjs/parser/complex-expression-parser.d.ts +5 -5
- package/dist/cjs/parser/complex-expression-parser.js +5 -4
- package/dist/cjs/parser/filter-parser.d.ts +9 -9
- package/dist/cjs/parser/filter-parser.js +31 -30
- package/dist/cjs/parser/group-by-parser.d.ts +1 -2
- package/dist/cjs/parser/group-by-parser.js +2 -2
- package/dist/cjs/parser/insert-values-parser.d.ts +1 -2
- package/dist/cjs/parser/insert-values-parser.js +6 -6
- package/dist/cjs/parser/join-parser.d.ts +1 -2
- package/dist/cjs/parser/join-parser.js +8 -7
- package/dist/cjs/parser/order-by-parser.d.ts +1 -2
- package/dist/cjs/parser/order-by-parser.js +4 -4
- package/dist/cjs/parser/parse-utils.d.ts +10 -0
- package/dist/cjs/parser/parse-utils.js +38 -0
- package/dist/cjs/parser/reference-parser.d.ts +2 -3
- package/dist/cjs/parser/reference-parser.js +5 -5
- package/dist/cjs/parser/select-parser.d.ts +1 -2
- package/dist/cjs/parser/select-parser.js +5 -5
- package/dist/cjs/parser/table-parser.d.ts +2 -3
- package/dist/cjs/parser/table-parser.js +5 -5
- package/dist/cjs/parser/update-set-parser.d.ts +1 -2
- package/dist/cjs/parser/update-set-parser.js +2 -2
- package/dist/cjs/parser/value-parser.d.ts +3 -4
- package/dist/cjs/parser/value-parser.js +7 -7
- package/dist/cjs/parser/with-parser.d.ts +1 -2
- package/dist/cjs/parser/with-parser.js +3 -2
- package/dist/cjs/query-builder/delete-query-builder.d.ts +77 -20
- package/dist/cjs/query-builder/delete-query-builder.js +81 -14
- package/dist/cjs/query-builder/expression-builder.d.ts +4 -13
- package/dist/cjs/query-builder/expression-builder.js +12 -21
- package/dist/cjs/query-builder/function-builder.d.ts +2 -6
- package/dist/cjs/query-builder/function-builder.js +5 -8
- package/dist/cjs/query-builder/insert-query-builder.d.ts +11 -9
- package/dist/cjs/query-builder/insert-query-builder.js +8 -7
- package/dist/cjs/query-builder/join-builder.d.ts +0 -2
- package/dist/cjs/query-builder/join-builder.js +8 -8
- package/dist/cjs/query-builder/on-conflict-builder.d.ts +24 -20
- package/dist/cjs/query-builder/on-conflict-builder.js +17 -17
- package/dist/cjs/query-builder/returning-interface.d.ts +2 -2
- package/dist/cjs/query-builder/select-query-builder.d.ts +43 -32
- package/dist/cjs/query-builder/select-query-builder.js +28 -26
- package/dist/cjs/query-builder/update-query-builder.d.ts +29 -25
- package/dist/cjs/query-builder/update-query-builder.js +22 -20
- package/dist/cjs/query-builder/where-interface.d.ts +20 -16
- package/dist/cjs/query-compiler/default-query-compiler.js +16 -7
- package/dist/cjs/query-creator.d.ts +24 -138
- package/dist/cjs/query-creator.js +19 -145
- package/dist/cjs/query-executor/default-query-executor.d.ts +8 -1
- package/dist/cjs/query-executor/default-query-executor.js +13 -13
- package/dist/cjs/query-executor/noop-query-executor.d.ts +8 -0
- package/dist/cjs/query-executor/noop-query-executor.js +8 -1
- package/dist/cjs/query-executor/query-executor-provider.d.ts +8 -0
- package/dist/cjs/query-executor/query-executor-provider.js +2 -0
- package/dist/cjs/query-executor/query-executor.d.ts +7 -0
- package/dist/cjs/raw-builder/raw-builder.d.ts +42 -11
- package/dist/cjs/raw-builder/raw-builder.js +55 -56
- package/dist/cjs/raw-builder/sql.d.ts +323 -0
- package/dist/cjs/raw-builder/sql.js +153 -0
- package/dist/cjs/schema/alter-table-builder.d.ts +20 -8
- package/dist/cjs/schema/alter-table-builder.js +3 -3
- package/dist/cjs/schema/column-definition-builder.d.ts +20 -8
- package/dist/cjs/schema/create-index-builder.d.ts +3 -1
- package/dist/cjs/schema/create-index-builder.js +3 -1
- package/dist/cjs/schema/create-table-builder.d.ts +6 -2
- package/dist/cjs/schema/create-table-builder.js +8 -4
- package/dist/cjs/schema/create-view-builder.d.ts +3 -3
- package/dist/cjs/schema/create-view-builder.js +3 -3
- package/dist/cjs/util/query-id.js +10 -4
- package/dist/cjs/util/random-string.js +65 -2
- package/dist/esm/dialect/mysql/mysql-adapter.js +3 -4
- package/dist/esm/dialect/mysql/mysql-introspector.js +2 -1
- package/dist/esm/dialect/postgres/postgres-adapter.js +3 -2
- package/dist/esm/dialect/sqlite/sqlite-introspector.js +2 -1
- package/dist/esm/index-nodeless.d.ts +2 -0
- package/dist/esm/index-nodeless.js +2 -0
- package/dist/esm/kysely.d.ts +3 -6
- package/dist/esm/kysely.js +9 -14
- package/dist/esm/migration/migrator.d.ts +22 -0
- package/dist/esm/migration/migrator.js +27 -5
- package/dist/esm/operation-node/delete-query-node.d.ts +7 -0
- package/dist/esm/operation-node/delete-query-node.js +15 -0
- package/dist/esm/operation-node/operation-node-transformer.js +1 -1
- package/dist/esm/operation-node/raw-node.d.ts +4 -2
- package/dist/esm/operation-node/raw-node.js +8 -2
- package/dist/esm/parser/complex-expression-parser.d.ts +5 -5
- package/dist/esm/parser/complex-expression-parser.js +5 -4
- package/dist/esm/parser/filter-parser.d.ts +9 -9
- package/dist/esm/parser/filter-parser.js +31 -30
- package/dist/esm/parser/group-by-parser.d.ts +1 -2
- package/dist/esm/parser/group-by-parser.js +2 -2
- package/dist/esm/parser/insert-values-parser.d.ts +1 -2
- package/dist/esm/parser/insert-values-parser.js +6 -6
- package/dist/esm/parser/join-parser.d.ts +1 -2
- package/dist/esm/parser/join-parser.js +8 -7
- package/dist/esm/parser/order-by-parser.d.ts +1 -2
- package/dist/esm/parser/order-by-parser.js +4 -4
- package/dist/esm/parser/parse-utils.d.ts +10 -0
- package/dist/esm/parser/parse-utils.js +32 -0
- package/dist/esm/parser/reference-parser.d.ts +2 -3
- package/dist/esm/parser/reference-parser.js +5 -5
- package/dist/esm/parser/select-parser.d.ts +1 -2
- package/dist/esm/parser/select-parser.js +5 -5
- package/dist/esm/parser/table-parser.d.ts +2 -3
- package/dist/esm/parser/table-parser.js +5 -5
- package/dist/esm/parser/update-set-parser.d.ts +1 -2
- package/dist/esm/parser/update-set-parser.js +2 -2
- package/dist/esm/parser/value-parser.d.ts +3 -4
- package/dist/esm/parser/value-parser.js +7 -7
- package/dist/esm/parser/with-parser.d.ts +1 -2
- package/dist/esm/parser/with-parser.js +3 -2
- package/dist/esm/query-builder/delete-query-builder.d.ts +77 -20
- package/dist/esm/query-builder/delete-query-builder.js +81 -14
- package/dist/esm/query-builder/expression-builder.d.ts +4 -13
- package/dist/esm/query-builder/expression-builder.js +12 -21
- package/dist/esm/query-builder/function-builder.d.ts +2 -6
- package/dist/esm/query-builder/function-builder.js +5 -8
- package/dist/esm/query-builder/insert-query-builder.d.ts +11 -9
- package/dist/esm/query-builder/insert-query-builder.js +8 -7
- package/dist/esm/query-builder/join-builder.d.ts +0 -2
- package/dist/esm/query-builder/join-builder.js +8 -8
- package/dist/esm/query-builder/on-conflict-builder.d.ts +24 -20
- package/dist/esm/query-builder/on-conflict-builder.js +17 -17
- package/dist/esm/query-builder/returning-interface.d.ts +2 -2
- package/dist/esm/query-builder/select-query-builder.d.ts +43 -32
- package/dist/esm/query-builder/select-query-builder.js +28 -26
- package/dist/esm/query-builder/update-query-builder.d.ts +29 -25
- package/dist/esm/query-builder/update-query-builder.js +22 -20
- package/dist/esm/query-builder/where-interface.d.ts +20 -16
- package/dist/esm/query-compiler/default-query-compiler.js +16 -7
- package/dist/esm/query-creator.d.ts +24 -138
- package/dist/esm/query-creator.js +19 -145
- package/dist/esm/query-executor/default-query-executor.d.ts +8 -1
- package/dist/esm/query-executor/default-query-executor.js +13 -13
- package/dist/esm/query-executor/noop-query-executor.d.ts +8 -0
- package/dist/esm/query-executor/noop-query-executor.js +7 -0
- package/dist/esm/query-executor/query-executor-provider.d.ts +8 -0
- package/dist/esm/query-executor/query-executor-provider.js +2 -0
- package/dist/esm/query-executor/query-executor.d.ts +7 -0
- package/dist/esm/raw-builder/raw-builder.d.ts +42 -11
- package/dist/esm/raw-builder/raw-builder.js +56 -57
- package/dist/esm/raw-builder/sql.d.ts +323 -0
- package/dist/esm/raw-builder/sql.js +151 -0
- package/dist/esm/schema/alter-table-builder.d.ts +20 -8
- package/dist/esm/schema/alter-table-builder.js +3 -3
- package/dist/esm/schema/column-definition-builder.d.ts +20 -8
- package/dist/esm/schema/create-index-builder.d.ts +3 -1
- package/dist/esm/schema/create-index-builder.js +3 -1
- package/dist/esm/schema/create-table-builder.d.ts +6 -2
- package/dist/esm/schema/create-table-builder.js +8 -4
- package/dist/esm/schema/create-view-builder.d.ts +3 -3
- package/dist/esm/schema/create-view-builder.js +3 -3
- package/dist/esm/util/query-id.js +10 -4
- package/dist/esm/util/random-string.js +65 -2
- package/package.json +13 -13
- package/dist/cjs/parser/parse-context.d.ts +0 -55
- package/dist/cjs/parser/parse-context.js +0 -50
- package/dist/cjs/util/private-symbols.d.ts +0 -5
- package/dist/cjs/util/private-symbols.js +0 -8
- package/dist/esm/parser/parse-context.d.ts +0 -55
- package/dist/esm/parser/parse-context.js +0 -47
- package/dist/esm/util/private-symbols.d.ts +0 -5
- package/dist/esm/util/private-symbols.js +0 -6
|
@@ -8,7 +8,6 @@ import { MutationObject } from '../parser/update-set-parser.js';
|
|
|
8
8
|
import { Compilable } from '../util/compilable.js';
|
|
9
9
|
import { QueryExecutor } from '../query-executor/query-executor.js';
|
|
10
10
|
import { QueryId } from '../util/query-id.js';
|
|
11
|
-
import { ParseContext } from '../parser/parse-context.js';
|
|
12
11
|
import { InsertResult } from './insert-result.js';
|
|
13
12
|
import { KyselyPlugin } from '../plugin/kysely-plugin.js';
|
|
14
13
|
import { ReturningRow } from '../parser/returning-parser.js';
|
|
@@ -25,7 +24,7 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
|
|
|
25
24
|
*
|
|
26
25
|
* This method takes an object whose keys are column names and values are
|
|
27
26
|
* values to insert. In addition to the column's type, the values can be
|
|
28
|
-
* {@link
|
|
27
|
+
* raw {@link sql} snippets or select queries.
|
|
29
28
|
*
|
|
30
29
|
* You must provide all fields you haven't explicitly marked as nullable
|
|
31
30
|
* or optional using {@link Generated} or {@link ColumnType}.
|
|
@@ -106,16 +105,18 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
|
|
|
106
105
|
* insert into "person" ("first_name", "last_name") values ($1, $2) returning "id"
|
|
107
106
|
* ```
|
|
108
107
|
*
|
|
109
|
-
* In addition to primitives, the values can also be
|
|
108
|
+
* In addition to primitives, the values can also be raw sql expressions or
|
|
110
109
|
* select queries:
|
|
111
110
|
*
|
|
112
111
|
* ```ts
|
|
112
|
+
* import { sql } from 'kysely'
|
|
113
|
+
*
|
|
113
114
|
* const result = await db
|
|
114
115
|
* .insertInto('person')
|
|
115
116
|
* .values({
|
|
116
117
|
* first_name: 'Jennifer',
|
|
117
|
-
* last_name:
|
|
118
|
-
* age: db.selectFrom('person').select(
|
|
118
|
+
* last_name: sql`${'Ani'} || ${'ston'}`,
|
|
119
|
+
* age: db.selectFrom('person').select(sql`avg(age)`),
|
|
119
120
|
* })
|
|
120
121
|
* .executeTakeFirst()
|
|
121
122
|
*
|
|
@@ -271,6 +272,8 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
|
|
|
271
272
|
* the unique index is an expression index:
|
|
272
273
|
*
|
|
273
274
|
* ```ts
|
|
275
|
+
* import { sql } from 'kysely'
|
|
276
|
+
*
|
|
274
277
|
* await db
|
|
275
278
|
* .insertInto('pet')
|
|
276
279
|
* .values({
|
|
@@ -278,7 +281,7 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
|
|
|
278
281
|
* species: 'cat',
|
|
279
282
|
* })
|
|
280
283
|
* .onConflict((oc) => oc
|
|
281
|
-
* .expression(
|
|
284
|
+
* .expression(sql`lower(name)`)
|
|
282
285
|
* .doUpdateSet({ species: 'hamster' })
|
|
283
286
|
* )
|
|
284
287
|
* .execute()
|
|
@@ -423,7 +426,7 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
|
|
|
423
426
|
* Return arbitrary expressions:
|
|
424
427
|
*
|
|
425
428
|
* ```ts
|
|
426
|
-
*
|
|
429
|
+
* import { sql } from 'kysely'
|
|
427
430
|
*
|
|
428
431
|
* const { id, full_name, first_pet_id } = await db
|
|
429
432
|
* .insertInto('person')
|
|
@@ -433,7 +436,7 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
|
|
|
433
436
|
* })
|
|
434
437
|
* .returning([
|
|
435
438
|
* 'id as id',
|
|
436
|
-
*
|
|
439
|
+
* sql<string>`concat(first_name, ' ', last_name)`.as('full_name'),
|
|
437
440
|
* (qb) => qb.selectFrom('pets').select('pet.id').limit(1).as('first_pet_id')
|
|
438
441
|
* ])
|
|
439
442
|
* .executeTakeFirst()
|
|
@@ -543,5 +546,4 @@ export interface InsertQueryBuilderProps {
|
|
|
543
546
|
readonly queryId: QueryId;
|
|
544
547
|
readonly queryNode: InsertQueryNode;
|
|
545
548
|
readonly executor: QueryExecutor;
|
|
546
|
-
readonly parseContext: ParseContext;
|
|
547
549
|
}
|
|
@@ -19,7 +19,7 @@ export class InsertQueryBuilder {
|
|
|
19
19
|
this.#props = freeze(props);
|
|
20
20
|
}
|
|
21
21
|
values(args) {
|
|
22
|
-
const [columns, values] = parseInsertObjectOrList(
|
|
22
|
+
const [columns, values] = parseInsertObjectOrList(args);
|
|
23
23
|
return new InsertQueryBuilder({
|
|
24
24
|
...this.#props,
|
|
25
25
|
queryNode: InsertQueryNode.cloneWith(this.#props.queryNode, {
|
|
@@ -80,7 +80,7 @@ export class InsertQueryBuilder {
|
|
|
80
80
|
return new InsertQueryBuilder({
|
|
81
81
|
...this.#props,
|
|
82
82
|
queryNode: InsertQueryNode.cloneWith(this.#props.queryNode, {
|
|
83
|
-
values: parseComplexExpression(
|
|
83
|
+
values: parseComplexExpression(expression),
|
|
84
84
|
}),
|
|
85
85
|
});
|
|
86
86
|
}
|
|
@@ -174,6 +174,8 @@ export class InsertQueryBuilder {
|
|
|
174
174
|
* the unique index is an expression index:
|
|
175
175
|
*
|
|
176
176
|
* ```ts
|
|
177
|
+
* import { sql } from 'kysely'
|
|
178
|
+
*
|
|
177
179
|
* await db
|
|
178
180
|
* .insertInto('pet')
|
|
179
181
|
* .values({
|
|
@@ -181,7 +183,7 @@ export class InsertQueryBuilder {
|
|
|
181
183
|
* species: 'cat',
|
|
182
184
|
* })
|
|
183
185
|
* .onConflict((oc) => oc
|
|
184
|
-
* .expression(
|
|
186
|
+
* .expression(sql`lower(name)`)
|
|
185
187
|
* .doUpdateSet({ species: 'hamster' })
|
|
186
188
|
* )
|
|
187
189
|
* .execute()
|
|
@@ -269,7 +271,6 @@ export class InsertQueryBuilder {
|
|
|
269
271
|
queryNode: InsertQueryNode.cloneWith(this.#props.queryNode, {
|
|
270
272
|
onConflict: callback(new OnConflictBuilder({
|
|
271
273
|
onConflictNode: OnConflictNode.create(),
|
|
272
|
-
parseContext: this.#props.parseContext,
|
|
273
274
|
})).toOperationNode(),
|
|
274
275
|
}),
|
|
275
276
|
});
|
|
@@ -296,14 +297,14 @@ export class InsertQueryBuilder {
|
|
|
296
297
|
return new InsertQueryBuilder({
|
|
297
298
|
...this.#props,
|
|
298
299
|
queryNode: InsertQueryNode.cloneWith(this.#props.queryNode, {
|
|
299
|
-
onDuplicateKey: OnDuplicateKeyNode.create(parseUpdateObject(
|
|
300
|
+
onDuplicateKey: OnDuplicateKeyNode.create(parseUpdateObject(updates)),
|
|
300
301
|
}),
|
|
301
302
|
});
|
|
302
303
|
}
|
|
303
304
|
returning(selection) {
|
|
304
305
|
return new InsertQueryBuilder({
|
|
305
306
|
...this.#props,
|
|
306
|
-
queryNode: QueryNode.cloneWithReturning(this.#props.queryNode, parseSelectExpressionOrList(
|
|
307
|
+
queryNode: QueryNode.cloneWithReturning(this.#props.queryNode, parseSelectExpressionOrList(selection)),
|
|
307
308
|
});
|
|
308
309
|
}
|
|
309
310
|
returningAll() {
|
|
@@ -413,7 +414,7 @@ export class InsertQueryBuilder {
|
|
|
413
414
|
const compildQuery = this.compile();
|
|
414
415
|
const query = compildQuery.query;
|
|
415
416
|
const result = await this.#props.executor.executeQuery(compildQuery, this.#props.queryId);
|
|
416
|
-
if (this.#props.
|
|
417
|
+
if (this.#props.executor.adapter.supportsReturning && query.returning) {
|
|
417
418
|
return result.rows;
|
|
418
419
|
}
|
|
419
420
|
else {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { JoinNode } from '../operation-node/join-node.js';
|
|
2
2
|
import { OperationNodeSource } from '../operation-node/operation-node-source.js';
|
|
3
3
|
import { ExistsExpression, FilterOperator, FilterValueExpressionOrList } from '../parser/filter-parser.js';
|
|
4
|
-
import { ParseContext } from '../parser/parse-context.js';
|
|
5
4
|
import { ReferenceExpression } from '../parser/reference-parser.js';
|
|
6
5
|
import { AnyRawBuilder } from '../util/type-utils.js';
|
|
7
6
|
export declare class JoinBuilder<DB, TB extends keyof DB> implements OperationNodeSource {
|
|
@@ -71,5 +70,4 @@ export declare class JoinBuilder<DB, TB extends keyof DB> implements OperationNo
|
|
|
71
70
|
}
|
|
72
71
|
export interface JoinBuilderProps {
|
|
73
72
|
readonly joinNode: JoinNode;
|
|
74
|
-
readonly parseContext: ParseContext;
|
|
75
73
|
}
|
|
@@ -11,13 +11,13 @@ export class JoinBuilder {
|
|
|
11
11
|
on(...args) {
|
|
12
12
|
return new JoinBuilder({
|
|
13
13
|
...this.#props,
|
|
14
|
-
joinNode: JoinNode.cloneWithOn(this.#props.joinNode, parseOnFilter(
|
|
14
|
+
joinNode: JoinNode.cloneWithOn(this.#props.joinNode, parseOnFilter(args)),
|
|
15
15
|
});
|
|
16
16
|
}
|
|
17
17
|
orOn(...args) {
|
|
18
18
|
return new JoinBuilder({
|
|
19
19
|
...this.#props,
|
|
20
|
-
joinNode: JoinNode.cloneWithOrOn(this.#props.joinNode, parseOnFilter(
|
|
20
|
+
joinNode: JoinNode.cloneWithOrOn(this.#props.joinNode, parseOnFilter(args)),
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
23
|
/**
|
|
@@ -29,7 +29,7 @@ export class JoinBuilder {
|
|
|
29
29
|
onRef(lhs, op, rhs) {
|
|
30
30
|
return new JoinBuilder({
|
|
31
31
|
...this.#props,
|
|
32
|
-
joinNode: JoinNode.cloneWithOn(this.#props.joinNode, parseReferenceFilter(
|
|
32
|
+
joinNode: JoinNode.cloneWithOn(this.#props.joinNode, parseReferenceFilter(lhs, op, rhs)),
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
35
|
/**
|
|
@@ -41,7 +41,7 @@ export class JoinBuilder {
|
|
|
41
41
|
orOnRef(lhs, op, rhs) {
|
|
42
42
|
return new JoinBuilder({
|
|
43
43
|
...this.#props,
|
|
44
|
-
joinNode: JoinNode.cloneWithOrOn(this.#props.joinNode, parseReferenceFilter(
|
|
44
|
+
joinNode: JoinNode.cloneWithOrOn(this.#props.joinNode, parseReferenceFilter(lhs, op, rhs)),
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
47
|
/**
|
|
@@ -53,7 +53,7 @@ export class JoinBuilder {
|
|
|
53
53
|
onExists(arg) {
|
|
54
54
|
return new JoinBuilder({
|
|
55
55
|
...this.#props,
|
|
56
|
-
joinNode: JoinNode.cloneWithOn(this.#props.joinNode, parseExistFilter(
|
|
56
|
+
joinNode: JoinNode.cloneWithOn(this.#props.joinNode, parseExistFilter(arg)),
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
/**
|
|
@@ -65,7 +65,7 @@ export class JoinBuilder {
|
|
|
65
65
|
onNotExists(arg) {
|
|
66
66
|
return new JoinBuilder({
|
|
67
67
|
...this.#props,
|
|
68
|
-
joinNode: JoinNode.cloneWithOn(this.#props.joinNode, parseNotExistFilter(
|
|
68
|
+
joinNode: JoinNode.cloneWithOn(this.#props.joinNode, parseNotExistFilter(arg)),
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
71
|
/**
|
|
@@ -77,7 +77,7 @@ export class JoinBuilder {
|
|
|
77
77
|
orOnExists(arg) {
|
|
78
78
|
return new JoinBuilder({
|
|
79
79
|
...this.#props,
|
|
80
|
-
joinNode: JoinNode.cloneWithOrOn(this.#props.joinNode, parseExistFilter(
|
|
80
|
+
joinNode: JoinNode.cloneWithOrOn(this.#props.joinNode, parseExistFilter(arg)),
|
|
81
81
|
});
|
|
82
82
|
}
|
|
83
83
|
/**
|
|
@@ -89,7 +89,7 @@ export class JoinBuilder {
|
|
|
89
89
|
orOnNotExists(arg) {
|
|
90
90
|
return new JoinBuilder({
|
|
91
91
|
...this.#props,
|
|
92
|
-
joinNode: JoinNode.cloneWithOrOn(this.#props.joinNode, parseNotExistFilter(
|
|
92
|
+
joinNode: JoinNode.cloneWithOrOn(this.#props.joinNode, parseNotExistFilter(arg)),
|
|
93
93
|
});
|
|
94
94
|
}
|
|
95
95
|
toOperationNode() {
|
|
@@ -2,7 +2,6 @@ import { OnConflictNode } from '../operation-node/on-conflict-node.js';
|
|
|
2
2
|
import { OperationNodeSource } from '../operation-node/operation-node-source.js';
|
|
3
3
|
import { ComplexExpression } from '../parser/complex-expression-parser.js';
|
|
4
4
|
import { WhereGrouper, FilterOperator, FilterValueExpressionOrList } from '../parser/filter-parser.js';
|
|
5
|
-
import { ParseContext } from '../parser/parse-context.js';
|
|
6
5
|
import { ReferenceExpression } from '../parser/reference-parser.js';
|
|
7
6
|
import { MutationObject } from '../parser/update-set-parser.js';
|
|
8
7
|
import { AnyColumn, AnyRawBuilder } from '../util/type-utils.js';
|
|
@@ -70,7 +69,7 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
|
|
|
70
69
|
* ```
|
|
71
70
|
*
|
|
72
71
|
* Operator can be any supported operator or if the typings don't support it
|
|
73
|
-
* you can always use `
|
|
72
|
+
* you can always use `sql\`your operator\``.
|
|
74
73
|
*
|
|
75
74
|
* ```ts
|
|
76
75
|
* const persons = await db
|
|
@@ -140,7 +139,7 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
|
|
|
140
139
|
*
|
|
141
140
|
* A `where in` query can be built by using the `in` operator and an array
|
|
142
141
|
* of values. The values in the array can also be subqueries or raw
|
|
143
|
-
*
|
|
142
|
+
* {@link sql} expressions.
|
|
144
143
|
*
|
|
145
144
|
* ```ts
|
|
146
145
|
* const persons = await db
|
|
@@ -156,15 +155,17 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
|
|
|
156
155
|
* select * from "person" where "id" in ($1, $2, $3)
|
|
157
156
|
* ```
|
|
158
157
|
*
|
|
159
|
-
* If everything else fails, you can always
|
|
158
|
+
* If everything else fails, you can always use the {@link sql} tag
|
|
160
159
|
* as any of the arguments, including the operator:
|
|
161
160
|
*
|
|
162
161
|
* ```ts
|
|
162
|
+
* import { sql } from 'kysely'
|
|
163
|
+
*
|
|
163
164
|
* const persons = await db
|
|
164
165
|
* .selectFrom('person')
|
|
165
166
|
* .selectAll()
|
|
166
167
|
* .where(
|
|
167
|
-
*
|
|
168
|
+
* sql`coalesce(first_name, last_name)`,
|
|
168
169
|
* 'like',
|
|
169
170
|
* '%' + name + '%',
|
|
170
171
|
* )
|
|
@@ -199,24 +200,25 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
|
|
|
199
200
|
* ```
|
|
200
201
|
*
|
|
201
202
|
* In all examples above the columns were known at compile time
|
|
202
|
-
* (except for the
|
|
203
|
-
* you to refer to columns that exist in the database **and**
|
|
204
|
-
* referred to in the current query and context.
|
|
203
|
+
* (except for the raw {@link sql} expressions). By default kysely only
|
|
204
|
+
* allows you to refer to columns that exist in the database **and**
|
|
205
|
+
* can be referred to in the current query and context.
|
|
205
206
|
*
|
|
206
207
|
* Sometimes you may want to refer to columns that come from the user
|
|
207
208
|
* input and thus are not available at compile time.
|
|
208
209
|
*
|
|
209
|
-
* You have two options,
|
|
210
|
+
* You have two options, the {@link sql} tag or `db.dynamic`. The example below
|
|
210
211
|
* uses both:
|
|
211
212
|
*
|
|
212
213
|
* ```ts
|
|
214
|
+
* import { sql } from 'kysely'
|
|
213
215
|
* const { ref } = db.dynamic
|
|
214
216
|
*
|
|
215
217
|
* const persons = await db
|
|
216
218
|
* .selectFrom('person')
|
|
217
219
|
* .selectAll()
|
|
218
220
|
* .where(ref(columnFromUserInput), '=', 1)
|
|
219
|
-
* .orWhere(
|
|
221
|
+
* .orWhere(sql.id(columnFromUserInput), '=', 2)
|
|
220
222
|
* .execute()
|
|
221
223
|
* ```
|
|
222
224
|
*/
|
|
@@ -381,7 +383,6 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
|
|
|
381
383
|
}
|
|
382
384
|
export interface OnConflictBuilderProps {
|
|
383
385
|
readonly onConflictNode: OnConflictNode;
|
|
384
|
-
readonly parseContext: ParseContext;
|
|
385
386
|
}
|
|
386
387
|
export declare type OnConflictDatabase<DB, TB extends keyof DB> = {
|
|
387
388
|
[K in keyof DB | 'excluded']: K extends keyof DB ? DB[K] : DB[TB];
|
|
@@ -425,7 +426,7 @@ export declare class OnConflictUpdateBuilder<DB, TB extends keyof DB> implements
|
|
|
425
426
|
* ```
|
|
426
427
|
*
|
|
427
428
|
* Operator can be any supported operator or if the typings don't support it
|
|
428
|
-
* you can always use `
|
|
429
|
+
* you can always use `sql\`your operator\``.
|
|
429
430
|
*
|
|
430
431
|
* ```ts
|
|
431
432
|
* const persons = await db
|
|
@@ -495,7 +496,7 @@ export declare class OnConflictUpdateBuilder<DB, TB extends keyof DB> implements
|
|
|
495
496
|
*
|
|
496
497
|
* A `where in` query can be built by using the `in` operator and an array
|
|
497
498
|
* of values. The values in the array can also be subqueries or raw
|
|
498
|
-
*
|
|
499
|
+
* {@link sql} expressions.
|
|
499
500
|
*
|
|
500
501
|
* ```ts
|
|
501
502
|
* const persons = await db
|
|
@@ -511,15 +512,17 @@ export declare class OnConflictUpdateBuilder<DB, TB extends keyof DB> implements
|
|
|
511
512
|
* select * from "person" where "id" in ($1, $2, $3)
|
|
512
513
|
* ```
|
|
513
514
|
*
|
|
514
|
-
* If everything else fails, you can always
|
|
515
|
+
* If everything else fails, you can always use the {@link sql} tag
|
|
515
516
|
* as any of the arguments, including the operator:
|
|
516
517
|
*
|
|
517
518
|
* ```ts
|
|
519
|
+
* import { sql } from 'kysely'
|
|
520
|
+
*
|
|
518
521
|
* const persons = await db
|
|
519
522
|
* .selectFrom('person')
|
|
520
523
|
* .selectAll()
|
|
521
524
|
* .where(
|
|
522
|
-
*
|
|
525
|
+
* sql`coalesce(first_name, last_name)`,
|
|
523
526
|
* 'like',
|
|
524
527
|
* '%' + name + '%',
|
|
525
528
|
* )
|
|
@@ -554,24 +557,25 @@ export declare class OnConflictUpdateBuilder<DB, TB extends keyof DB> implements
|
|
|
554
557
|
* ```
|
|
555
558
|
*
|
|
556
559
|
* In all examples above the columns were known at compile time
|
|
557
|
-
* (except for the
|
|
558
|
-
* you to refer to columns that exist in the database **and**
|
|
559
|
-
* referred to in the current query and context.
|
|
560
|
+
* (except for the raw {@link sql} expressions). By default kysely only
|
|
561
|
+
* allows you to refer to columns that exist in the database **and**
|
|
562
|
+
* can be referred to in the current query and context.
|
|
560
563
|
*
|
|
561
564
|
* Sometimes you may want to refer to columns that come from the user
|
|
562
565
|
* input and thus are not available at compile time.
|
|
563
566
|
*
|
|
564
|
-
* You have two options,
|
|
567
|
+
* You have two options, the {@link sql} tag or `db.dynamic`. The example below
|
|
565
568
|
* uses both:
|
|
566
569
|
*
|
|
567
570
|
* ```ts
|
|
571
|
+
* import { sql } from 'kysely'
|
|
568
572
|
* const { ref } = db.dynamic
|
|
569
573
|
*
|
|
570
574
|
* const persons = await db
|
|
571
575
|
* .selectFrom('person')
|
|
572
576
|
* .selectAll()
|
|
573
577
|
* .where(ref(columnFromUserInput), '=', 1)
|
|
574
|
-
* .orWhere(
|
|
578
|
+
* .orWhere(sql.id(columnFromUserInput), '=', 2)
|
|
575
579
|
* .execute()
|
|
576
580
|
* ```
|
|
577
581
|
*/
|
|
@@ -78,7 +78,7 @@ export class OnConflictBuilder {
|
|
|
78
78
|
where(...args) {
|
|
79
79
|
return new OnConflictBuilder({
|
|
80
80
|
...this.#props,
|
|
81
|
-
onConflictNode: OnConflictNode.cloneWithIndexWhere(this.#props.onConflictNode, parseWhereFilter(
|
|
81
|
+
onConflictNode: OnConflictNode.cloneWithIndexWhere(this.#props.onConflictNode, parseWhereFilter(args)),
|
|
82
82
|
});
|
|
83
83
|
}
|
|
84
84
|
/**
|
|
@@ -89,13 +89,13 @@ export class OnConflictBuilder {
|
|
|
89
89
|
whereRef(lhs, op, rhs) {
|
|
90
90
|
return new OnConflictBuilder({
|
|
91
91
|
...this.#props,
|
|
92
|
-
onConflictNode: OnConflictNode.cloneWithIndexWhere(this.#props.onConflictNode, parseReferenceFilter(
|
|
92
|
+
onConflictNode: OnConflictNode.cloneWithIndexWhere(this.#props.onConflictNode, parseReferenceFilter(lhs, op, rhs)),
|
|
93
93
|
});
|
|
94
94
|
}
|
|
95
95
|
orWhere(...args) {
|
|
96
96
|
return new OnConflictBuilder({
|
|
97
97
|
...this.#props,
|
|
98
|
-
onConflictNode: OnConflictNode.cloneWithIndexOrWhere(this.#props.onConflictNode, parseWhereFilter(
|
|
98
|
+
onConflictNode: OnConflictNode.cloneWithIndexOrWhere(this.#props.onConflictNode, parseWhereFilter(args)),
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
101
|
/**
|
|
@@ -106,7 +106,7 @@ export class OnConflictBuilder {
|
|
|
106
106
|
orWhereRef(lhs, op, rhs) {
|
|
107
107
|
return new OnConflictBuilder({
|
|
108
108
|
...this.#props,
|
|
109
|
-
onConflictNode: OnConflictNode.cloneWithIndexOrWhere(this.#props.onConflictNode, parseReferenceFilter(
|
|
109
|
+
onConflictNode: OnConflictNode.cloneWithIndexOrWhere(this.#props.onConflictNode, parseReferenceFilter(lhs, op, rhs)),
|
|
110
110
|
});
|
|
111
111
|
}
|
|
112
112
|
/**
|
|
@@ -117,7 +117,7 @@ export class OnConflictBuilder {
|
|
|
117
117
|
whereExists(arg) {
|
|
118
118
|
return new OnConflictBuilder({
|
|
119
119
|
...this.#props,
|
|
120
|
-
onConflictNode: OnConflictNode.cloneWithIndexWhere(this.#props.onConflictNode, parseExistFilter(
|
|
120
|
+
onConflictNode: OnConflictNode.cloneWithIndexWhere(this.#props.onConflictNode, parseExistFilter(arg)),
|
|
121
121
|
});
|
|
122
122
|
}
|
|
123
123
|
/**
|
|
@@ -128,7 +128,7 @@ export class OnConflictBuilder {
|
|
|
128
128
|
whereNotExists(arg) {
|
|
129
129
|
return new OnConflictBuilder({
|
|
130
130
|
...this.#props,
|
|
131
|
-
onConflictNode: OnConflictNode.cloneWithIndexWhere(this.#props.onConflictNode, parseNotExistFilter(
|
|
131
|
+
onConflictNode: OnConflictNode.cloneWithIndexWhere(this.#props.onConflictNode, parseNotExistFilter(arg)),
|
|
132
132
|
});
|
|
133
133
|
}
|
|
134
134
|
/**
|
|
@@ -139,7 +139,7 @@ export class OnConflictBuilder {
|
|
|
139
139
|
orWhereExists(arg) {
|
|
140
140
|
return new OnConflictBuilder({
|
|
141
141
|
...this.#props,
|
|
142
|
-
onConflictNode: OnConflictNode.cloneWithIndexOrWhere(this.#props.onConflictNode, parseExistFilter(
|
|
142
|
+
onConflictNode: OnConflictNode.cloneWithIndexOrWhere(this.#props.onConflictNode, parseExistFilter(arg)),
|
|
143
143
|
});
|
|
144
144
|
}
|
|
145
145
|
/**
|
|
@@ -150,7 +150,7 @@ export class OnConflictBuilder {
|
|
|
150
150
|
orWhereNotExists(arg) {
|
|
151
151
|
return new OnConflictBuilder({
|
|
152
152
|
...this.#props,
|
|
153
|
-
onConflictNode: OnConflictNode.cloneWithIndexOrWhere(this.#props.onConflictNode, parseNotExistFilter(
|
|
153
|
+
onConflictNode: OnConflictNode.cloneWithIndexOrWhere(this.#props.onConflictNode, parseNotExistFilter(arg)),
|
|
154
154
|
});
|
|
155
155
|
}
|
|
156
156
|
/**
|
|
@@ -212,7 +212,7 @@ export class OnConflictBuilder {
|
|
|
212
212
|
return new OnConflictUpdateBuilder({
|
|
213
213
|
...this.#props,
|
|
214
214
|
onConflictNode: OnConflictNode.cloneWith(this.#props.onConflictNode, {
|
|
215
|
-
updates: parseUpdateObject(
|
|
215
|
+
updates: parseUpdateObject(updates),
|
|
216
216
|
}),
|
|
217
217
|
});
|
|
218
218
|
}
|
|
@@ -236,7 +236,7 @@ export class OnConflictUpdateBuilder {
|
|
|
236
236
|
where(...args) {
|
|
237
237
|
return new OnConflictUpdateBuilder({
|
|
238
238
|
...this.#props,
|
|
239
|
-
onConflictNode: OnConflictNode.cloneWithUpdateWhere(this.#props.onConflictNode, parseWhereFilter(
|
|
239
|
+
onConflictNode: OnConflictNode.cloneWithUpdateWhere(this.#props.onConflictNode, parseWhereFilter(args)),
|
|
240
240
|
});
|
|
241
241
|
}
|
|
242
242
|
/**
|
|
@@ -247,13 +247,13 @@ export class OnConflictUpdateBuilder {
|
|
|
247
247
|
whereRef(lhs, op, rhs) {
|
|
248
248
|
return new OnConflictUpdateBuilder({
|
|
249
249
|
...this.#props,
|
|
250
|
-
onConflictNode: OnConflictNode.cloneWithUpdateWhere(this.#props.onConflictNode, parseReferenceFilter(
|
|
250
|
+
onConflictNode: OnConflictNode.cloneWithUpdateWhere(this.#props.onConflictNode, parseReferenceFilter(lhs, op, rhs)),
|
|
251
251
|
});
|
|
252
252
|
}
|
|
253
253
|
orWhere(...args) {
|
|
254
254
|
return new OnConflictUpdateBuilder({
|
|
255
255
|
...this.#props,
|
|
256
|
-
onConflictNode: OnConflictNode.cloneWithUpdateOrWhere(this.#props.onConflictNode, parseWhereFilter(
|
|
256
|
+
onConflictNode: OnConflictNode.cloneWithUpdateOrWhere(this.#props.onConflictNode, parseWhereFilter(args)),
|
|
257
257
|
});
|
|
258
258
|
}
|
|
259
259
|
/**
|
|
@@ -264,7 +264,7 @@ export class OnConflictUpdateBuilder {
|
|
|
264
264
|
orWhereRef(lhs, op, rhs) {
|
|
265
265
|
return new OnConflictUpdateBuilder({
|
|
266
266
|
...this.#props,
|
|
267
|
-
onConflictNode: OnConflictNode.cloneWithUpdateOrWhere(this.#props.onConflictNode, parseReferenceFilter(
|
|
267
|
+
onConflictNode: OnConflictNode.cloneWithUpdateOrWhere(this.#props.onConflictNode, parseReferenceFilter(lhs, op, rhs)),
|
|
268
268
|
});
|
|
269
269
|
}
|
|
270
270
|
/**
|
|
@@ -275,7 +275,7 @@ export class OnConflictUpdateBuilder {
|
|
|
275
275
|
whereExists(arg) {
|
|
276
276
|
return new OnConflictUpdateBuilder({
|
|
277
277
|
...this.#props,
|
|
278
|
-
onConflictNode: OnConflictNode.cloneWithUpdateWhere(this.#props.onConflictNode, parseExistFilter(
|
|
278
|
+
onConflictNode: OnConflictNode.cloneWithUpdateWhere(this.#props.onConflictNode, parseExistFilter(arg)),
|
|
279
279
|
});
|
|
280
280
|
}
|
|
281
281
|
/**
|
|
@@ -286,7 +286,7 @@ export class OnConflictUpdateBuilder {
|
|
|
286
286
|
whereNotExists(arg) {
|
|
287
287
|
return new OnConflictUpdateBuilder({
|
|
288
288
|
...this.#props,
|
|
289
|
-
onConflictNode: OnConflictNode.cloneWithUpdateWhere(this.#props.onConflictNode, parseNotExistFilter(
|
|
289
|
+
onConflictNode: OnConflictNode.cloneWithUpdateWhere(this.#props.onConflictNode, parseNotExistFilter(arg)),
|
|
290
290
|
});
|
|
291
291
|
}
|
|
292
292
|
/**
|
|
@@ -297,7 +297,7 @@ export class OnConflictUpdateBuilder {
|
|
|
297
297
|
orWhereExists(arg) {
|
|
298
298
|
return new OnConflictUpdateBuilder({
|
|
299
299
|
...this.#props,
|
|
300
|
-
onConflictNode: OnConflictNode.cloneWithUpdateOrWhere(this.#props.onConflictNode, parseExistFilter(
|
|
300
|
+
onConflictNode: OnConflictNode.cloneWithUpdateOrWhere(this.#props.onConflictNode, parseExistFilter(arg)),
|
|
301
301
|
});
|
|
302
302
|
}
|
|
303
303
|
/**
|
|
@@ -308,7 +308,7 @@ export class OnConflictUpdateBuilder {
|
|
|
308
308
|
orWhereNotExists(arg) {
|
|
309
309
|
return new OnConflictUpdateBuilder({
|
|
310
310
|
...this.#props,
|
|
311
|
-
onConflictNode: OnConflictNode.cloneWithUpdateOrWhere(this.#props.onConflictNode, parseNotExistFilter(
|
|
311
|
+
onConflictNode: OnConflictNode.cloneWithUpdateOrWhere(this.#props.onConflictNode, parseNotExistFilter(arg)),
|
|
312
312
|
});
|
|
313
313
|
}
|
|
314
314
|
toOperationNode() {
|
|
@@ -45,7 +45,7 @@ export interface ReturningInterface<DB, TB extends keyof DB, O> {
|
|
|
45
45
|
* Return arbitrary expressions:
|
|
46
46
|
*
|
|
47
47
|
* ```ts
|
|
48
|
-
*
|
|
48
|
+
* import { sql } from 'kysely'
|
|
49
49
|
*
|
|
50
50
|
* const { id, full_name, first_pet_id } = await db
|
|
51
51
|
* .insertInto('person')
|
|
@@ -55,7 +55,7 @@ export interface ReturningInterface<DB, TB extends keyof DB, O> {
|
|
|
55
55
|
* })
|
|
56
56
|
* .returning([
|
|
57
57
|
* 'id as id',
|
|
58
|
-
*
|
|
58
|
+
* sql<string>`concat(first_name, ' ', last_name)`.as('full_name'),
|
|
59
59
|
* (qb) => qb.selectFrom('pets').select('pet.id').limit(1).as('first_pet_id')
|
|
60
60
|
* ])
|
|
61
61
|
* .executeTakeFirst()
|