kysely 0.19.3 → 0.19.6
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/dist/cjs/dialect/database-introspector.d.ts +11 -2
- package/dist/cjs/dialect/mysql/mysql-introspector.js +4 -0
- package/dist/cjs/dialect/postgres/postgres-introspector.js +12 -0
- package/dist/cjs/dialect/sqlite/sqlite-introspector.js +17 -3
- package/dist/cjs/index.d.ts +0 -1
- package/dist/cjs/index.js +0 -1
- package/dist/cjs/operation-node/check-constraint-node.d.ts +1 -1
- package/dist/cjs/operation-node/common-table-expression-name-node.d.ts +1 -1
- package/dist/cjs/operation-node/create-schema-node.d.ts +1 -1
- package/dist/cjs/operation-node/delete-query-node.d.ts +1 -1
- package/dist/cjs/operation-node/drop-index-node.d.ts +1 -1
- package/dist/cjs/operation-node/drop-schema-node.d.ts +1 -1
- package/dist/cjs/operation-node/drop-table-node.d.ts +1 -1
- package/dist/cjs/operation-node/foreign-key-constraint-node.d.ts +1 -1
- package/dist/cjs/operation-node/insert-query-node.d.ts +1 -1
- package/dist/cjs/operation-node/join-node.d.ts +1 -1
- package/dist/cjs/operation-node/order-by-item-node.d.ts +1 -1
- package/dist/cjs/operation-node/primary-constraint-node.d.ts +1 -1
- package/dist/cjs/operation-node/select-query-node.d.ts +1 -1
- package/dist/cjs/operation-node/unique-constraint-node.d.ts +1 -1
- package/dist/cjs/operation-node/update-query-node.d.ts +1 -1
- package/dist/cjs/operation-node/with-node.d.ts +1 -1
- package/dist/cjs/parser/join-parser.d.ts +4 -4
- package/dist/cjs/parser/table-parser.d.ts +5 -14
- package/dist/cjs/query-builder/delete-query-builder.d.ts +35 -13
- package/dist/cjs/query-builder/expression-builder.d.ts +3 -3
- package/dist/cjs/query-builder/join-builder.d.ts +4 -0
- package/dist/cjs/query-builder/join-builder.js +10 -0
- package/dist/cjs/query-builder/select-query-builder.d.ts +74 -13
- package/dist/cjs/query-builder/select-query-builder.js +12 -0
- package/dist/cjs/query-builder/update-query-builder.d.ts +37 -15
- package/dist/cjs/query-compiler/default-query-compiler.js +2 -0
- package/dist/cjs/query-creator.d.ts +5 -5
- package/dist/cjs/util/type-utils.d.ts +3 -0
- package/dist/esm/dialect/database-introspector.d.ts +11 -2
- package/dist/esm/dialect/mysql/mysql-introspector.js +4 -0
- package/dist/esm/dialect/postgres/postgres-introspector.js +12 -0
- package/dist/esm/dialect/sqlite/sqlite-introspector.js +17 -3
- package/dist/esm/index.d.ts +0 -1
- package/dist/esm/index.js +0 -1
- package/dist/esm/operation-node/check-constraint-node.d.ts +1 -1
- package/dist/esm/operation-node/common-table-expression-name-node.d.ts +1 -1
- package/dist/esm/operation-node/create-schema-node.d.ts +1 -1
- package/dist/esm/operation-node/delete-query-node.d.ts +1 -1
- package/dist/esm/operation-node/drop-index-node.d.ts +1 -1
- package/dist/esm/operation-node/drop-schema-node.d.ts +1 -1
- package/dist/esm/operation-node/drop-table-node.d.ts +1 -1
- package/dist/esm/operation-node/foreign-key-constraint-node.d.ts +1 -1
- package/dist/esm/operation-node/insert-query-node.d.ts +1 -1
- package/dist/esm/operation-node/join-node.d.ts +1 -1
- package/dist/esm/operation-node/order-by-item-node.d.ts +1 -1
- package/dist/esm/operation-node/primary-constraint-node.d.ts +1 -1
- package/dist/esm/operation-node/select-query-node.d.ts +1 -1
- package/dist/esm/operation-node/unique-constraint-node.d.ts +1 -1
- package/dist/esm/operation-node/update-query-node.d.ts +1 -1
- package/dist/esm/operation-node/with-node.d.ts +1 -1
- package/dist/esm/parser/join-parser.d.ts +4 -4
- package/dist/esm/parser/table-parser.d.ts +5 -14
- package/dist/esm/query-builder/delete-query-builder.d.ts +35 -13
- package/dist/esm/query-builder/expression-builder.d.ts +3 -3
- package/dist/esm/query-builder/join-builder.d.ts +4 -0
- package/dist/esm/query-builder/join-builder.js +10 -0
- package/dist/esm/query-builder/select-query-builder.d.ts +74 -13
- package/dist/esm/query-builder/select-query-builder.js +12 -0
- package/dist/esm/query-builder/update-query-builder.d.ts +37 -15
- package/dist/esm/query-compiler/default-query-compiler.js +2 -0
- package/dist/esm/query-creator.d.ts +5 -5
- package/dist/esm/util/type-utils.d.ts +3 -0
- package/package.json +10 -10
- package/dist/cjs/query-builder/join-interface.d.ts +0 -130
- package/dist/cjs/query-builder/join-interface.js +0 -2
- package/dist/esm/query-builder/join-interface.d.ts +0 -130
- package/dist/esm/query-builder/join-interface.js +0 -2
|
@@ -2,12 +2,12 @@ import { AliasNode } from '../operation-node/alias-node.js';
|
|
|
2
2
|
import { OperationNodeSource } from '../operation-node/operation-node-source.js';
|
|
3
3
|
import { CompiledQuery } from '../query-compiler/compiled-query.js';
|
|
4
4
|
import { JoinCallbackExpression, JoinReferenceExpression } from '../parser/join-parser.js';
|
|
5
|
-
import { TableExpression
|
|
5
|
+
import { TableExpression } from '../parser/table-parser.js';
|
|
6
6
|
import { SelectExpression, QueryBuilderWithSelection, SelectAllQueryBuilder } from '../parser/select-parser.js';
|
|
7
7
|
import { ExistsExpression, FilterOperator, FilterValueExpressionOrList, WhereGrouper, HavingGrouper } from '../parser/filter-parser.js';
|
|
8
8
|
import { ReferenceExpression } from '../parser/reference-parser.js';
|
|
9
9
|
import { SelectQueryNode } from '../operation-node/select-query-node.js';
|
|
10
|
-
import { AnyRawBuilder, MergePartial, SingleResultType } from '../util/type-utils.js';
|
|
10
|
+
import { AnyRawBuilder, MergePartial, Nullable, SingleResultType } from '../util/type-utils.js';
|
|
11
11
|
import { OrderByDirectionExpression, OrderByExpression } from '../parser/order-by-parser.js';
|
|
12
12
|
import { Compilable } from '../util/compilable.js';
|
|
13
13
|
import { QueryExecutor } from '../query-executor/query-executor.js';
|
|
@@ -15,10 +15,10 @@ import { QueryId } from '../util/query-id.js';
|
|
|
15
15
|
import { UnionExpression } from '../parser/union-parser.js';
|
|
16
16
|
import { KyselyPlugin } from '../plugin/kysely-plugin.js';
|
|
17
17
|
import { WhereInterface } from './where-interface.js';
|
|
18
|
-
import { JoinInterface } from './join-interface.js';
|
|
19
18
|
import { NoResultErrorConstructor } from './no-result-error.js';
|
|
20
19
|
import { HavingInterface } from './having-interface.js';
|
|
21
|
-
|
|
20
|
+
import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
|
|
21
|
+
export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, HavingInterface<DB, TB>, OperationNodeSource, Compilable {
|
|
22
22
|
#private;
|
|
23
23
|
constructor(props: SelectQueryBuilderProps);
|
|
24
24
|
/**
|
|
@@ -856,23 +856,63 @@ export declare class SelectQueryBuilder<DB, TB extends keyof DB, O> implements W
|
|
|
856
856
|
* on "doggos"."owner_id" = "person"."id"
|
|
857
857
|
* ```
|
|
858
858
|
*/
|
|
859
|
-
innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2):
|
|
860
|
-
innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN):
|
|
859
|
+
innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithInnerJoin<DB, TB, O, TE>;
|
|
860
|
+
innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithInnerJoin<DB, TB, O, TE>;
|
|
861
861
|
/**
|
|
862
|
-
* Just like {@link innerJoin} but adds a left join
|
|
862
|
+
* Just like {@link innerJoin} but adds a left join instead of an inner join.
|
|
863
863
|
*/
|
|
864
|
-
leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2):
|
|
865
|
-
leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN):
|
|
864
|
+
leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithLeftJoin<DB, TB, O, TE>;
|
|
865
|
+
leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithLeftJoin<DB, TB, O, TE>;
|
|
866
866
|
/**
|
|
867
867
|
* Just like {@link innerJoin} but adds a right join instead of an inner join.
|
|
868
868
|
*/
|
|
869
|
-
rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2):
|
|
870
|
-
rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN):
|
|
869
|
+
rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithRightJoin<DB, TB, O, TE>;
|
|
870
|
+
rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithRightJoin<DB, TB, O, TE>;
|
|
871
871
|
/**
|
|
872
872
|
* Just like {@link innerJoin} but adds a full join instead of an inner join.
|
|
873
873
|
*/
|
|
874
|
-
fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2):
|
|
875
|
-
fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN):
|
|
874
|
+
fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithFullJoin<DB, TB, O, TE>;
|
|
875
|
+
fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithFullJoin<DB, TB, O, TE>;
|
|
876
|
+
/**
|
|
877
|
+
* Just like {@link innerJoin} but adds a lateral join instead of an inner join.
|
|
878
|
+
*
|
|
879
|
+
* ### Examples
|
|
880
|
+
*
|
|
881
|
+
* ```ts
|
|
882
|
+
* db.selectFrom('person')
|
|
883
|
+
* .innerJoinLateral(
|
|
884
|
+
* (eb) =>
|
|
885
|
+
* eb.selectFrom('pet')
|
|
886
|
+
* .select('name')
|
|
887
|
+
* .whereRef('pet.owner_id', '=', 'person.id')
|
|
888
|
+
* .as('p'),
|
|
889
|
+
* (join) => join.onTrue()
|
|
890
|
+
* )
|
|
891
|
+
* .select(['first_name', 'p.name'])
|
|
892
|
+
* .orderBy('first_name')
|
|
893
|
+
*/
|
|
894
|
+
innerJoinLateral<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithInnerJoin<DB, TB, O, TE>;
|
|
895
|
+
innerJoinLateral<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithInnerJoin<DB, TB, O, TE>;
|
|
896
|
+
/**
|
|
897
|
+
* Just like {@link innerJoin} but adds a lateral left join instead of an inner join.
|
|
898
|
+
* ### Examples
|
|
899
|
+
*
|
|
900
|
+
* ```ts
|
|
901
|
+
* db.selectFrom('person')
|
|
902
|
+
* .leftJoinLateral(
|
|
903
|
+
* (eb) =>
|
|
904
|
+
* eb.selectFrom('pet')
|
|
905
|
+
* .select('name')
|
|
906
|
+
* .whereRef('pet.owner_id', '=', 'person.id')
|
|
907
|
+
* .as('p'),
|
|
908
|
+
* (join) => join.onTrue()
|
|
909
|
+
* )
|
|
910
|
+
* .select(['first_name', 'p.name'])
|
|
911
|
+
* .orderBy('first_name')
|
|
912
|
+
* ```
|
|
913
|
+
*/
|
|
914
|
+
leftJoinLateral<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): SelectQueryBuilderWithLeftJoin<DB, TB, O, TE>;
|
|
915
|
+
leftJoinLateral<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): SelectQueryBuilderWithLeftJoin<DB, TB, O, TE>;
|
|
876
916
|
/**
|
|
877
917
|
* Adds an `order by` clause to the query.
|
|
878
918
|
*
|
|
@@ -1282,3 +1322,24 @@ export declare class AliasedQueryBuilder<DB, TB extends keyof DB, O = undefined,
|
|
|
1282
1322
|
protected get alias(): A;
|
|
1283
1323
|
toOperationNode(): AliasNode;
|
|
1284
1324
|
}
|
|
1325
|
+
export declare type SelectQueryBuilderWithInnerJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? InnerJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? SelectQueryBuilder<DB, TB | TE, O> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, TB, O, RA, RO> : never;
|
|
1326
|
+
declare type InnerJoinedBuilder<DB, TB extends keyof DB, O, A extends string, R> = A extends keyof DB ? SelectQueryBuilder<InnerJoinedDB<DB, A, R>, TB | A, O> : SelectQueryBuilder<DB & Record<A, R>, TB | A, O>;
|
|
1327
|
+
declare type InnerJoinedDB<DB, A extends string, R> = {
|
|
1328
|
+
[C in keyof DB | A]: C extends A ? R : C extends keyof DB ? DB[C] : never;
|
|
1329
|
+
};
|
|
1330
|
+
export declare type SelectQueryBuilderWithLeftJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? LeftJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? LeftJoinedBuilder<DB, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, TB, O, RA, RO> : never;
|
|
1331
|
+
declare type LeftJoinedBuilder<DB, TB extends keyof DB, O, A extends keyof any, R> = A extends keyof DB ? SelectQueryBuilder<LeftJoinedDB<DB, A, R>, TB | A, O> : SelectQueryBuilder<DB & Record<A, Nullable<R>>, TB | A, O>;
|
|
1332
|
+
declare type LeftJoinedDB<DB, A extends keyof any, R> = {
|
|
1333
|
+
[C in keyof DB | A]: C extends A ? Nullable<R> : C extends keyof DB ? DB[C] : never;
|
|
1334
|
+
};
|
|
1335
|
+
export declare type SelectQueryBuilderWithRightJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? RightJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? RightJoinedBuilder<DB, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, TB, O, RA, RO> : never;
|
|
1336
|
+
declare type RightJoinedBuilder<DB, TB extends keyof DB, O, A extends keyof any, R> = SelectQueryBuilder<RightJoinedDB<DB, TB, A, R>, TB | A, O>;
|
|
1337
|
+
declare type RightJoinedDB<DB, TB extends keyof DB, A extends keyof any, R> = {
|
|
1338
|
+
[C in keyof DB | A]: C extends A ? R : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
|
|
1339
|
+
};
|
|
1340
|
+
export declare type SelectQueryBuilderWithFullJoin<DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? OuterJoinedBuilder<DB, TB, O, A, DB[T]> : never : TE extends keyof DB ? OuterJoinedBuilder<DB, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, TB, O, RA, RO> : never;
|
|
1341
|
+
declare type OuterJoinedBuilder<DB, TB extends keyof DB, O, A extends keyof any, R> = SelectQueryBuilder<OuterJoinedBuilderDB<DB, TB, A, R>, TB | A, O>;
|
|
1342
|
+
declare type OuterJoinedBuilderDB<DB, TB extends keyof DB, A extends keyof any, R> = {
|
|
1343
|
+
[C in keyof DB | A]: C extends A ? Nullable<R> : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
|
|
1344
|
+
};
|
|
1345
|
+
export {};
|
|
@@ -237,6 +237,18 @@ class SelectQueryBuilder {
|
|
|
237
237
|
queryNode: query_node_js_1.QueryNode.cloneWithJoin(this.#props.queryNode, (0, join_parser_js_1.parseJoin)('FullJoin', args)),
|
|
238
238
|
});
|
|
239
239
|
}
|
|
240
|
+
innerJoinLateral(...args) {
|
|
241
|
+
return new SelectQueryBuilder({
|
|
242
|
+
...this.#props,
|
|
243
|
+
queryNode: query_node_js_1.QueryNode.cloneWithJoin(this.#props.queryNode, (0, join_parser_js_1.parseJoin)('LateralInnerJoin', args)),
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
leftJoinLateral(...args) {
|
|
247
|
+
return new SelectQueryBuilder({
|
|
248
|
+
...this.#props,
|
|
249
|
+
queryNode: query_node_js_1.QueryNode.cloneWithJoin(this.#props.queryNode, (0, join_parser_js_1.parseJoin)('LateralLeftJoin', args)),
|
|
250
|
+
});
|
|
251
|
+
}
|
|
240
252
|
/**
|
|
241
253
|
* Adds an `order by` clause to the query.
|
|
242
254
|
*
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { OperationNodeSource } from '../operation-node/operation-node-source.js';
|
|
2
2
|
import { CompiledQuery } from '../query-compiler/compiled-query.js';
|
|
3
3
|
import { JoinCallbackExpression, JoinReferenceExpression } from '../parser/join-parser.js';
|
|
4
|
-
import { TableExpression,
|
|
4
|
+
import { TableExpression, From, FromTables } from '../parser/table-parser.js';
|
|
5
5
|
import { SelectExpression } from '../parser/select-parser.js';
|
|
6
6
|
import { ExistsExpression, FilterOperator, FilterValueExpressionOrList, WhereGrouper } from '../parser/filter-parser.js';
|
|
7
7
|
import { ReturningRow } from '../parser/returning-parser.js';
|
|
8
8
|
import { ReferenceExpression } from '../parser/reference-parser.js';
|
|
9
|
-
import { AnyRawBuilder, MergePartial, SingleResultType } from '../util/type-utils.js';
|
|
9
|
+
import { AnyRawBuilder, MergePartial, Nullable, SingleResultType } from '../util/type-utils.js';
|
|
10
10
|
import { UpdateQueryNode } from '../operation-node/update-query-node.js';
|
|
11
11
|
import { MutationObject } from '../parser/update-set-parser.js';
|
|
12
12
|
import { Compilable } from '../util/compilable.js';
|
|
@@ -15,11 +15,12 @@ import { QueryId } from '../util/query-id.js';
|
|
|
15
15
|
import { UpdateResult } from './update-result.js';
|
|
16
16
|
import { KyselyPlugin } from '../plugin/kysely-plugin.js';
|
|
17
17
|
import { WhereInterface } from './where-interface.js';
|
|
18
|
-
import { JoinInterface } from './join-interface.js';
|
|
19
18
|
import { ReturningInterface } from './returning-interface.js';
|
|
20
19
|
import { NoResultErrorConstructor } from './no-result-error.js';
|
|
21
20
|
import { Selectable } from '../util/column-type.js';
|
|
22
|
-
|
|
21
|
+
import { AliasedQueryBuilder } from './select-query-builder.js';
|
|
22
|
+
import { AliasedRawBuilder } from '../raw-builder/raw-builder.js';
|
|
23
|
+
export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O> implements WhereInterface<DB, TB>, ReturningInterface<DB, TB, O>, OperationNodeSource, Compilable {
|
|
23
24
|
#private;
|
|
24
25
|
constructor(props: UpdateQueryBuilderProps);
|
|
25
26
|
/**
|
|
@@ -433,8 +434,8 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
|
|
|
433
434
|
* where "pet"."owner_id" = "person"."id"
|
|
434
435
|
* ```
|
|
435
436
|
*/
|
|
436
|
-
from<TE extends TableExpression<DB, TB>>(table: TE): UpdateQueryBuilder<
|
|
437
|
-
from<TE extends TableExpression<DB, TB>>(table: TE[]): UpdateQueryBuilder<
|
|
437
|
+
from<TE extends TableExpression<DB, TB>>(table: TE): UpdateQueryBuilder<From<DB, TE>, UT, FromTables<DB, TB, TE>, O>;
|
|
438
|
+
from<TE extends TableExpression<DB, TB>>(table: TE[]): UpdateQueryBuilder<From<DB, TE>, UT, FromTables<DB, TB, TE>, O>;
|
|
438
439
|
/**
|
|
439
440
|
* Joins another table to the query using an inner join.
|
|
440
441
|
*
|
|
@@ -544,23 +545,23 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
|
|
|
544
545
|
* on "doggos"."owner_id" = "person"."id"
|
|
545
546
|
* ```
|
|
546
547
|
*/
|
|
547
|
-
innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2):
|
|
548
|
-
innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN):
|
|
548
|
+
innerJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilderWithInnerJoin<DB, UT, TB, O, TE>;
|
|
549
|
+
innerJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilderWithInnerJoin<DB, UT, TB, O, TE>;
|
|
549
550
|
/**
|
|
550
|
-
* Just like {@link innerJoin} but adds a left join
|
|
551
|
+
* Just like {@link innerJoin} but adds a left join instead of an inner join.
|
|
551
552
|
*/
|
|
552
|
-
leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2):
|
|
553
|
-
leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN):
|
|
553
|
+
leftJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilderWithLeftJoin<DB, UT, TB, O, TE>;
|
|
554
|
+
leftJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilderWithLeftJoin<DB, UT, TB, O, TE>;
|
|
554
555
|
/**
|
|
555
556
|
* Just like {@link innerJoin} but adds a right join instead of an inner join.
|
|
556
557
|
*/
|
|
557
|
-
rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2):
|
|
558
|
-
rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN):
|
|
558
|
+
rightJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilderWithRightJoin<DB, UT, TB, O, TE>;
|
|
559
|
+
rightJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilderWithRightJoin<DB, UT, TB, O, TE>;
|
|
559
560
|
/**
|
|
560
561
|
* Just like {@link innerJoin} but adds a full join instead of an inner join.
|
|
561
562
|
*/
|
|
562
|
-
fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2):
|
|
563
|
-
fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN):
|
|
563
|
+
fullJoin<TE extends TableExpression<DB, TB>, K1 extends JoinReferenceExpression<DB, TB, TE>, K2 extends JoinReferenceExpression<DB, TB, TE>>(table: TE, k1: K1, k2: K2): UpdateQueryBuilderWithFullJoin<DB, UT, TB, O, TE>;
|
|
564
|
+
fullJoin<TE extends TableExpression<DB, TB>, FN extends JoinCallbackExpression<DB, TB, TE>>(table: TE, callback: FN): UpdateQueryBuilderWithFullJoin<DB, UT, TB, O, TE>;
|
|
564
565
|
/**
|
|
565
566
|
* Sets the values to update for an {@link Kysely.updateTable | update} query.
|
|
566
567
|
*
|
|
@@ -814,3 +815,24 @@ export interface UpdateQueryBuilderProps {
|
|
|
814
815
|
readonly queryNode: UpdateQueryNode;
|
|
815
816
|
readonly executor: QueryExecutor;
|
|
816
817
|
}
|
|
818
|
+
export declare type UpdateQueryBuilderWithInnerJoin<DB, UT extends keyof DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? InnerJoinedBuilder<DB, UT, TB, O, A, DB[T]> : never : TE extends keyof DB ? UpdateQueryBuilder<DB, UT, TB | TE, O> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? InnerJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, UT, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? InnerJoinedBuilder<DB, UT, TB, O, RA, RO> : never;
|
|
819
|
+
declare type InnerJoinedBuilder<DB, UT extends keyof DB, TB extends keyof DB, O, A extends string, R> = A extends keyof DB ? UpdateQueryBuilder<InnerJoinedDB<DB, A, R>, UT, TB | A, O> : UpdateQueryBuilder<DB & Record<A, R>, UT, TB | A, O>;
|
|
820
|
+
declare type InnerJoinedDB<DB, A extends string, R> = {
|
|
821
|
+
[C in keyof DB | A]: C extends A ? R : C extends keyof DB ? DB[C] : never;
|
|
822
|
+
};
|
|
823
|
+
export declare type UpdateQueryBuilderWithLeftJoin<DB, UT extends keyof DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? LeftJoinedBuilder<DB, UT, TB, O, A, DB[T]> : never : TE extends keyof DB ? LeftJoinedBuilder<DB, UT, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? LeftJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, UT, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? LeftJoinedBuilder<DB, UT, TB, O, RA, RO> : never;
|
|
824
|
+
declare type LeftJoinedBuilder<DB, UT extends keyof DB, TB extends keyof DB, O, A extends keyof any, R> = A extends keyof DB ? UpdateQueryBuilder<LeftJoinedDB<DB, A, R>, UT, TB | A, O> : UpdateQueryBuilder<DB & Record<A, Nullable<R>>, UT, TB | A, O>;
|
|
825
|
+
declare type LeftJoinedDB<DB, A extends keyof any, R> = {
|
|
826
|
+
[C in keyof DB | A]: C extends A ? Nullable<R> : C extends keyof DB ? DB[C] : never;
|
|
827
|
+
};
|
|
828
|
+
export declare type UpdateQueryBuilderWithRightJoin<DB, UT extends keyof DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? RightJoinedBuilder<DB, UT, TB, O, A, DB[T]> : never : TE extends keyof DB ? RightJoinedBuilder<DB, UT, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? RightJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, UT, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? RightJoinedBuilder<DB, UT, TB, O, RA, RO> : never;
|
|
829
|
+
declare type RightJoinedBuilder<DB, UT extends keyof DB, TB extends keyof DB, O, A extends keyof any, R> = UpdateQueryBuilder<RightJoinedDB<DB, TB, A, R>, UT, TB | A, O>;
|
|
830
|
+
declare type RightJoinedDB<DB, TB extends keyof DB, A extends keyof any, R> = {
|
|
831
|
+
[C in keyof DB | A]: C extends A ? R : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
|
|
832
|
+
};
|
|
833
|
+
export declare type UpdateQueryBuilderWithFullJoin<DB, UT extends keyof DB, TB extends keyof DB, O, TE extends TableExpression<DB, TB>> = TE extends `${infer T} as ${infer A}` ? T extends keyof DB ? OuterJoinedBuilder<DB, UT, TB, O, A, DB[T]> : never : TE extends keyof DB ? OuterJoinedBuilder<DB, UT, TB, O, TE, DB[TE]> : TE extends AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends (qb: any) => AliasedQueryBuilder<any, any, infer QO, infer QA> ? OuterJoinedBuilder<DB, UT, TB, O, QA, QO> : TE extends AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, UT, TB, O, RA, RO> : TE extends (qb: any) => AliasedRawBuilder<infer RO, infer RA> ? OuterJoinedBuilder<DB, UT, TB, O, RA, RO> : never;
|
|
834
|
+
declare type OuterJoinedBuilder<DB, UT extends keyof DB, TB extends keyof DB, O, A extends keyof any, R> = UpdateQueryBuilder<OuterJoinedBuilderDB<DB, TB, A, R>, UT, TB | A, O>;
|
|
835
|
+
declare type OuterJoinedBuilderDB<DB, TB extends keyof DB, A extends keyof any, R> = {
|
|
836
|
+
[C in keyof DB | A]: C extends A ? Nullable<R> : C extends TB ? Nullable<DB[C]> : C extends keyof DB ? DB[C] : never;
|
|
837
|
+
};
|
|
838
|
+
export {};
|
|
@@ -2,7 +2,7 @@ import { SelectQueryBuilder } from './query-builder/select-query-builder.js';
|
|
|
2
2
|
import { InsertQueryBuilder } from './query-builder/insert-query-builder.js';
|
|
3
3
|
import { DeleteQueryBuilder } from './query-builder/delete-query-builder.js';
|
|
4
4
|
import { UpdateQueryBuilder } from './query-builder/update-query-builder.js';
|
|
5
|
-
import { TableExpression,
|
|
5
|
+
import { TableExpression, From, FromTables, TableReference } from './parser/table-parser.js';
|
|
6
6
|
import { QueryExecutor } from './query-executor/query-executor.js';
|
|
7
7
|
import { CommonTableExpression, QueryCreatorWithCommonTableExpression, RecursiveCommonTableExpression } from './parser/with-parser.js';
|
|
8
8
|
import { WithNode } from './operation-node/with-node.js';
|
|
@@ -120,8 +120,8 @@ export declare class QueryCreator<DB> {
|
|
|
120
120
|
* (select 1 as one) as "q"
|
|
121
121
|
* ```
|
|
122
122
|
*/
|
|
123
|
-
selectFrom<TE extends TableExpression<DB, keyof DB>>(from: TE[]): SelectQueryBuilder<
|
|
124
|
-
selectFrom<TE extends TableExpression<DB, keyof DB>>(from: TE): SelectQueryBuilder<
|
|
123
|
+
selectFrom<TE extends TableExpression<DB, keyof DB>>(from: TE[]): SelectQueryBuilder<From<DB, TE>, FromTables<DB, never, TE>, {}>;
|
|
124
|
+
selectFrom<TE extends TableExpression<DB, keyof DB>>(from: TE): SelectQueryBuilder<From<DB, TE>, FromTables<DB, never, TE>, {}>;
|
|
125
125
|
/**
|
|
126
126
|
* Creates an insert query.
|
|
127
127
|
*
|
|
@@ -180,7 +180,7 @@ export declare class QueryCreator<DB> {
|
|
|
180
180
|
* console.log(result.numDeletedRows)
|
|
181
181
|
* ```
|
|
182
182
|
*/
|
|
183
|
-
deleteFrom<TR extends TableReference<DB>>(table: TR): DeleteQueryBuilder<
|
|
183
|
+
deleteFrom<TR extends TableReference<DB>>(table: TR): DeleteQueryBuilder<From<DB, TR>, FromTables<DB, never, TR>, DeleteResult>;
|
|
184
184
|
/**
|
|
185
185
|
* Creates an update query.
|
|
186
186
|
*
|
|
@@ -204,7 +204,7 @@ export declare class QueryCreator<DB> {
|
|
|
204
204
|
* console.log(result.numUpdatedRows)
|
|
205
205
|
* ```
|
|
206
206
|
*/
|
|
207
|
-
updateTable<TR extends TableReference<DB>>(table: TR): UpdateQueryBuilder<
|
|
207
|
+
updateTable<TR extends TableReference<DB>>(table: TR): UpdateQueryBuilder<From<DB, TR>, FromTables<DB, never, TR>, FromTables<DB, never, TR>, UpdateResult>;
|
|
208
208
|
/**
|
|
209
209
|
* Creates a `with` query (Common Table Expression).
|
|
210
210
|
*
|
|
@@ -111,6 +111,9 @@ export declare type UnknownRow = Record<string, unknown>;
|
|
|
111
111
|
export declare type Nullable<T> = {
|
|
112
112
|
[P in keyof T]: T[P] | null;
|
|
113
113
|
};
|
|
114
|
+
export declare type NullableValues<T> = {
|
|
115
|
+
[P in keyof T]: Nullable<T[P]>;
|
|
116
|
+
};
|
|
114
117
|
/**
|
|
115
118
|
* Takes all properties from T1 and merges all properties from T2
|
|
116
119
|
* that don't exist in T1 as optional properties.
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { ColumnDataType } from '../operation-node/data-type-node.js';
|
|
2
1
|
/**
|
|
3
2
|
* An interface for getting the database metadata (names of the tables and columns etc.)
|
|
4
3
|
*/
|
|
@@ -41,6 +40,16 @@ export interface TableMetadata {
|
|
|
41
40
|
}
|
|
42
41
|
export interface ColumnMetadata {
|
|
43
42
|
readonly name: string;
|
|
44
|
-
|
|
43
|
+
/**
|
|
44
|
+
* The data type of the column as reported by the database.
|
|
45
|
+
*
|
|
46
|
+
* NOTE: This value is whatever the database engine returns and it will be
|
|
47
|
+
* different on different dialects even if you run the same migrations.
|
|
48
|
+
* For example `integer` datatype in a migration will produce `int4`
|
|
49
|
+
* on PostgreSQL, `INTEGER` on SQLite and `int` on MySQL.
|
|
50
|
+
*/
|
|
51
|
+
readonly dataType: string;
|
|
52
|
+
readonly isAutoIncrementing: boolean;
|
|
45
53
|
readonly isNullable: boolean;
|
|
54
|
+
readonly hasDefaultValue: boolean;
|
|
46
55
|
}
|
|
@@ -20,10 +20,12 @@ export class MysqlIntrospector {
|
|
|
20
20
|
.selectFrom('information_schema.columns')
|
|
21
21
|
.select([
|
|
22
22
|
'column_name',
|
|
23
|
+
'column_default',
|
|
23
24
|
'table_name',
|
|
24
25
|
'table_schema',
|
|
25
26
|
'is_nullable',
|
|
26
27
|
'data_type',
|
|
28
|
+
'extra',
|
|
27
29
|
])
|
|
28
30
|
.where('table_schema', '=', sql `database()`)
|
|
29
31
|
.castTo();
|
|
@@ -55,6 +57,8 @@ export class MysqlIntrospector {
|
|
|
55
57
|
name: it.COLUMN_NAME,
|
|
56
58
|
dataType: it.DATA_TYPE,
|
|
57
59
|
isNullable: it.IS_NULLABLE === 'YES',
|
|
60
|
+
isAutoIncrementing: it.EXTRA.toLowerCase().includes('auto_increment'),
|
|
61
|
+
hasDefaultValue: it.COLUMN_DEFAULT !== null,
|
|
58
62
|
}));
|
|
59
63
|
return tables;
|
|
60
64
|
}, []);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="./postgres-introspector.d.ts" />
|
|
2
2
|
import { DEFAULT_MIGRATION_LOCK_TABLE, DEFAULT_MIGRATION_TABLE, } from '../../migration/migrator.js';
|
|
3
3
|
import { freeze } from '../../util/object-utils.js';
|
|
4
|
+
import { sql } from '../../raw-builder/sql.js';
|
|
4
5
|
export class PostgresIntrospector {
|
|
5
6
|
#db;
|
|
6
7
|
constructor(db) {
|
|
@@ -23,9 +24,18 @@ export class PostgresIntrospector {
|
|
|
23
24
|
.select([
|
|
24
25
|
'a.attname as column',
|
|
25
26
|
'a.attnotnull as not_null',
|
|
27
|
+
'a.atthasdef as has_default',
|
|
26
28
|
't.tablename as table',
|
|
27
29
|
't.schemaname as schema',
|
|
28
30
|
'typ.typname as type',
|
|
31
|
+
// Detect if the column is auto incrementing by finding the sequence
|
|
32
|
+
// that is created for `serial` and `bigserial` columns.
|
|
33
|
+
this.#db
|
|
34
|
+
.selectFrom('pg_class')
|
|
35
|
+
.select(sql `true`.as('auto_incrementing'))
|
|
36
|
+
.where('relkind', '=', 'S')
|
|
37
|
+
.where('relname', '=', sql `t.tablename || '_' || a.attname || '_seq'`)
|
|
38
|
+
.as('auto_incrementing'),
|
|
29
39
|
])
|
|
30
40
|
.where('t.schemaname', '!~', '^pg_')
|
|
31
41
|
.where('t.schemaname', '!=', 'information_schema')
|
|
@@ -60,6 +70,8 @@ export class PostgresIntrospector {
|
|
|
60
70
|
name: it.column,
|
|
61
71
|
dataType: it.type,
|
|
62
72
|
isNullable: !it.not_null,
|
|
73
|
+
isAutoIncrementing: !!it.auto_incrementing,
|
|
74
|
+
hasDefaultValue: it.has_default,
|
|
63
75
|
}));
|
|
64
76
|
return tables;
|
|
65
77
|
}, []);
|
|
@@ -32,17 +32,31 @@ export class SqliteIntrospector {
|
|
|
32
32
|
}
|
|
33
33
|
async #getTableMetadata(table) {
|
|
34
34
|
const db = this.#db;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
.
|
|
35
|
+
// Get the SQL that was used to create the table.
|
|
36
|
+
const createSql = await db
|
|
37
|
+
.selectFrom('sqlite_master')
|
|
38
|
+
.where('name', '=', table)
|
|
39
|
+
.select('sql')
|
|
38
40
|
.castTo()
|
|
39
41
|
.execute();
|
|
42
|
+
// Try to find the name of the column that has `autoincrement` 🤦
|
|
43
|
+
const autoIncrementCol = createSql[0]?.sql
|
|
44
|
+
?.split(/[\(\),]/)
|
|
45
|
+
?.find((it) => it.toLowerCase().includes('autoincrement'))
|
|
46
|
+
?.split(/\s+/)?.[0]
|
|
47
|
+
?.replace(/["`]/g, '');
|
|
48
|
+
const columns = await db
|
|
49
|
+
.selectFrom(sql `pragma_table_info(${table})`.as('table_info'))
|
|
50
|
+
.select(['name', 'type', 'notnull', 'dflt_value'])
|
|
51
|
+
.execute();
|
|
40
52
|
return {
|
|
41
53
|
name: table,
|
|
42
54
|
columns: columns.map((col) => ({
|
|
43
55
|
name: col.name,
|
|
44
56
|
dataType: col.type,
|
|
45
57
|
isNullable: !col.notnull,
|
|
58
|
+
isAutoIncrementing: col.name === autoIncrementCol,
|
|
59
|
+
hasDefaultValue: !!col.dflt_value,
|
|
46
60
|
})),
|
|
47
61
|
};
|
|
48
62
|
}
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
export * from './kysely.js';
|
|
2
2
|
export * from './query-creator.js';
|
|
3
3
|
export * from './query-builder/where-interface.js';
|
|
4
|
-
export * from './query-builder/join-interface.js';
|
|
5
4
|
export * from './query-builder/returning-interface.js';
|
|
6
5
|
export * from './query-builder/having-interface.js';
|
|
7
6
|
export * from './query-builder/select-query-builder.js';
|
package/dist/esm/index.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
export * from './kysely.js';
|
|
3
3
|
export * from './query-creator.js';
|
|
4
4
|
export * from './query-builder/where-interface.js';
|
|
5
|
-
export * from './query-builder/join-interface.js';
|
|
6
5
|
export * from './query-builder/returning-interface.js';
|
|
7
6
|
export * from './query-builder/having-interface.js';
|
|
8
7
|
export * from './query-builder/select-query-builder.js';
|
|
@@ -11,5 +11,5 @@ export interface CheckConstraintNode extends OperationNode {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare const CheckConstraintNode: Readonly<{
|
|
13
13
|
is(node: OperationNode): node is CheckConstraintNode;
|
|
14
|
-
create(expression: RawNode, constraintName?: string
|
|
14
|
+
create(expression: RawNode, constraintName?: string): CheckConstraintNode;
|
|
15
15
|
}>;
|
|
@@ -11,5 +11,5 @@ export interface CommonTableExpressionNameNode extends OperationNode {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare const CommonTableExpressionNameNode: Readonly<{
|
|
13
13
|
is(node: OperationNode): node is CommonTableExpressionNameNode;
|
|
14
|
-
create(tableName: string, columnNames?:
|
|
14
|
+
create(tableName: string, columnNames?: ReadonlyArray<string>): CommonTableExpressionNameNode;
|
|
15
15
|
}>;
|
|
@@ -11,6 +11,6 @@ export interface CreateSchemaNode extends OperationNode {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare const CreateSchemaNode: Readonly<{
|
|
13
13
|
is(node: OperationNode): node is CreateSchemaNode;
|
|
14
|
-
create(schema: string, params?: CreateSchemaNodeParams
|
|
14
|
+
create(schema: string, params?: CreateSchemaNodeParams): CreateSchemaNode;
|
|
15
15
|
cloneWith(createSchema: CreateSchemaNode, params: CreateSchemaNodeParams): CreateSchemaNode;
|
|
16
16
|
}>;
|
|
@@ -23,7 +23,7 @@ export interface DeleteQueryNode extends OperationNode {
|
|
|
23
23
|
*/
|
|
24
24
|
export declare const DeleteQueryNode: Readonly<{
|
|
25
25
|
is(node: OperationNode): node is DeleteQueryNode;
|
|
26
|
-
create(fromItem: TableExpressionNode, withNode?: WithNode
|
|
26
|
+
create(fromItem: TableExpressionNode, withNode?: WithNode): DeleteQueryNode;
|
|
27
27
|
cloneWithOrderByItem(deleteNode: DeleteQueryNode, item: OrderByItemNode): DeleteQueryNode;
|
|
28
28
|
cloneWithLimit(deleteNode: DeleteQueryNode, limit: LimitNode): DeleteQueryNode;
|
|
29
29
|
}>;
|
|
@@ -13,6 +13,6 @@ export interface DropIndexNode extends OperationNode {
|
|
|
13
13
|
*/
|
|
14
14
|
export declare const DropIndexNode: Readonly<{
|
|
15
15
|
is(node: OperationNode): node is DropIndexNode;
|
|
16
|
-
create(name: string, params?: DropIndexNodeProps
|
|
16
|
+
create(name: string, params?: DropIndexNodeProps): DropIndexNode;
|
|
17
17
|
cloneWith(dropIndex: DropIndexNode, props: DropIndexNodeProps): DropIndexNode;
|
|
18
18
|
}>;
|
|
@@ -11,6 +11,6 @@ export interface DropSchemaNode extends OperationNode {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare const DropSchemaNode: Readonly<{
|
|
13
13
|
is(node: OperationNode): node is DropSchemaNode;
|
|
14
|
-
create(schema: string, params?: DropSchemaNodeParams
|
|
14
|
+
create(schema: string, params?: DropSchemaNodeParams): DropSchemaNode;
|
|
15
15
|
cloneWith(dropSchema: DropSchemaNode, params: DropSchemaNodeParams): DropSchemaNode;
|
|
16
16
|
}>;
|
|
@@ -11,6 +11,6 @@ export interface DropTableNode extends OperationNode {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare const DropTableNode: Readonly<{
|
|
13
13
|
is(node: OperationNode): node is DropTableNode;
|
|
14
|
-
create(table: TableNode, params?: DropTablexNodeParams
|
|
14
|
+
create(table: TableNode, params?: DropTablexNodeParams): DropTableNode;
|
|
15
15
|
cloneWith(dropIndex: DropTableNode, params: DropTablexNodeParams): DropTableNode;
|
|
16
16
|
}>;
|
|
@@ -17,7 +17,7 @@ export interface ForeignKeyConstraintNode extends OperationNode {
|
|
|
17
17
|
*/
|
|
18
18
|
export declare const ForeignKeyConstraintNode: Readonly<{
|
|
19
19
|
is(node: OperationNode): node is ForeignKeyConstraintNode;
|
|
20
|
-
create(sourceColumns: ReadonlyArray<ColumnNode>, targetTable: TableNode, targetColumns: ReadonlyArray<ColumnNode>, constraintName?: string
|
|
20
|
+
create(sourceColumns: ReadonlyArray<ColumnNode>, targetTable: TableNode, targetColumns: ReadonlyArray<ColumnNode>, constraintName?: string): ForeignKeyConstraintNode;
|
|
21
21
|
cloneWith(node: ForeignKeyConstraintNode, props: ForeignKeyConstraintNodeProps): Readonly<{
|
|
22
22
|
name?: IdentifierNode | undefined;
|
|
23
23
|
onDelete?: OnModifyForeignAction | undefined;
|
|
@@ -25,6 +25,6 @@ export interface InsertQueryNode extends OperationNode {
|
|
|
25
25
|
*/
|
|
26
26
|
export declare const InsertQueryNode: Readonly<{
|
|
27
27
|
is(node: OperationNode): node is InsertQueryNode;
|
|
28
|
-
create(into: TableNode, withNode?: WithNode
|
|
28
|
+
create(into: TableNode, withNode?: WithNode): InsertQueryNode;
|
|
29
29
|
cloneWith(insertQuery: InsertQueryNode, props: InsertQueryNodeProps): InsertQueryNode;
|
|
30
30
|
}>;
|
|
@@ -4,7 +4,7 @@ import { FilterExpressionNode } from './operation-node-utils.js';
|
|
|
4
4
|
import { OperationNode } from './operation-node.js';
|
|
5
5
|
import { TableNode } from './table-node.js';
|
|
6
6
|
export declare type JoinTableNode = TableNode | AliasNode;
|
|
7
|
-
export declare type JoinType = 'InnerJoin' | 'LeftJoin' | 'RightJoin' | 'FullJoin';
|
|
7
|
+
export declare type JoinType = 'InnerJoin' | 'LeftJoin' | 'RightJoin' | 'FullJoin' | 'LateralInnerJoin' | 'LateralLeftJoin';
|
|
8
8
|
export interface JoinNode extends OperationNode {
|
|
9
9
|
readonly kind: 'JoinNode';
|
|
10
10
|
readonly joinType: JoinType;
|
|
@@ -11,5 +11,5 @@ export interface OrderByItemNode extends OperationNode {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare const OrderByItemNode: Readonly<{
|
|
13
13
|
is(node: OperationNode): node is OrderByItemNode;
|
|
14
|
-
create(orderBy: ReferenceExpressionNode, direction?: RawNode
|
|
14
|
+
create(orderBy: ReferenceExpressionNode, direction?: RawNode): OrderByItemNode;
|
|
15
15
|
}>;
|
|
@@ -11,5 +11,5 @@ export interface PrimaryKeyConstraintNode extends OperationNode {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare const PrimaryConstraintNode: Readonly<{
|
|
13
13
|
is(node: OperationNode): node is PrimaryKeyConstraintNode;
|
|
14
|
-
create(columns: string[], constraintName?: string
|
|
14
|
+
create(columns: string[], constraintName?: string): PrimaryKeyConstraintNode;
|
|
15
15
|
}>;
|
|
@@ -36,7 +36,7 @@ export interface SelectQueryNode extends OperationNode {
|
|
|
36
36
|
*/
|
|
37
37
|
export declare const SelectQueryNode: Readonly<{
|
|
38
38
|
is(node: OperationNode): node is SelectQueryNode;
|
|
39
|
-
create(fromItems: ReadonlyArray<TableExpressionNode>, withNode?: WithNode
|
|
39
|
+
create(fromItems: ReadonlyArray<TableExpressionNode>, withNode?: WithNode): SelectQueryNode;
|
|
40
40
|
cloneWithSelections(select: SelectQueryNode, selections: ReadonlyArray<SelectionNode>): SelectQueryNode;
|
|
41
41
|
cloneWithDistinctOnSelections(select: SelectQueryNode, selections: ReadonlyArray<SelectionNode>): SelectQueryNode;
|
|
42
42
|
cloneWithModifier(select: SelectQueryNode, modifier: SelectModifier): SelectQueryNode;
|
|
@@ -11,5 +11,5 @@ export interface UniqueConstraintNode extends OperationNode {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare const UniqueConstraintNode: Readonly<{
|
|
13
13
|
is(node: OperationNode): node is UniqueConstraintNode;
|
|
14
|
-
create(columns: string[], constraintName?: string
|
|
14
|
+
create(columns: string[], constraintName?: string): UniqueConstraintNode;
|
|
15
15
|
}>;
|
|
@@ -24,7 +24,7 @@ export interface UpdateQueryNode extends OperationNode {
|
|
|
24
24
|
*/
|
|
25
25
|
export declare const UpdateQueryNode: Readonly<{
|
|
26
26
|
is(node: OperationNode): node is UpdateQueryNode;
|
|
27
|
-
create(table: TableExpressionNode, withNode?: WithNode
|
|
27
|
+
create(table: TableExpressionNode, withNode?: WithNode): UpdateQueryNode;
|
|
28
28
|
cloneWithFromItems(updateQuery: UpdateQueryNode, fromItems: ReadonlyArray<TableExpressionNode>): UpdateQueryNode;
|
|
29
29
|
cloneWithUpdates(updateQuery: UpdateQueryNode, updates: ReadonlyArray<ColumnUpdateNode>): UpdateQueryNode;
|
|
30
30
|
}>;
|
|
@@ -11,6 +11,6 @@ export interface WithNode extends OperationNode {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare const WithNode: Readonly<{
|
|
13
13
|
is(node: OperationNode): node is WithNode;
|
|
14
|
-
create(expression: CommonTableExpressionNode, params?: WithNodeParams
|
|
14
|
+
create(expression: CommonTableExpressionNode, params?: WithNodeParams): WithNode;
|
|
15
15
|
cloneWithExpression(withNode: WithNode, expression: CommonTableExpressionNode): WithNode;
|
|
16
16
|
}>;
|