kysely 0.10.0 → 0.11.2
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/README.md +7 -3
- package/dist/cjs/dialect/dialect-adapter.d.ts +3 -2
- package/dist/cjs/dialect/mysql/mysql-adapter.js +1 -1
- package/dist/cjs/dialect/mysql/mysql-dialect.d.ts +3 -3
- package/dist/cjs/dialect/mysql/mysql-driver.js +25 -32
- package/dist/cjs/dialect/postgres/postgres-dialect.d.ts +2 -2
- package/dist/cjs/dialect/postgres/postgres-driver.js +8 -19
- package/dist/cjs/dialect/sqlite/sqlite-adapter.d.ts +7 -0
- package/dist/cjs/dialect/sqlite/sqlite-adapter.js +18 -0
- package/dist/cjs/dialect/sqlite/sqlite-dialect.d.ts +64 -0
- package/dist/cjs/dialect/sqlite/sqlite-dialect.js +33 -0
- package/dist/cjs/dialect/sqlite/sqlite-driver.d.ts +14 -0
- package/dist/cjs/dialect/sqlite/sqlite-driver.js +116 -0
- package/dist/cjs/dialect/sqlite/sqlite-introspector.d.ts +7 -0
- package/dist/cjs/dialect/sqlite/sqlite-introspector.js +44 -0
- package/dist/cjs/dialect/sqlite/sqlite-query-compiler.d.ts +7 -0
- package/dist/cjs/dialect/sqlite/sqlite-query-compiler.js +19 -0
- package/dist/cjs/driver/database-connection.d.ts +2 -2
- package/dist/cjs/driver/runtime-driver.js +3 -4
- package/dist/cjs/index.d.ts +45 -30
- package/dist/cjs/index.js +44 -29
- package/dist/cjs/kysely.d.ts +6 -4
- package/dist/cjs/kysely.js +6 -4
- package/dist/cjs/migration/migration.d.ts +1 -1
- package/dist/cjs/migration/migration.js +3 -3
- package/dist/cjs/operation-node/alias-node.d.ts +1 -1
- package/dist/cjs/operation-node/column-definition-node.d.ts +4 -2
- package/dist/cjs/operation-node/create-view-node.d.ts +1 -0
- package/dist/cjs/operation-node/default-value-node.d.ts +14 -0
- package/dist/cjs/operation-node/default-value-node.js +18 -0
- package/dist/cjs/operation-node/generated-always-as-node.d.ts +16 -0
- package/dist/cjs/operation-node/generated-always-as-node.js +25 -0
- package/dist/cjs/operation-node/having-node.d.ts +4 -8
- package/dist/cjs/operation-node/having-node.js +3 -3
- package/dist/cjs/operation-node/join-node.d.ts +6 -9
- package/dist/cjs/operation-node/join-node.js +10 -7
- package/dist/cjs/operation-node/on-node.d.ts +14 -0
- package/dist/cjs/operation-node/on-node.js +28 -0
- package/dist/cjs/operation-node/operation-node-transformer.d.ts +6 -0
- package/dist/cjs/operation-node/operation-node-transformer.js +26 -2
- package/dist/cjs/operation-node/operation-node-utils.d.ts +1 -1
- package/dist/cjs/operation-node/operation-node-visitor.d.ts +7 -0
- package/dist/cjs/operation-node/operation-node-visitor.js +9 -2
- package/dist/cjs/operation-node/operation-node.d.ts +1 -1
- package/dist/cjs/operation-node/query-node.d.ts +3 -3
- package/dist/cjs/operation-node/raw-node.d.ts +1 -1
- package/dist/cjs/operation-node/select-query-node.d.ts +4 -4
- package/dist/cjs/operation-node/where-node.d.ts +4 -8
- package/dist/cjs/operation-node/where-node.js +3 -3
- package/dist/cjs/parser/filter-parser.d.ts +1 -0
- package/dist/cjs/parser/filter-parser.js +49 -52
- package/dist/cjs/parser/returning-parser.d.ts +4 -2
- package/dist/cjs/parser/select-parser.d.ts +2 -2
- package/dist/cjs/plugin/immediate-value.ts/immediate-value-plugin.d.ts +1 -1
- package/dist/cjs/query-builder/delete-result.d.ts +5 -0
- package/dist/cjs/query-builder/delete-result.js +13 -0
- package/dist/cjs/query-builder/expression-builder.d.ts +2 -2
- package/dist/cjs/query-builder/expression-builder.js +1 -1
- package/dist/cjs/query-builder/function-builder.d.ts +5 -5
- package/dist/cjs/query-builder/function-builder.js +3 -3
- package/dist/cjs/query-builder/insert-result.d.ts +27 -0
- package/dist/cjs/query-builder/insert-result.js +35 -0
- package/dist/cjs/query-builder/join-builder.d.ts +3 -0
- package/dist/cjs/query-builder/query-builder.d.ts +95 -81
- package/dist/cjs/query-builder/query-builder.js +38 -41
- package/dist/cjs/query-builder/update-result.d.ts +5 -0
- package/dist/cjs/query-builder/update-result.js +13 -0
- package/dist/cjs/query-compiler/compiled-query.d.ts +5 -0
- package/dist/cjs/query-compiler/compiled-query.js +12 -0
- package/dist/cjs/query-compiler/default-query-compiler.d.ts +6 -0
- package/dist/cjs/query-compiler/default-query-compiler.js +41 -14
- package/dist/cjs/query-creator.d.ts +36 -26
- package/dist/cjs/query-creator.js +25 -17
- package/dist/cjs/raw-builder/raw-builder.d.ts +1 -1
- package/dist/cjs/schema/alter-table-builder.d.ts +4 -0
- package/dist/cjs/schema/alter-table-builder.js +24 -0
- package/dist/cjs/schema/column-definition-builder.d.ts +41 -0
- package/dist/cjs/schema/column-definition-builder.js +18 -1
- package/dist/cjs/schema/create-table-builder.d.ts +6 -7
- package/dist/cjs/schema/create-table-builder.js +6 -7
- package/dist/cjs/schema/create-view-builder.d.ts +4 -0
- package/dist/cjs/schema/create-view-builder.js +11 -0
- package/dist/cjs/util/dynamic-import.d.ts +2 -0
- package/dist/cjs/util/dynamic-import.js +32 -0
- package/dist/cjs/util/performance-now.d.ts +1 -0
- package/dist/cjs/util/performance-now.js +13 -0
- package/dist/cjs/util/type-utils.d.ts +4 -15
- package/dist/esm/dialect/dialect-adapter.d.ts +3 -2
- package/dist/esm/dialect/mysql/mysql-adapter.js +1 -1
- package/dist/esm/dialect/mysql/mysql-dialect.d.ts +3 -3
- package/dist/esm/dialect/mysql/mysql-driver.js +26 -33
- package/dist/esm/dialect/postgres/postgres-dialect.d.ts +2 -2
- package/dist/esm/dialect/postgres/postgres-driver.js +8 -19
- package/dist/esm/dialect/sqlite/sqlite-adapter.d.ts +7 -0
- package/dist/esm/dialect/sqlite/sqlite-adapter.js +14 -0
- package/dist/esm/dialect/sqlite/sqlite-dialect.d.ts +64 -0
- package/dist/esm/dialect/sqlite/sqlite-dialect.js +29 -0
- package/dist/esm/dialect/sqlite/sqlite-driver.d.ts +14 -0
- package/dist/esm/dialect/sqlite/sqlite-driver.js +112 -0
- package/dist/esm/dialect/sqlite/sqlite-introspector.d.ts +7 -0
- package/dist/esm/dialect/sqlite/sqlite-introspector.js +40 -0
- package/dist/esm/dialect/sqlite/sqlite-query-compiler.d.ts +7 -0
- package/dist/esm/dialect/sqlite/sqlite-query-compiler.js +15 -0
- package/dist/esm/driver/database-connection.d.ts +2 -2
- package/dist/esm/driver/runtime-driver.js +3 -4
- package/dist/esm/index.d.ts +45 -30
- package/dist/esm/index.js +44 -29
- package/dist/esm/kysely.d.ts +6 -4
- package/dist/esm/kysely.js +6 -4
- package/dist/esm/migration/migration.d.ts +1 -1
- package/dist/esm/migration/migration.js +3 -3
- package/dist/esm/operation-node/alias-node.d.ts +1 -1
- package/dist/esm/operation-node/column-definition-node.d.ts +4 -2
- package/dist/esm/operation-node/create-view-node.d.ts +1 -0
- package/dist/esm/operation-node/default-value-node.d.ts +14 -0
- package/dist/esm/operation-node/default-value-node.js +15 -0
- package/dist/esm/operation-node/generated-always-as-node.d.ts +16 -0
- package/dist/esm/operation-node/generated-always-as-node.js +22 -0
- package/dist/esm/operation-node/having-node.d.ts +4 -8
- package/dist/esm/operation-node/having-node.js +3 -3
- package/dist/esm/operation-node/join-node.d.ts +6 -9
- package/dist/esm/operation-node/join-node.js +10 -7
- package/dist/esm/operation-node/on-node.d.ts +14 -0
- package/dist/esm/operation-node/on-node.js +25 -0
- package/dist/esm/operation-node/operation-node-transformer.d.ts +6 -0
- package/dist/esm/operation-node/operation-node-transformer.js +26 -2
- package/dist/esm/operation-node/operation-node-utils.d.ts +1 -1
- package/dist/esm/operation-node/operation-node-visitor.d.ts +7 -0
- package/dist/esm/operation-node/operation-node-visitor.js +9 -2
- package/dist/esm/operation-node/operation-node.d.ts +1 -1
- package/dist/esm/operation-node/query-node.d.ts +3 -3
- package/dist/esm/operation-node/raw-node.d.ts +1 -1
- package/dist/esm/operation-node/select-query-node.d.ts +4 -4
- package/dist/esm/operation-node/where-node.d.ts +4 -8
- package/dist/esm/operation-node/where-node.js +3 -3
- package/dist/esm/parser/filter-parser.d.ts +1 -0
- package/dist/esm/parser/filter-parser.js +48 -52
- package/dist/esm/parser/returning-parser.d.ts +4 -2
- package/dist/esm/parser/select-parser.d.ts +2 -2
- package/dist/esm/plugin/immediate-value.ts/immediate-value-plugin.d.ts +1 -1
- package/dist/esm/query-builder/delete-result.d.ts +5 -0
- package/dist/esm/query-builder/delete-result.js +9 -0
- package/dist/esm/query-builder/expression-builder.d.ts +2 -2
- package/dist/esm/query-builder/expression-builder.js +1 -1
- package/dist/esm/query-builder/function-builder.d.ts +5 -5
- package/dist/esm/query-builder/function-builder.js +3 -3
- package/dist/esm/query-builder/insert-result.d.ts +27 -0
- package/dist/esm/query-builder/insert-result.js +31 -0
- package/dist/esm/query-builder/join-builder.d.ts +3 -0
- package/dist/esm/query-builder/query-builder.d.ts +95 -81
- package/dist/esm/query-builder/query-builder.js +38 -41
- package/dist/esm/query-builder/update-result.d.ts +5 -0
- package/dist/esm/query-builder/update-result.js +9 -0
- package/dist/esm/query-compiler/compiled-query.d.ts +5 -0
- package/dist/esm/query-compiler/compiled-query.js +11 -1
- package/dist/esm/query-compiler/default-query-compiler.d.ts +6 -0
- package/dist/esm/query-compiler/default-query-compiler.js +41 -14
- package/dist/esm/query-creator.d.ts +36 -26
- package/dist/esm/query-creator.js +25 -17
- package/dist/esm/raw-builder/raw-builder.d.ts +1 -1
- package/dist/esm/schema/alter-table-builder.d.ts +4 -0
- package/dist/esm/schema/alter-table-builder.js +24 -0
- package/dist/esm/schema/column-definition-builder.d.ts +41 -0
- package/dist/esm/schema/column-definition-builder.js +18 -1
- package/dist/esm/schema/create-table-builder.d.ts +6 -7
- package/dist/esm/schema/create-table-builder.js +6 -7
- package/dist/esm/schema/create-view-builder.d.ts +4 -0
- package/dist/esm/schema/create-view-builder.js +11 -0
- package/dist/esm/util/dynamic-import.d.ts +2 -0
- package/dist/esm/util/dynamic-import.js +27 -0
- package/dist/esm/util/performance-now.d.ts +1 -0
- package/dist/esm/util/performance-now.js +9 -0
- package/dist/esm/util/type-utils.d.ts +4 -15
- package/package.json +5 -3
|
@@ -2,10 +2,10 @@ import { InsertQueryNode } from './insert-query-node.js';
|
|
|
2
2
|
import { SelectQueryNode } from './select-query-node.js';
|
|
3
3
|
import { UpdateQueryNode } from './update-query-node.js';
|
|
4
4
|
import { DeleteQueryNode } from './delete-query-node.js';
|
|
5
|
-
import { WhereChildNode } from './where-node.js';
|
|
6
5
|
import { JoinNode } from './join-node.js';
|
|
7
6
|
import { SelectionNode } from './selection-node.js';
|
|
8
7
|
import { OperationNode } from './operation-node.js';
|
|
8
|
+
import { FilterExpressionNode } from './operation-node-utils.js';
|
|
9
9
|
export declare type QueryNode = SelectQueryNode | DeleteQueryNode | InsertQueryNode | UpdateQueryNode;
|
|
10
10
|
export declare type MutatingQueryNode = DeleteQueryNode | InsertQueryNode | UpdateQueryNode;
|
|
11
11
|
export declare type FilterableQueryNode = SelectQueryNode | DeleteQueryNode | UpdateQueryNode;
|
|
@@ -16,8 +16,8 @@ export declare const QueryNode: Readonly<{
|
|
|
16
16
|
is(node: OperationNode): node is QueryNode;
|
|
17
17
|
isMutating(node: OperationNode): node is MutatingQueryNode;
|
|
18
18
|
isFilterable(node: OperationNode): node is FilterableQueryNode;
|
|
19
|
-
cloneWithWhere<T extends FilterableQueryNode>(node: T, filter:
|
|
20
|
-
cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, filter:
|
|
19
|
+
cloneWithWhere<T extends FilterableQueryNode>(node: T, filter: FilterExpressionNode): T;
|
|
20
|
+
cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, filter: FilterExpressionNode): T_1;
|
|
21
21
|
cloneWithJoin<T_2 extends FilterableQueryNode>(node: T_2, join: JoinNode): T_2;
|
|
22
22
|
cloneWithReturning<T_3 extends MutatingQueryNode>(node: T_3, selections: ReadonlyArray<SelectionNode>): T_3;
|
|
23
23
|
}>;
|
|
@@ -9,6 +9,6 @@ export interface RawNode extends OperationNode {
|
|
|
9
9
|
*/
|
|
10
10
|
export declare const RawNode: Readonly<{
|
|
11
11
|
is(node: OperationNode): node is RawNode;
|
|
12
|
-
create(sqlFragments: string
|
|
12
|
+
create(sqlFragments: ReadonlyArray<string>, params: ReadonlyArray<OperationNode>): RawNode;
|
|
13
13
|
createWithSql(sql: string): RawNode;
|
|
14
14
|
}>;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { FromNode } from './from-node.js';
|
|
2
2
|
import { GroupByItemNode } from './group-by-item-node.js';
|
|
3
3
|
import { GroupByNode } from './group-by-node.js';
|
|
4
|
-
import { HavingNode
|
|
4
|
+
import { HavingNode } from './having-node.js';
|
|
5
5
|
import { JoinNode } from './join-node.js';
|
|
6
6
|
import { LimitNode } from './limit-node.js';
|
|
7
7
|
import { OffsetNode } from './offset-node.js';
|
|
8
8
|
import { OperationNode } from './operation-node.js';
|
|
9
|
-
import { TableExpressionNode } from './operation-node-utils.js';
|
|
9
|
+
import { FilterExpressionNode, TableExpressionNode } from './operation-node-utils.js';
|
|
10
10
|
import { OrderByItemNode } from './order-by-item-node.js';
|
|
11
11
|
import { OrderByNode } from './order-by-node.js';
|
|
12
12
|
import { SelectionNode } from './selection-node.js';
|
|
@@ -44,8 +44,8 @@ export declare const SelectQueryNode: Readonly<{
|
|
|
44
44
|
cloneWithGroupByItems(selectNode: SelectQueryNode, items: ReadonlyArray<GroupByItemNode>): SelectQueryNode;
|
|
45
45
|
cloneWithLimit(selectNode: SelectQueryNode, limit: LimitNode): SelectQueryNode;
|
|
46
46
|
cloneWithOffset(selectNode: SelectQueryNode, offset: OffsetNode): SelectQueryNode;
|
|
47
|
-
cloneWithHaving(selectNode: SelectQueryNode, filter:
|
|
48
|
-
cloneWithOrHaving(selectNode: SelectQueryNode, filter:
|
|
47
|
+
cloneWithHaving(selectNode: SelectQueryNode, filter: FilterExpressionNode): SelectQueryNode;
|
|
48
|
+
cloneWithOrHaving(selectNode: SelectQueryNode, filter: FilterExpressionNode): SelectQueryNode;
|
|
49
49
|
cloneWithDistinct(selectNode: SelectQueryNode): SelectQueryNode;
|
|
50
50
|
cloneWithUnion(selectNode: SelectQueryNode, union: UnionNode): SelectQueryNode;
|
|
51
51
|
}>;
|
|
@@ -1,18 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { FilterNode } from './filter-node.js';
|
|
1
|
+
import { FilterExpressionNode } from './operation-node-utils.js';
|
|
3
2
|
import { OperationNode } from './operation-node.js';
|
|
4
|
-
import { OrNode } from './or-node.js';
|
|
5
|
-
import { ParensNode } from './parens-node.js';
|
|
6
|
-
export declare type WhereChildNode = FilterNode | AndNode | OrNode | ParensNode;
|
|
7
3
|
export interface WhereNode extends OperationNode {
|
|
8
4
|
readonly kind: 'WhereNode';
|
|
9
|
-
readonly where:
|
|
5
|
+
readonly where: FilterExpressionNode;
|
|
10
6
|
}
|
|
11
7
|
/**
|
|
12
8
|
* @internal
|
|
13
9
|
*/
|
|
14
10
|
export declare const WhereNode: Readonly<{
|
|
15
11
|
is(node: OperationNode): node is WhereNode;
|
|
16
|
-
create(filter:
|
|
17
|
-
cloneWithFilter(whereNode: WhereNode, op: 'And' | 'Or',
|
|
12
|
+
create(filter: FilterExpressionNode): WhereNode;
|
|
13
|
+
cloneWithFilter(whereNode: WhereNode, op: 'And' | 'Or', filter: FilterExpressionNode): WhereNode;
|
|
18
14
|
}>;
|
|
@@ -14,12 +14,12 @@ export const WhereNode = freeze({
|
|
|
14
14
|
where: filter,
|
|
15
15
|
});
|
|
16
16
|
},
|
|
17
|
-
cloneWithFilter(whereNode, op,
|
|
17
|
+
cloneWithFilter(whereNode, op, filter) {
|
|
18
18
|
return freeze({
|
|
19
19
|
...whereNode,
|
|
20
20
|
where: op === 'And'
|
|
21
|
-
? AndNode.create(whereNode.where,
|
|
22
|
-
: OrNode.create(whereNode.where,
|
|
21
|
+
? AndNode.create(whereNode.where, filter)
|
|
22
|
+
: OrNode.create(whereNode.where, filter),
|
|
23
23
|
});
|
|
24
24
|
},
|
|
25
25
|
});
|
|
@@ -12,3 +12,4 @@ export declare function parseOnFilter(ctx: ParseContext, args: any[]): FilterExp
|
|
|
12
12
|
export declare function parseReferenceFilter(ctx: ParseContext, lhs: ReferenceExpression<any, any>, op: FilterOperator, rhs: ReferenceExpression<any, any>): FilterNode;
|
|
13
13
|
export declare function parseExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
|
|
14
14
|
export declare function parseNotExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
|
|
15
|
+
export declare function parseFilter(ctx: ParseContext, type: 'where' | 'having' | 'on', args: any[]): FilterExpressionNode;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FilterNode } from '../operation-node/filter-node.js';
|
|
2
|
-
import { isBoolean, isFunction, isNull, isString, } from '../util/object-utils.js';
|
|
2
|
+
import { freeze, isBoolean, isFunction, isNull, isString, } from '../util/object-utils.js';
|
|
3
3
|
import { isOperationNodeSource } from '../operation-node/operation-node-source.js';
|
|
4
4
|
import { RawNode } from '../operation-node/raw-node.js';
|
|
5
5
|
import { OperatorNode, OPERATORS, } from '../operation-node/operator-node.js';
|
|
@@ -9,37 +9,13 @@ import { parseValueExpressionOrList, } from './value-parser.js';
|
|
|
9
9
|
import { SelectQueryNode } from '../operation-node/select-query-node.js';
|
|
10
10
|
import { ValueNode } from '../operation-node/value-node.js';
|
|
11
11
|
export function parseWhereFilter(ctx, args) {
|
|
12
|
-
|
|
13
|
-
return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
|
|
14
|
-
}
|
|
15
|
-
else if (args.length === 1 && isFunction(args[0])) {
|
|
16
|
-
return parseWhereGroup(ctx, args[0]);
|
|
17
|
-
}
|
|
18
|
-
else {
|
|
19
|
-
throw new Error(`invalid arguments passed to a where method ${JSON.stringify(args)}`);
|
|
20
|
-
}
|
|
12
|
+
return parseFilter(ctx, 'where', args);
|
|
21
13
|
}
|
|
22
14
|
export function parseHavingFilter(ctx, args) {
|
|
23
|
-
|
|
24
|
-
return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
|
|
25
|
-
}
|
|
26
|
-
else if (args.length === 1 && isFunction(args[0])) {
|
|
27
|
-
return parseHavingGroup(ctx, args[0]);
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
throw new Error(`invalid arguments passed to a having method ${JSON.stringify(args)}`);
|
|
31
|
-
}
|
|
15
|
+
return parseFilter(ctx, 'having', args);
|
|
32
16
|
}
|
|
33
17
|
export function parseOnFilter(ctx, args) {
|
|
34
|
-
|
|
35
|
-
return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
|
|
36
|
-
}
|
|
37
|
-
else if (args.length === 1 && isFunction(args[0])) {
|
|
38
|
-
return parseOnGroup(ctx, args[0]);
|
|
39
|
-
}
|
|
40
|
-
else {
|
|
41
|
-
throw new Error(`invalid arguments passed to an on method ${JSON.stringify(args)}`);
|
|
42
|
-
}
|
|
18
|
+
return parseFilter(ctx, 'on', args);
|
|
43
19
|
}
|
|
44
20
|
export function parseReferenceFilter(ctx, lhs, op, rhs) {
|
|
45
21
|
return FilterNode.create(parseReferenceExpression(ctx, lhs), parseFilterOperator(op), parseReferenceExpression(ctx, rhs));
|
|
@@ -50,6 +26,24 @@ export function parseExistFilter(ctx, arg) {
|
|
|
50
26
|
export function parseNotExistFilter(ctx, arg) {
|
|
51
27
|
return parseExistExpression(ctx, 'not exists', arg);
|
|
52
28
|
}
|
|
29
|
+
export function parseFilter(ctx, type, args) {
|
|
30
|
+
if (args.length === 3) {
|
|
31
|
+
return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
|
|
32
|
+
}
|
|
33
|
+
else if (args.length === 1) {
|
|
34
|
+
const arg = args[0];
|
|
35
|
+
if (isFunction(arg)) {
|
|
36
|
+
return GROUP_PARSERS[type](ctx, arg);
|
|
37
|
+
}
|
|
38
|
+
else if (isOperationNodeSource(arg)) {
|
|
39
|
+
const node = arg.toOperationNode();
|
|
40
|
+
if (RawNode.is(node)) {
|
|
41
|
+
return node;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
throw new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
|
|
46
|
+
}
|
|
53
47
|
function parseThreeArgFilter(ctx, left, op, right) {
|
|
54
48
|
if ((op === 'is' || op === 'is not') && (isNull(right) || isBoolean(right))) {
|
|
55
49
|
return parseIsFilter(ctx, left, op, right);
|
|
@@ -70,30 +64,6 @@ function parseFilterOperator(op) {
|
|
|
70
64
|
}
|
|
71
65
|
throw new Error(`invalid comparison operator ${JSON.stringify(op)} passed to a filter method`);
|
|
72
66
|
}
|
|
73
|
-
function parseWhereGroup(ctx, callback) {
|
|
74
|
-
const query = callback(ctx.createSelectQueryBuilder([]));
|
|
75
|
-
const queryNode = query.toOperationNode();
|
|
76
|
-
if (!queryNode.where) {
|
|
77
|
-
throw new Error('no `where*` methods called insided a group callback');
|
|
78
|
-
}
|
|
79
|
-
return ParensNode.create(queryNode.where.where);
|
|
80
|
-
}
|
|
81
|
-
function parseHavingGroup(ctx, callback) {
|
|
82
|
-
const query = callback(ctx.createSelectQueryBuilder([]));
|
|
83
|
-
const queryNode = query.toOperationNode();
|
|
84
|
-
if (!queryNode.having) {
|
|
85
|
-
throw new Error('no `having*` methods called insided a group callback');
|
|
86
|
-
}
|
|
87
|
-
return ParensNode.create(queryNode.having.having);
|
|
88
|
-
}
|
|
89
|
-
function parseOnGroup(ctx, callback) {
|
|
90
|
-
const joinBuilder = callback(ctx.createJoinBuilder('InnerJoin', 'table'));
|
|
91
|
-
const joinNode = joinBuilder.toOperationNode();
|
|
92
|
-
if (!joinNode.on) {
|
|
93
|
-
throw new Error('no `on*` methods called insided a group callback');
|
|
94
|
-
}
|
|
95
|
-
return ParensNode.create(joinNode.on);
|
|
96
|
-
}
|
|
97
67
|
function parseExistExpression(ctx, type, arg) {
|
|
98
68
|
const node = isFunction(arg)
|
|
99
69
|
? arg(ctx.createExpressionBuilder()).toOperationNode()
|
|
@@ -103,3 +73,29 @@ function parseExistExpression(ctx, type, arg) {
|
|
|
103
73
|
}
|
|
104
74
|
return FilterNode.create(undefined, OperatorNode.create(type), node);
|
|
105
75
|
}
|
|
76
|
+
const GROUP_PARSERS = freeze({
|
|
77
|
+
where(ctx, callback) {
|
|
78
|
+
const query = callback(ctx.createSelectQueryBuilder([]));
|
|
79
|
+
const queryNode = query.toOperationNode();
|
|
80
|
+
if (!queryNode.where) {
|
|
81
|
+
throw new Error('no `where` methods called insided a group callback');
|
|
82
|
+
}
|
|
83
|
+
return ParensNode.create(queryNode.where.where);
|
|
84
|
+
},
|
|
85
|
+
having(ctx, callback) {
|
|
86
|
+
const query = callback(ctx.createSelectQueryBuilder([]));
|
|
87
|
+
const queryNode = query.toOperationNode();
|
|
88
|
+
if (!queryNode.having) {
|
|
89
|
+
throw new Error('no `having` methods called insided a group callback');
|
|
90
|
+
}
|
|
91
|
+
return ParensNode.create(queryNode.having.having);
|
|
92
|
+
},
|
|
93
|
+
on(ctx, callback) {
|
|
94
|
+
const joinBuilder = callback(ctx.createJoinBuilder('InnerJoin', 'table'));
|
|
95
|
+
const joinNode = joinBuilder.toOperationNode();
|
|
96
|
+
if (!joinNode.on) {
|
|
97
|
+
throw new Error('no `on` methods called insided a group callback');
|
|
98
|
+
}
|
|
99
|
+
return ParensNode.create(joinNode.on.on);
|
|
100
|
+
},
|
|
101
|
+
});
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { DeleteResult } from '../query-builder/delete-result.js';
|
|
2
|
+
import { InsertResult } from '../query-builder/insert-result.js';
|
|
1
3
|
import { QueryBuilder } from '../query-builder/query-builder.js';
|
|
2
|
-
import {
|
|
4
|
+
import { UpdateResult } from '../query-builder/update-result.js';
|
|
3
5
|
import { Selection } from './select-parser.js';
|
|
4
6
|
/**
|
|
5
7
|
* `returning` method output query builder type
|
|
6
8
|
*/
|
|
7
|
-
export declare type QueryBuilderWithReturning<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O extends
|
|
9
|
+
export declare type QueryBuilderWithReturning<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O extends InsertResult ? Selection<DB, TB, S> : O extends DeleteResult ? Selection<DB, TB, S> : O extends UpdateResult ? Selection<DB, TB, S> : O & Selection<DB, TB, S>>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
|
|
2
2
|
import { AliasedQueryBuilder, QueryBuilder } from '../query-builder/query-builder.js';
|
|
3
3
|
import { SelectionNode } from '../operation-node/selection-node.js';
|
|
4
|
-
import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedColumn, AnyAliasedColumnWithTable, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnyColumn, AnyColumnWithTable,
|
|
4
|
+
import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedColumn, AnyAliasedColumnWithTable, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnyColumn, AnyColumnWithTable, RowType, ValueType } from '../util/type-utils.js';
|
|
5
5
|
import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
|
|
6
6
|
import { ParseContext } from './parse-context.js';
|
|
7
7
|
/**
|
|
@@ -13,7 +13,7 @@ export declare type SelectExpressionOrList<DB, TB extends keyof DB> = SelectExpr
|
|
|
13
13
|
* Given a selection expression returns a query builder type that
|
|
14
14
|
* has the selection.
|
|
15
15
|
*/
|
|
16
|
-
export declare type QueryBuilderWithSelection<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O
|
|
16
|
+
export declare type QueryBuilderWithSelection<DB, TB extends keyof DB, O, S> = QueryBuilder<DB, TB, O & Selection<DB, TB, S>>;
|
|
17
17
|
/**
|
|
18
18
|
* `selectAll` output query builder type.
|
|
19
19
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { QueryResult } from '../../driver/database-connection.js';
|
|
2
|
-
import { UnknownRow } from '../../index.js';
|
|
3
2
|
import { RootOperationNode } from '../../query-compiler/query-compiler.js';
|
|
3
|
+
import { UnknownRow } from '../../util/type-utils.js';
|
|
4
4
|
import { KyselyPlugin, PluginTransformQueryArgs, PluginTransformResultArgs } from '../kysely-plugin.js';
|
|
5
5
|
/**
|
|
6
6
|
* Transforms all ValueNodes to immediate.
|
|
@@ -26,7 +26,7 @@ export declare class ExpressionBuilder<DB, TB extends keyof DB> {
|
|
|
26
26
|
* .execute()
|
|
27
27
|
* ```
|
|
28
28
|
*
|
|
29
|
-
* The generated SQL (
|
|
29
|
+
* The generated SQL (PostgreSQL):
|
|
30
30
|
*
|
|
31
31
|
* ```sql
|
|
32
32
|
* select "person"."id", count("pet"."id") as "pet_count"
|
|
@@ -62,7 +62,7 @@ export declare class ExpressionBuilder<DB, TB extends keyof DB> {
|
|
|
62
62
|
* console.log(result[0].owner_name)
|
|
63
63
|
* ```
|
|
64
64
|
*
|
|
65
|
-
* The generated SQL (
|
|
65
|
+
* The generated SQL (PostgreSQL):
|
|
66
66
|
*
|
|
67
67
|
* ```sql
|
|
68
68
|
* select
|
|
@@ -19,7 +19,7 @@ import { RawBuilder } from '../raw-builder/raw-builder.js';
|
|
|
19
19
|
* .execute()
|
|
20
20
|
* ```
|
|
21
21
|
*
|
|
22
|
-
* The generated SQL (
|
|
22
|
+
* The generated SQL (PostgreSQL):
|
|
23
23
|
*
|
|
24
24
|
* ```sql
|
|
25
25
|
* select "person"."id", count("pet"."id") as "pet_count"
|
|
@@ -66,7 +66,7 @@ export declare class FunctionBuilder<DB, TB extends keyof DB> {
|
|
|
66
66
|
* Calls the `sum` function for the column given as the argument.
|
|
67
67
|
*
|
|
68
68
|
* If this is used in a `select` statement the type of the selected expression
|
|
69
|
-
* will be `number | string |
|
|
69
|
+
* will be `number | string | bigint` by default. This is because Kysely can't
|
|
70
70
|
* know the type the db driver outputs. Sometimes the output can be larger than
|
|
71
71
|
* the largest javascript number and a string is returned instead. Most drivers
|
|
72
72
|
* allow you to configure the output type of large numbers and Kysely can't
|
|
@@ -83,12 +83,12 @@ export declare class FunctionBuilder<DB, TB extends keyof DB> {
|
|
|
83
83
|
* .execute()
|
|
84
84
|
* ```
|
|
85
85
|
*/
|
|
86
|
-
sum<O extends number | string |
|
|
86
|
+
sum<O extends number | string | bigint, C extends StringReference<DB, TB> = any>(column: C): RawBuilder<O>;
|
|
87
87
|
/**
|
|
88
88
|
* Calls the `count` function for the column given as the argument.
|
|
89
89
|
*
|
|
90
90
|
* If this is used in a `select` statement the type of the selected expression
|
|
91
|
-
* will be `number | string |
|
|
91
|
+
* will be `number | string |bigint` by default. This is because Kysely can't
|
|
92
92
|
* know the type the db driver outputs. Sometimes the output can be larger than
|
|
93
93
|
* the largest javascript number and a string is returned instead. Most drivers
|
|
94
94
|
* allow you to configure the output type of large numbers and Kysely can't
|
|
@@ -105,7 +105,7 @@ export declare class FunctionBuilder<DB, TB extends keyof DB> {
|
|
|
105
105
|
* .execute()
|
|
106
106
|
* ```
|
|
107
107
|
*/
|
|
108
|
-
count<O extends number | string |
|
|
108
|
+
count<O extends number | string | bigint, C extends StringReference<DB, TB> = any>(column: C): RawBuilder<O>;
|
|
109
109
|
}
|
|
110
110
|
export interface FunctionBuilderProps {
|
|
111
111
|
readonly executor: QueryExecutor;
|
|
@@ -19,7 +19,7 @@ import { createQueryId } from '../util/query-id.js';
|
|
|
19
19
|
* .execute()
|
|
20
20
|
* ```
|
|
21
21
|
*
|
|
22
|
-
* The generated SQL (
|
|
22
|
+
* The generated SQL (PostgreSQL):
|
|
23
23
|
*
|
|
24
24
|
* ```sql
|
|
25
25
|
* select "person"."id", count("pet"."id") as "pet_count"
|
|
@@ -79,7 +79,7 @@ export class FunctionBuilder {
|
|
|
79
79
|
* Calls the `sum` function for the column given as the argument.
|
|
80
80
|
*
|
|
81
81
|
* If this is used in a `select` statement the type of the selected expression
|
|
82
|
-
* will be `number | string |
|
|
82
|
+
* will be `number | string | bigint` by default. This is because Kysely can't
|
|
83
83
|
* know the type the db driver outputs. Sometimes the output can be larger than
|
|
84
84
|
* the largest javascript number and a string is returned instead. Most drivers
|
|
85
85
|
* allow you to configure the output type of large numbers and Kysely can't
|
|
@@ -103,7 +103,7 @@ export class FunctionBuilder {
|
|
|
103
103
|
* Calls the `count` function for the column given as the argument.
|
|
104
104
|
*
|
|
105
105
|
* If this is used in a `select` statement the type of the selected expression
|
|
106
|
-
* will be `number | string |
|
|
106
|
+
* will be `number | string |bigint` by default. This is because Kysely can't
|
|
107
107
|
* know the type the db driver outputs. Sometimes the output can be larger than
|
|
108
108
|
* the largest javascript number and a string is returned instead. Most drivers
|
|
109
109
|
* allow you to configure the output type of large numbers and Kysely can't
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The result of an insert query.
|
|
3
|
+
*
|
|
4
|
+
* If the table has an auto incrementing primary key {@link insertId} will hold
|
|
5
|
+
* the generated id on dialects that support it. For example PostgreSQL doesn't
|
|
6
|
+
* return the id by default and {@link insertId} is undefined. On PostgreSQL you
|
|
7
|
+
* need to use {@link QueryBuilder.returning} or {@link QueryBuilder.returningAll}
|
|
8
|
+
* to get out the inserted id.
|
|
9
|
+
*
|
|
10
|
+
* @example
|
|
11
|
+
* ```ts
|
|
12
|
+
* const result = await db
|
|
13
|
+
* .insertInto('person')
|
|
14
|
+
* .values(person)
|
|
15
|
+
* .executeTakeFirst()
|
|
16
|
+
*
|
|
17
|
+
* console.log(result.insertId)
|
|
18
|
+
* ```
|
|
19
|
+
*/
|
|
20
|
+
export declare class InsertResult {
|
|
21
|
+
#private;
|
|
22
|
+
constructor(insertId: bigint | undefined);
|
|
23
|
+
/**
|
|
24
|
+
* The auto incrementing primary key
|
|
25
|
+
*/
|
|
26
|
+
get insertId(): bigint | undefined;
|
|
27
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The result of an insert query.
|
|
3
|
+
*
|
|
4
|
+
* If the table has an auto incrementing primary key {@link insertId} will hold
|
|
5
|
+
* the generated id on dialects that support it. For example PostgreSQL doesn't
|
|
6
|
+
* return the id by default and {@link insertId} is undefined. On PostgreSQL you
|
|
7
|
+
* need to use {@link QueryBuilder.returning} or {@link QueryBuilder.returningAll}
|
|
8
|
+
* to get out the inserted id.
|
|
9
|
+
*
|
|
10
|
+
* @example
|
|
11
|
+
* ```ts
|
|
12
|
+
* const result = await db
|
|
13
|
+
* .insertInto('person')
|
|
14
|
+
* .values(person)
|
|
15
|
+
* .executeTakeFirst()
|
|
16
|
+
*
|
|
17
|
+
* console.log(result.insertId)
|
|
18
|
+
* ```
|
|
19
|
+
*/
|
|
20
|
+
export class InsertResult {
|
|
21
|
+
#insertId;
|
|
22
|
+
constructor(insertId) {
|
|
23
|
+
this.#insertId = insertId;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* The auto incrementing primary key
|
|
27
|
+
*/
|
|
28
|
+
get insertId() {
|
|
29
|
+
return this.#insertId;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
@@ -4,6 +4,7 @@ import { ExistsExpression, FilterOperator } from '../parser/filter-parser.js';
|
|
|
4
4
|
import { ParseContext } from '../parser/parse-context.js';
|
|
5
5
|
import { ReferenceExpression } from '../parser/reference-parser.js';
|
|
6
6
|
import { ValueExpressionOrList } from '../parser/value-parser.js';
|
|
7
|
+
import { AnyRawBuilder } from '../util/type-utils.js';
|
|
7
8
|
export declare class JoinBuilder<DB, TB extends keyof DB> implements OperationNodeSource {
|
|
8
9
|
#private;
|
|
9
10
|
constructor(props: JoinBuilderProps);
|
|
@@ -15,6 +16,7 @@ export declare class JoinBuilder<DB, TB extends keyof DB> implements OperationNo
|
|
|
15
16
|
*/
|
|
16
17
|
on<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: FilterOperator, rhs: ValueExpressionOrList<DB, TB, RE>): JoinBuilder<DB, TB>;
|
|
17
18
|
on(grouper: (qb: JoinBuilder<DB, TB>) => JoinBuilder<DB, TB>): JoinBuilder<DB, TB>;
|
|
19
|
+
on(raw: AnyRawBuilder): JoinBuilder<DB, TB>;
|
|
18
20
|
/**
|
|
19
21
|
* Just like {@link QueryBuilder.orWhere} but adds an item to the join's
|
|
20
22
|
* `on` clause instead.
|
|
@@ -23,6 +25,7 @@ export declare class JoinBuilder<DB, TB extends keyof DB> implements OperationNo
|
|
|
23
25
|
*/
|
|
24
26
|
orOn<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: FilterOperator, rhs: ValueExpressionOrList<DB, TB, RE>): JoinBuilder<DB, TB>;
|
|
25
27
|
orOn(grouper: (qb: JoinBuilder<DB, TB>) => JoinBuilder<DB, TB>): JoinBuilder<DB, TB>;
|
|
28
|
+
orOn(raw: AnyRawBuilder): JoinBuilder<DB, TB>;
|
|
26
29
|
/**
|
|
27
30
|
* Just like {@link QueryBuilder.whereRef} but adds an item to the join's
|
|
28
31
|
* `on` clause instead.
|