kysely 0.23.5 → 0.24.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/README.md +46 -24
- package/dist/cjs/dialect/mysql/mysql-adapter.js +2 -2
- package/dist/cjs/dialect/mysql/mysql-driver.d.ts +1 -1
- package/dist/cjs/dialect/mysql/mysql-driver.js +1 -1
- package/dist/cjs/dialect/postgres/postgres-adapter.js +1 -1
- package/dist/cjs/dialect/sqlite/sqlite-dialect.d.ts +1 -0
- package/dist/cjs/dialect/sqlite/sqlite-dialect.js +1 -0
- package/dist/cjs/driver/runtime-driver.js +4 -2
- package/dist/cjs/expression/expression-builder.d.ts +386 -0
- package/dist/cjs/expression/expression-builder.js +92 -0
- package/dist/cjs/expression/expression-wrapper.d.ts +92 -0
- package/dist/cjs/expression/expression-wrapper.js +54 -0
- package/dist/cjs/expression/expression.d.ts +1 -1
- package/dist/cjs/helpers/postgres.d.ts +133 -0
- package/dist/cjs/helpers/postgres.js +141 -0
- package/dist/cjs/index.d.ts +4 -3
- package/dist/cjs/index.js +4 -2
- package/dist/cjs/kysely.d.ts +10 -0
- package/dist/cjs/kysely.js +12 -1
- package/dist/cjs/migration/file-migration-provider.d.ts +5 -2
- package/dist/cjs/migration/migrator.d.ts +5 -2
- package/dist/cjs/operation-node/aggregate-function-node.d.ts +3 -3
- package/dist/cjs/operation-node/create-index-node.d.ts +2 -0
- package/dist/cjs/operation-node/delete-query-node.d.ts +0 -1
- package/dist/cjs/operation-node/delete-query-node.js +0 -6
- package/dist/cjs/operation-node/function-node.d.ts +13 -0
- package/dist/cjs/operation-node/function-node.js +19 -0
- package/dist/cjs/operation-node/operation-node-transformer.d.ts +2 -0
- package/dist/cjs/operation-node/operation-node-transformer.js +9 -0
- package/dist/cjs/operation-node/operation-node-visitor.d.ts +2 -0
- package/dist/cjs/operation-node/operation-node-visitor.js +1 -0
- package/dist/cjs/operation-node/operation-node.d.ts +1 -1
- package/dist/cjs/operation-node/operator-node.d.ts +13 -2
- package/dist/cjs/operation-node/operator-node.js +38 -3
- package/dist/cjs/operation-node/query-node.d.ts +25 -8
- package/dist/cjs/operation-node/query-node.js +9 -2
- package/dist/cjs/operation-node/select-query-node.d.ts +0 -1
- package/dist/cjs/operation-node/select-query-node.js +0 -6
- package/dist/cjs/operation-node/update-query-node.d.ts +0 -1
- package/dist/cjs/operation-node/update-query-node.js +0 -6
- package/dist/cjs/parser/binary-operation-parser.d.ts +9 -10
- package/dist/cjs/parser/binary-operation-parser.js +89 -39
- package/dist/cjs/parser/coalesce-parser.d.ts +0 -2
- package/dist/cjs/parser/coalesce-parser.js +0 -9
- package/dist/cjs/parser/expression-parser.d.ts +7 -3
- package/dist/cjs/parser/expression-parser.js +3 -3
- package/dist/cjs/parser/group-by-parser.d.ts +3 -2
- package/dist/cjs/parser/group-by-parser.js +3 -0
- package/dist/cjs/parser/insert-values-parser.d.ts +4 -1
- package/dist/cjs/parser/insert-values-parser.js +19 -13
- package/dist/cjs/parser/join-parser.js +1 -1
- package/dist/cjs/parser/parse-utils.d.ts +0 -2
- package/dist/cjs/parser/parse-utils.js +1 -8
- package/dist/cjs/parser/returning-parser.d.ts +2 -1
- package/dist/cjs/parser/select-parser.d.ts +5 -13
- package/dist/cjs/parser/select-parser.js +8 -4
- package/dist/cjs/parser/table-parser.d.ts +5 -3
- package/dist/cjs/parser/unary-operation-parser.d.ts +5 -2
- package/dist/cjs/parser/unary-operation-parser.js +9 -8
- package/dist/cjs/parser/update-set-parser.d.ts +4 -1
- package/dist/cjs/parser/update-set-parser.js +9 -4
- package/dist/cjs/parser/value-parser.d.ts +5 -0
- package/dist/cjs/parser/value-parser.js +1 -3
- package/dist/cjs/plugin/deduplicate-joins/deduplicate-joins-plugin.d.ts +1 -1
- package/dist/cjs/plugin/deduplicate-joins/deduplicate-joins-plugin.js +1 -1
- package/dist/cjs/query-builder/aggregate-function-builder.d.ts +40 -113
- package/dist/cjs/query-builder/aggregate-function-builder.js +23 -63
- package/dist/cjs/query-builder/delete-query-builder.d.ts +220 -201
- package/dist/cjs/query-builder/delete-query-builder.js +21 -27
- package/dist/cjs/query-builder/delete-result.js +3 -0
- package/dist/cjs/query-builder/deprecated-having-expression-builder.d.ts +62 -0
- package/dist/cjs/query-builder/deprecated-having-expression-builder.js +2 -0
- package/dist/cjs/query-builder/deprecated-on-expression-builder.d.ts +62 -0
- package/dist/cjs/query-builder/deprecated-on-expression-builder.js +2 -0
- package/dist/cjs/query-builder/deprecated-where-expression-builder.d.ts +62 -0
- package/dist/cjs/query-builder/deprecated-where-expression-builder.js +2 -0
- package/dist/cjs/query-builder/function-module.d.ts +40 -12
- package/dist/cjs/query-builder/function-module.js +43 -329
- package/dist/cjs/query-builder/having-interface.d.ts +19 -16
- package/dist/cjs/query-builder/insert-query-builder.d.ts +75 -26
- package/dist/cjs/query-builder/insert-query-builder.js +21 -29
- package/dist/cjs/query-builder/insert-result.js +3 -0
- package/dist/cjs/query-builder/join-builder.d.ts +23 -26
- package/dist/cjs/query-builder/join-builder.js +17 -22
- package/dist/cjs/query-builder/no-result-error.d.ts +1 -0
- package/dist/cjs/query-builder/no-result-error.js +5 -1
- package/dist/cjs/query-builder/on-conflict-builder.d.ts +158 -276
- package/dist/cjs/query-builder/on-conflict-builder.js +52 -36
- package/dist/cjs/query-builder/over-builder.d.ts +5 -0
- package/dist/cjs/query-builder/over-builder.js +7 -0
- package/dist/cjs/query-builder/returning-interface.d.ts +2 -2
- package/dist/cjs/query-builder/select-query-builder.d.ts +148 -237
- package/dist/cjs/query-builder/select-query-builder.js +333 -78
- package/dist/cjs/query-builder/update-query-builder.d.ts +145 -213
- package/dist/cjs/query-builder/update-query-builder.js +21 -115
- package/dist/cjs/query-builder/update-result.js +3 -0
- package/dist/cjs/query-builder/where-interface.d.ts +71 -184
- package/dist/cjs/query-compiler/default-query-compiler.d.ts +3 -0
- package/dist/cjs/query-compiler/default-query-compiler.js +17 -1
- package/dist/cjs/query-creator.d.ts +9 -2
- package/dist/cjs/query-creator.js +1 -24
- package/dist/cjs/query-executor/query-executor.d.ts +3 -3
- package/dist/cjs/raw-builder/raw-builder.d.ts +5 -3
- package/dist/cjs/raw-builder/raw-builder.js +13 -7
- package/dist/cjs/raw-builder/sql.d.ts +17 -9
- package/dist/cjs/raw-builder/sql.js +8 -2
- package/dist/cjs/schema/alter-column-builder.d.ts +5 -0
- package/dist/cjs/schema/alter-column-builder.js +7 -0
- package/dist/cjs/schema/alter-table-add-foreign-key-constraint-builder.d.ts +5 -0
- package/dist/cjs/schema/alter-table-add-foreign-key-constraint-builder.js +7 -0
- package/dist/cjs/schema/alter-table-drop-constraint-builder.d.ts +5 -0
- package/dist/cjs/schema/alter-table-drop-constraint-builder.js +7 -0
- package/dist/cjs/schema/column-definition-builder.d.ts +6 -1
- package/dist/cjs/schema/column-definition-builder.js +8 -1
- package/dist/cjs/schema/create-index-builder.d.ts +51 -9
- package/dist/cjs/schema/create-index-builder.js +17 -0
- package/dist/cjs/schema/create-schema-builder.d.ts +5 -0
- package/dist/cjs/schema/create-schema-builder.js +7 -0
- package/dist/cjs/schema/create-table-builder.d.ts +3 -1
- package/dist/cjs/schema/create-table-builder.js +3 -1
- package/dist/cjs/schema/create-type-builder.d.ts +5 -0
- package/dist/cjs/schema/create-type-builder.js +7 -0
- package/dist/cjs/schema/create-view-builder.d.ts +5 -0
- package/dist/cjs/schema/create-view-builder.js +7 -0
- package/dist/cjs/schema/drop-index-builder.d.ts +5 -0
- package/dist/cjs/schema/drop-index-builder.js +7 -0
- package/dist/cjs/schema/drop-schema-builder.d.ts +5 -0
- package/dist/cjs/schema/drop-schema-builder.js +7 -0
- package/dist/cjs/schema/drop-table-builder.d.ts +5 -0
- package/dist/cjs/schema/drop-table-builder.js +7 -0
- package/dist/cjs/schema/drop-type-builder.d.ts +5 -0
- package/dist/cjs/schema/drop-type-builder.js +7 -0
- package/dist/cjs/schema/drop-view-builder.d.ts +5 -0
- package/dist/cjs/schema/drop-view-builder.js +7 -0
- package/dist/cjs/schema/foreign-key-constraint-builder.d.ts +5 -0
- package/dist/cjs/schema/foreign-key-constraint-builder.js +7 -0
- package/dist/cjs/util/compilable.d.ts +1 -0
- package/dist/cjs/util/compilable.js +6 -0
- package/dist/cjs/util/explainable.d.ts +35 -0
- package/dist/cjs/util/log.d.ts +2 -0
- package/dist/cjs/util/object-utils.js +1 -1
- package/dist/cjs/util/streamable.d.ts +29 -0
- package/dist/cjs/util/streamable.js +2 -0
- package/dist/cjs/util/type-utils.d.ts +1 -0
- package/dist/esm/dialect/mysql/mysql-adapter.js +2 -2
- package/dist/esm/dialect/mysql/mysql-driver.d.ts +1 -1
- package/dist/esm/dialect/mysql/mysql-driver.js +1 -1
- package/dist/esm/dialect/postgres/postgres-adapter.js +1 -1
- package/dist/esm/dialect/sqlite/sqlite-dialect.d.ts +1 -0
- package/dist/esm/dialect/sqlite/sqlite-dialect.js +1 -0
- package/dist/esm/driver/runtime-driver.js +4 -2
- package/dist/esm/expression/expression-builder.d.ts +386 -0
- package/dist/esm/expression/expression-builder.js +88 -0
- package/dist/esm/expression/expression-wrapper.d.ts +92 -0
- package/dist/esm/expression/expression-wrapper.js +50 -0
- package/dist/esm/expression/expression.d.ts +1 -1
- package/dist/esm/helpers/postgres.d.ts +133 -0
- package/dist/esm/helpers/postgres.js +136 -0
- package/dist/esm/index.d.ts +4 -3
- package/dist/esm/index.js +2 -1
- package/dist/esm/kysely.d.ts +10 -0
- package/dist/esm/kysely.js +13 -2
- package/dist/esm/migration/file-migration-provider.d.ts +5 -2
- package/dist/esm/migration/migrator.d.ts +5 -2
- package/dist/esm/operation-node/aggregate-function-node.d.ts +3 -3
- package/dist/esm/operation-node/create-index-node.d.ts +2 -0
- package/dist/esm/operation-node/delete-query-node.d.ts +0 -1
- package/dist/esm/operation-node/delete-query-node.js +0 -6
- package/dist/esm/operation-node/function-node.d.ts +13 -0
- package/dist/esm/operation-node/function-node.js +17 -0
- package/dist/esm/operation-node/operation-node-transformer.d.ts +2 -0
- package/dist/esm/operation-node/operation-node-transformer.js +9 -0
- package/dist/esm/operation-node/operation-node-visitor.d.ts +2 -0
- package/dist/esm/operation-node/operation-node-visitor.js +1 -0
- package/dist/esm/operation-node/operation-node.d.ts +1 -1
- package/dist/esm/operation-node/operator-node.d.ts +13 -2
- package/dist/esm/operation-node/operator-node.js +34 -3
- package/dist/esm/operation-node/query-node.d.ts +25 -8
- package/dist/esm/operation-node/query-node.js +9 -2
- package/dist/esm/operation-node/select-query-node.d.ts +0 -1
- package/dist/esm/operation-node/select-query-node.js +0 -6
- package/dist/esm/operation-node/update-query-node.d.ts +0 -1
- package/dist/esm/operation-node/update-query-node.js +0 -6
- package/dist/esm/parser/binary-operation-parser.d.ts +9 -10
- package/dist/esm/parser/binary-operation-parser.js +85 -37
- package/dist/esm/parser/coalesce-parser.d.ts +0 -2
- package/dist/esm/parser/coalesce-parser.js +1 -7
- package/dist/esm/parser/expression-parser.d.ts +7 -3
- package/dist/esm/parser/expression-parser.js +3 -3
- package/dist/esm/parser/group-by-parser.d.ts +3 -2
- package/dist/esm/parser/group-by-parser.js +3 -0
- package/dist/esm/parser/insert-values-parser.d.ts +4 -1
- package/dist/esm/parser/insert-values-parser.js +18 -12
- package/dist/esm/parser/join-parser.js +2 -2
- package/dist/esm/parser/parse-utils.d.ts +0 -2
- package/dist/esm/parser/parse-utils.js +0 -6
- package/dist/esm/parser/returning-parser.d.ts +2 -1
- package/dist/esm/parser/select-parser.d.ts +5 -13
- package/dist/esm/parser/select-parser.js +7 -3
- package/dist/esm/parser/table-parser.d.ts +5 -3
- package/dist/esm/parser/unary-operation-parser.d.ts +5 -2
- package/dist/esm/parser/unary-operation-parser.js +8 -8
- package/dist/esm/parser/update-set-parser.d.ts +4 -1
- package/dist/esm/parser/update-set-parser.js +7 -2
- package/dist/esm/parser/value-parser.d.ts +5 -0
- package/dist/esm/parser/value-parser.js +1 -3
- package/dist/esm/plugin/deduplicate-joins/deduplicate-joins-plugin.d.ts +1 -1
- package/dist/esm/plugin/deduplicate-joins/deduplicate-joins-plugin.js +1 -1
- package/dist/esm/query-builder/aggregate-function-builder.d.ts +40 -113
- package/dist/esm/query-builder/aggregate-function-builder.js +24 -64
- package/dist/esm/query-builder/delete-query-builder.d.ts +220 -201
- package/dist/esm/query-builder/delete-query-builder.js +24 -30
- package/dist/esm/query-builder/delete-result.js +3 -0
- package/dist/esm/query-builder/deprecated-having-expression-builder.d.ts +62 -0
- package/dist/esm/query-builder/deprecated-having-expression-builder.js +2 -0
- package/dist/esm/query-builder/deprecated-on-expression-builder.d.ts +62 -0
- package/dist/esm/query-builder/deprecated-on-expression-builder.js +2 -0
- package/dist/esm/query-builder/deprecated-where-expression-builder.d.ts +62 -0
- package/dist/esm/query-builder/deprecated-where-expression-builder.js +2 -0
- package/dist/esm/query-builder/function-module.d.ts +40 -12
- package/dist/esm/query-builder/function-module.js +42 -328
- package/dist/esm/query-builder/having-interface.d.ts +19 -16
- package/dist/esm/query-builder/insert-query-builder.d.ts +75 -26
- package/dist/esm/query-builder/insert-query-builder.js +25 -33
- package/dist/esm/query-builder/insert-result.js +3 -0
- package/dist/esm/query-builder/join-builder.d.ts +23 -26
- package/dist/esm/query-builder/join-builder.js +18 -23
- package/dist/esm/query-builder/no-result-error.d.ts +1 -0
- package/dist/esm/query-builder/no-result-error.js +3 -0
- package/dist/esm/query-builder/on-conflict-builder.d.ts +158 -276
- package/dist/esm/query-builder/on-conflict-builder.js +54 -38
- package/dist/esm/query-builder/over-builder.d.ts +5 -0
- package/dist/esm/query-builder/over-builder.js +7 -0
- package/dist/esm/query-builder/returning-interface.d.ts +2 -2
- package/dist/esm/query-builder/select-query-builder.d.ts +148 -237
- package/dist/esm/query-builder/select-query-builder.js +337 -82
- package/dist/esm/query-builder/update-query-builder.d.ts +145 -213
- package/dist/esm/query-builder/update-query-builder.js +25 -119
- package/dist/esm/query-builder/update-result.js +3 -0
- package/dist/esm/query-builder/where-interface.d.ts +71 -184
- package/dist/esm/query-compiler/default-query-compiler.d.ts +3 -0
- package/dist/esm/query-compiler/default-query-compiler.js +17 -1
- package/dist/esm/query-creator.d.ts +9 -2
- package/dist/esm/query-creator.js +1 -24
- package/dist/esm/query-executor/query-executor.d.ts +3 -3
- package/dist/esm/raw-builder/raw-builder.d.ts +5 -3
- package/dist/esm/raw-builder/raw-builder.js +13 -7
- package/dist/esm/raw-builder/sql.d.ts +17 -9
- package/dist/esm/raw-builder/sql.js +8 -2
- package/dist/esm/schema/alter-column-builder.d.ts +5 -0
- package/dist/esm/schema/alter-column-builder.js +7 -0
- package/dist/esm/schema/alter-table-add-foreign-key-constraint-builder.d.ts +5 -0
- package/dist/esm/schema/alter-table-add-foreign-key-constraint-builder.js +7 -0
- package/dist/esm/schema/alter-table-drop-constraint-builder.d.ts +5 -0
- package/dist/esm/schema/alter-table-drop-constraint-builder.js +7 -0
- package/dist/esm/schema/column-definition-builder.d.ts +6 -1
- package/dist/esm/schema/column-definition-builder.js +8 -1
- package/dist/esm/schema/create-index-builder.d.ts +51 -9
- package/dist/esm/schema/create-index-builder.js +17 -0
- package/dist/esm/schema/create-schema-builder.d.ts +5 -0
- package/dist/esm/schema/create-schema-builder.js +7 -0
- package/dist/esm/schema/create-table-builder.d.ts +3 -1
- package/dist/esm/schema/create-table-builder.js +3 -1
- package/dist/esm/schema/create-type-builder.d.ts +5 -0
- package/dist/esm/schema/create-type-builder.js +7 -0
- package/dist/esm/schema/create-view-builder.d.ts +5 -0
- package/dist/esm/schema/create-view-builder.js +7 -0
- package/dist/esm/schema/drop-index-builder.d.ts +5 -0
- package/dist/esm/schema/drop-index-builder.js +7 -0
- package/dist/esm/schema/drop-schema-builder.d.ts +5 -0
- package/dist/esm/schema/drop-schema-builder.js +7 -0
- package/dist/esm/schema/drop-table-builder.d.ts +5 -0
- package/dist/esm/schema/drop-table-builder.js +7 -0
- package/dist/esm/schema/drop-type-builder.d.ts +5 -0
- package/dist/esm/schema/drop-type-builder.js +7 -0
- package/dist/esm/schema/drop-view-builder.d.ts +5 -0
- package/dist/esm/schema/drop-view-builder.js +7 -0
- package/dist/esm/schema/foreign-key-constraint-builder.d.ts +5 -0
- package/dist/esm/schema/foreign-key-constraint-builder.js +7 -0
- package/dist/esm/util/compilable.d.ts +1 -0
- package/dist/esm/util/compilable.js +4 -1
- package/dist/esm/util/explainable.d.ts +35 -0
- package/dist/esm/util/log.d.ts +2 -0
- package/dist/esm/util/object-utils.js +1 -1
- package/dist/esm/util/streamable.d.ts +29 -0
- package/dist/esm/util/streamable.js +2 -0
- package/dist/esm/util/type-utils.d.ts +1 -0
- package/helpers/postgres.d.ts +1 -0
- package/helpers/postgres.js +1 -0
- package/package.json +20 -9
- package/dist/cjs/query-builder/expression-builder.d.ts +0 -126
- package/dist/cjs/query-builder/expression-builder.js +0 -107
- package/dist/esm/query-builder/expression-builder.d.ts +0 -126
- package/dist/esm/query-builder/expression-builder.js +0 -104
|
@@ -1,21 +1,13 @@
|
|
|
1
|
-
import { AliasedSelectQueryBuilder
|
|
1
|
+
import { AliasedSelectQueryBuilder } from '../query-builder/select-query-builder.js';
|
|
2
2
|
import { SelectionNode } from '../operation-node/selection-node.js';
|
|
3
3
|
import { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, ExtractColumnType, ValueType } from '../util/type-utils.js';
|
|
4
4
|
import { DynamicReferenceBuilder } from '../dynamic/dynamic-reference-builder.js';
|
|
5
5
|
import { AliasedExpressionOrFactory } from './expression-parser.js';
|
|
6
6
|
import { Selectable, SelectType } from '../util/column-type.js';
|
|
7
7
|
import { AliasedExpression } from '../expression/expression.js';
|
|
8
|
+
import { ExpressionBuilder } from '../expression/expression-builder.js';
|
|
8
9
|
export declare type SelectExpression<DB, TB extends keyof DB> = AnyAliasedColumnWithTable<DB, TB> | AnyAliasedColumn<DB, TB> | AnyColumnWithTable<DB, TB> | AnyColumn<DB, TB> | DynamicReferenceBuilder<any> | AliasedExpressionOrFactory<DB, TB>;
|
|
9
|
-
export declare type
|
|
10
|
-
/**
|
|
11
|
-
* Given a selection expression returns a query builder type that
|
|
12
|
-
* has the selection.
|
|
13
|
-
*/
|
|
14
|
-
export declare type QueryBuilderWithSelection<DB, TB extends keyof DB, O, SE> = SelectQueryBuilder<DB, TB, O & Selection<DB, TB, SE>>;
|
|
15
|
-
/**
|
|
16
|
-
* `selectAll` output query builder type.
|
|
17
|
-
*/
|
|
18
|
-
export declare type SelectAllQueryBuilder<DB, TB extends keyof DB, O, S extends keyof DB> = SelectQueryBuilder<DB, TB, O & AllSelection<DB, S>>;
|
|
10
|
+
export declare type SelectArg<DB, TB extends keyof DB, SE extends SelectExpression<DB, TB>> = SE | ReadonlyArray<SE> | ((eb: ExpressionBuilder<DB, TB>) => ReadonlyArray<SE>);
|
|
19
11
|
export declare type Selection<DB, TB extends keyof DB, SE> = {
|
|
20
12
|
[A in ExtractAliasFromSelectExpression<SE>]: SelectType<ExtractTypeFromSelectExpression<DB, TB, SE, A>>;
|
|
21
13
|
};
|
|
@@ -23,11 +15,11 @@ declare type ExtractAliasFromSelectExpression<SE> = SE extends string ? ExtractA
|
|
|
23
15
|
declare type ExtractAliasFromStringSelectExpression<SE extends string> = SE extends `${string}.${string}.${string} as ${infer A}` ? A : SE extends `${string}.${string} as ${infer A}` ? A : SE extends `${string} as ${infer A}` ? A : SE extends `${string}.${string}.${infer C}` ? C : SE extends `${string}.${infer C}` ? C : SE;
|
|
24
16
|
declare type ExtractTypeFromSelectExpression<DB, TB extends keyof DB, SE, A extends keyof any> = SE extends string ? ExtractTypeFromStringSelectExpression<DB, TB, SE, A> : SE extends AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : SE extends (qb: any) => AliasedSelectQueryBuilder<any, any, infer O, infer QA> ? QA extends A ? ValueType<O> : never : SE extends AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends (qb: any) => AliasedExpression<infer O, infer EA> ? EA extends A ? O : never : SE extends DynamicReferenceBuilder<infer RA> ? A extends ExtractAliasFromStringSelectExpression<RA> ? ExtractTypeFromStringSelectExpression<DB, TB, RA, A> | undefined : never : never;
|
|
25
17
|
declare type ExtractTypeFromStringSelectExpression<DB, TB extends keyof DB, SE extends string, A extends keyof any> = SE extends `${infer SC}.${infer T}.${infer C} as ${infer RA}` ? RA extends A ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : never : SE extends `${infer T}.${infer C} as ${infer RA}` ? RA extends A ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : never : SE extends `${infer C} as ${infer RA}` ? RA extends A ? C extends AnyColumn<DB, TB> ? ExtractColumnType<DB, TB, C> : never : never : SE extends `${infer SC}.${infer T}.${infer C}` ? C extends A ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : never : SE extends `${infer T}.${infer C}` ? C extends A ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : never : SE extends A ? SE extends AnyColumn<DB, TB> ? ExtractColumnType<DB, TB, SE> : never : never;
|
|
26
|
-
declare type AllSelection<DB, TB extends keyof DB> = Selectable<{
|
|
18
|
+
export declare type AllSelection<DB, TB extends keyof DB> = Selectable<{
|
|
27
19
|
[C in AnyColumn<DB, TB>]: {
|
|
28
20
|
[T in TB]: C extends keyof DB[T] ? DB[T][C] : never;
|
|
29
21
|
}[TB];
|
|
30
22
|
}>;
|
|
31
|
-
export declare function
|
|
23
|
+
export declare function parseSelectArg(selection: SelectArg<any, any, SelectExpression<any, any>>): SelectionNode[];
|
|
32
24
|
export declare function parseSelectAll(table?: string | string[]): SelectionNode[];
|
|
33
25
|
export {};
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
/// <reference types="./select-parser.d.ts" />
|
|
2
|
-
import { isReadonlyArray, isString } from '../util/object-utils.js';
|
|
2
|
+
import { isFunction, isReadonlyArray, isString } from '../util/object-utils.js';
|
|
3
3
|
import { SelectionNode } from '../operation-node/selection-node.js';
|
|
4
4
|
import { parseAliasedStringReference } from './reference-parser.js';
|
|
5
5
|
import { isDynamicReferenceBuilder, } from '../dynamic/dynamic-reference-builder.js';
|
|
6
6
|
import { parseAliasedExpression, } from './expression-parser.js';
|
|
7
7
|
import { parseTable } from './table-parser.js';
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
import { expressionBuilder, } from '../expression/expression-builder.js';
|
|
9
|
+
export function parseSelectArg(selection) {
|
|
10
|
+
if (isFunction(selection)) {
|
|
11
|
+
return parseSelectArg(selection(expressionBuilder()));
|
|
12
|
+
}
|
|
13
|
+
else if (isReadonlyArray(selection)) {
|
|
10
14
|
return selection.map((it) => parseSelectExpression(it));
|
|
11
15
|
}
|
|
12
16
|
else {
|
|
@@ -3,17 +3,19 @@ import { TableNode } from '../operation-node/table-node.js';
|
|
|
3
3
|
import { AliasedExpressionOrFactory } from './expression-parser.js';
|
|
4
4
|
import { OperationNode } from '../operation-node/operation-node.js';
|
|
5
5
|
import { AliasedExpression } from '../expression/expression.js';
|
|
6
|
-
export declare type TableExpression<DB, TB extends keyof DB> =
|
|
6
|
+
export declare type TableExpression<DB, TB extends keyof DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpressionOrFactory<DB, TB>;
|
|
7
7
|
export declare type TableExpressionOrList<DB, TB extends keyof DB> = TableExpression<DB, TB> | ReadonlyArray<TableExpression<DB, TB>>;
|
|
8
8
|
export declare type TableReference<DB> = AnyAliasedTable<DB> | AnyTable<DB> | AliasedExpression<any, any>;
|
|
9
|
+
export declare type AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
|
|
9
10
|
export declare type TableReferenceOrList<DB> = TableReference<DB> | ReadonlyArray<TableReference<DB>>;
|
|
10
11
|
export declare type From<DB, TE> = {
|
|
11
12
|
[C in keyof DB | ExtractAliasFromTableExpression<DB, TE>]: C extends ExtractAliasFromTableExpression<DB, TE> ? ExtractRowTypeFromTableExpression<DB, TE, C> : C extends keyof DB ? DB[C] : never;
|
|
12
13
|
};
|
|
13
14
|
export declare type FromTables<DB, TB extends keyof DB, TE> = TB | ExtractAliasFromTableExpression<DB, TE>;
|
|
14
|
-
declare type
|
|
15
|
+
export declare type ExtractTableAlias<DB, TE> = TE extends `${string} as ${infer TA}` ? TA : TE extends keyof DB ? TE : never;
|
|
16
|
+
export declare type PickTableWithAlias<DB, T extends AnyAliasedTable<DB>> = T extends `${infer TB} as ${infer A}` ? TB extends keyof DB ? Record<A, DB[TB]> : never : never;
|
|
17
|
+
declare type ExtractAliasFromTableExpression<DB, TE> = TE extends string ? ExtractTableAlias<DB, TE> : TE extends AliasedExpression<any, infer QA> ? QA : TE extends (qb: any) => AliasedExpression<any, infer QA> ? QA : never;
|
|
15
18
|
declare type ExtractRowTypeFromTableExpression<DB, TE, A extends keyof any> = TE extends `${infer T} as ${infer TA}` ? TA extends A ? T extends keyof DB ? DB[T] : never : never : TE extends A ? TE extends keyof DB ? DB[TE] : never : TE extends AliasedExpression<infer O, infer QA> ? QA extends A ? O : never : TE extends (qb: any) => AliasedExpression<infer O, infer QA> ? QA extends A ? O : never : never;
|
|
16
|
-
declare type AnyAliasedTable<DB> = `${AnyTable<DB>} as ${string}`;
|
|
17
19
|
declare type AnyTable<DB> = keyof DB & string;
|
|
18
20
|
export declare function parseTableExpressionOrList(table: TableExpressionOrList<any, any>): OperationNode[];
|
|
19
21
|
export declare function parseTableExpression(table: TableExpression<any, any>): OperationNode;
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
+
import { UnaryOperator } from '../operation-node/operator-node.js';
|
|
1
2
|
import { UnaryOperationNode } from '../operation-node/unary-operation-node.js';
|
|
2
3
|
import { ExpressionOrFactory } from './expression-parser.js';
|
|
4
|
+
import { ReferenceExpression } from './reference-parser.js';
|
|
3
5
|
export declare type ExistsExpression<DB, TB extends keyof DB> = ExpressionOrFactory<DB, TB, any>;
|
|
4
|
-
export declare function parseExists(
|
|
5
|
-
export declare function parseNotExists(
|
|
6
|
+
export declare function parseExists(operand: ExistsExpression<any, any>): UnaryOperationNode;
|
|
7
|
+
export declare function parseNotExists(operand: ExistsExpression<any, any>): UnaryOperationNode;
|
|
8
|
+
export declare function parseUnaryOperation(operator: UnaryOperator, operand: ReferenceExpression<any, any>): UnaryOperationNode;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
/// <reference types="./unary-operation-parser.d.ts" />
|
|
2
|
-
import { OperatorNode
|
|
2
|
+
import { OperatorNode } from '../operation-node/operator-node.js';
|
|
3
3
|
import { UnaryOperationNode } from '../operation-node/unary-operation-node.js';
|
|
4
|
-
import {
|
|
5
|
-
export function parseExists(
|
|
6
|
-
return parseUnaryOperation('exists',
|
|
4
|
+
import { parseReferenceExpression, } from './reference-parser.js';
|
|
5
|
+
export function parseExists(operand) {
|
|
6
|
+
return parseUnaryOperation('exists', operand);
|
|
7
7
|
}
|
|
8
|
-
export function parseNotExists(
|
|
9
|
-
return parseUnaryOperation('not exists',
|
|
8
|
+
export function parseNotExists(operand) {
|
|
9
|
+
return parseUnaryOperation('not exists', operand);
|
|
10
10
|
}
|
|
11
|
-
function parseUnaryOperation(
|
|
12
|
-
return UnaryOperationNode.create(OperatorNode.create(
|
|
11
|
+
export function parseUnaryOperation(operator, operand) {
|
|
12
|
+
return UnaryOperationNode.create(OperatorNode.create(operator), parseReferenceExpression(operand));
|
|
13
13
|
}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
|
|
2
|
+
import { ExpressionBuilder } from '../expression/expression-builder.js';
|
|
2
3
|
import { UpdateKeys, UpdateType } from '../util/column-type.js';
|
|
3
4
|
import { ValueExpression } from './value-parser.js';
|
|
4
5
|
export declare type UpdateObject<DB, TB extends keyof DB, UT extends keyof DB = TB> = {
|
|
5
6
|
[C in UpdateKeys<DB[UT]>]?: ValueExpression<DB, TB, UpdateType<DB[UT][C]>> | undefined;
|
|
6
7
|
};
|
|
7
|
-
export declare
|
|
8
|
+
export declare type UpdateObjectFactory<DB, TB extends keyof DB, UT extends keyof DB> = (eb: ExpressionBuilder<DB, TB>) => UpdateObject<DB, TB, UT>;
|
|
9
|
+
export declare type UpdateExpression<DB, TB extends keyof DB, UT extends keyof DB = TB> = UpdateObject<DB, TB, UT> | UpdateObjectFactory<DB, TB, UT>;
|
|
10
|
+
export declare function parseUpdateExpression(update: UpdateExpression<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
/// <reference types="./update-set-parser.d.ts" />
|
|
2
2
|
import { ColumnNode } from '../operation-node/column-node.js';
|
|
3
3
|
import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
|
|
4
|
+
import { expressionBuilder } from '../expression/expression-builder.js';
|
|
5
|
+
import { isFunction } from '../util/object-utils.js';
|
|
4
6
|
import { parseValueExpression } from './value-parser.js';
|
|
5
|
-
export function
|
|
6
|
-
|
|
7
|
+
export function parseUpdateExpression(update) {
|
|
8
|
+
const updateObj = isFunction(update)
|
|
9
|
+
? update(expressionBuilder())
|
|
10
|
+
: update;
|
|
11
|
+
return Object.entries(updateObj)
|
|
7
12
|
.filter(([_, value]) => value !== undefined)
|
|
8
13
|
.map(([key, value]) => {
|
|
9
14
|
return ColumnUpdateNode.create(ColumnNode.create(key), parseValueExpression(value));
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { ExpressionOrFactory } from './expression-parser.js';
|
|
2
2
|
import { OperationNode } from '../operation-node/operation-node.js';
|
|
3
|
+
import { Expression } from '../expression/expression.js';
|
|
4
|
+
import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
|
|
3
5
|
export declare type ValueExpression<DB, TB extends keyof DB, V> = V | ExpressionOrFactory<DB, TB, V>;
|
|
4
6
|
export declare type ValueExpressionOrList<DB, TB extends keyof DB, V> = ValueExpression<DB, TB, V> | ReadonlyArray<ValueExpression<DB, TB, V>>;
|
|
7
|
+
export declare type ExtractTypeFromValueExpressionOrList<VE> = VE extends ReadonlyArray<infer AV> ? ExtractTypeFromValueExpression<AV> : ExtractTypeFromValueExpression<VE>;
|
|
8
|
+
declare type ExtractTypeFromValueExpression<VE> = VE extends SelectQueryBuilder<any, any, Record<string, infer SV>> ? SV : VE extends Expression<infer V> ? V : VE;
|
|
5
9
|
export declare function parseValueExpressionOrList(arg: ValueExpressionOrList<any, any, unknown>): OperationNode;
|
|
6
10
|
export declare function parseValueExpression(exp: ValueExpression<any, any, unknown>): OperationNode;
|
|
11
|
+
export {};
|
|
@@ -8,9 +8,7 @@ export function parseValueExpressionOrList(arg) {
|
|
|
8
8
|
if (isReadonlyArray(arg)) {
|
|
9
9
|
return parseValueExpressionList(arg);
|
|
10
10
|
}
|
|
11
|
-
|
|
12
|
-
return parseValueExpression(arg);
|
|
13
|
-
}
|
|
11
|
+
return parseValueExpression(arg);
|
|
14
12
|
}
|
|
15
13
|
export function parseValueExpression(exp) {
|
|
16
14
|
if (isExpressionOrFactory(exp)) {
|
|
@@ -5,7 +5,7 @@ import { KyselyPlugin, PluginTransformQueryArgs, PluginTransformResultArgs } fro
|
|
|
5
5
|
/**
|
|
6
6
|
* Plugin that removes duplicate joins from queries.
|
|
7
7
|
*
|
|
8
|
-
* See [this recipe](https://github.com/koskimas/kysely/tree/master/recipes/deduplicate-joins.md)
|
|
8
|
+
* See [this recipe](https://github.com/koskimas/kysely/tree/master/site/docs/recipes/deduplicate-joins.md)
|
|
9
9
|
*/
|
|
10
10
|
export declare class DeduplicateJoinsPlugin implements KyselyPlugin {
|
|
11
11
|
#private;
|
|
@@ -3,7 +3,7 @@ import { DeduplicateJoinsTransformer } from './deduplicate-joins-transformer.js'
|
|
|
3
3
|
/**
|
|
4
4
|
* Plugin that removes duplicate joins from queries.
|
|
5
5
|
*
|
|
6
|
-
* See [this recipe](https://github.com/koskimas/kysely/tree/master/recipes/deduplicate-joins.md)
|
|
6
|
+
* See [this recipe](https://github.com/koskimas/kysely/tree/master/site/docs/recipes/deduplicate-joins.md)
|
|
7
7
|
*/
|
|
8
8
|
export class DeduplicateJoinsPlugin {
|
|
9
9
|
#transformer = new DeduplicateJoinsTransformer();
|
|
@@ -3,8 +3,9 @@ import { AliasNode } from '../operation-node/alias-node.js';
|
|
|
3
3
|
import { OverBuilder } from './over-builder.js';
|
|
4
4
|
import { AliasedExpression, Expression } from '../expression/expression.js';
|
|
5
5
|
import { ReferenceExpression } from '../parser/reference-parser.js';
|
|
6
|
-
import { ComparisonOperatorExpression, OperandValueExpressionOrList
|
|
6
|
+
import { ComparisonOperatorExpression, OperandValueExpressionOrList } from '../parser/binary-operation-parser.js';
|
|
7
7
|
import { ExistsExpression } from '../parser/unary-operation-parser.js';
|
|
8
|
+
import { WhereExpressionFactory } from './where-interface.js';
|
|
8
9
|
export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unknown> implements Expression<O> {
|
|
9
10
|
#private;
|
|
10
11
|
constructor(props: AggregateFunctionBuilderProps);
|
|
@@ -88,22 +89,19 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
|
|
|
88
89
|
* ```ts
|
|
89
90
|
* const result = await db
|
|
90
91
|
* .selectFrom('person')
|
|
91
|
-
* .select([
|
|
92
|
-
*
|
|
93
|
-
*
|
|
94
|
-
*
|
|
95
|
-
*
|
|
96
|
-
*
|
|
97
|
-
*
|
|
98
|
-
*
|
|
99
|
-
*
|
|
100
|
-
*
|
|
101
|
-
*
|
|
102
|
-
*
|
|
103
|
-
*
|
|
104
|
-
* .count<number>('id')
|
|
105
|
-
* .filterWhere('gender', '=', 'other')
|
|
106
|
-
* .as('other_count'),
|
|
92
|
+
* .select((eb) => [
|
|
93
|
+
* eb.fn
|
|
94
|
+
* .count<number>('id')
|
|
95
|
+
* .filterWhere('gender', '=', 'female')
|
|
96
|
+
* .as('female_count'),
|
|
97
|
+
* eb.fn
|
|
98
|
+
* .count<number>('id')
|
|
99
|
+
* .filterWhere('gender', '=', 'male')
|
|
100
|
+
* .as('male_count'),
|
|
101
|
+
* eb.fn
|
|
102
|
+
* .count<number>('id')
|
|
103
|
+
* .filterWhere('gender', '=', 'other')
|
|
104
|
+
* .as('other_count'),
|
|
107
105
|
* ])
|
|
108
106
|
* .executeTakeFirstOrThrow()
|
|
109
107
|
* ```
|
|
@@ -119,52 +117,14 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
|
|
|
119
117
|
* ```
|
|
120
118
|
*/
|
|
121
119
|
filterWhere<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): AggregateFunctionBuilder<DB, TB, O>;
|
|
122
|
-
filterWhere(
|
|
120
|
+
filterWhere(factory: WhereExpressionFactory<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
|
|
123
121
|
filterWhere(expression: Expression<any>): AggregateFunctionBuilder<DB, TB, O>;
|
|
124
122
|
/**
|
|
125
|
-
*
|
|
126
|
-
*
|
|
127
|
-
* Similar to {@link WhereInterface}'s `whereExists` method.
|
|
128
|
-
*
|
|
129
|
-
* ### Examples
|
|
130
|
-
*
|
|
131
|
-
* Count pet owners versus general public:
|
|
132
|
-
*
|
|
133
|
-
* ```ts
|
|
134
|
-
* const result = await db
|
|
135
|
-
* .selectFrom('person')
|
|
136
|
-
* .select([
|
|
137
|
-
* (eb) =>
|
|
138
|
-
* eb.fn
|
|
139
|
-
* .count<number>('person.id')
|
|
140
|
-
* .filterWhereExists((qb) =>
|
|
141
|
-
* qb
|
|
142
|
-
* .selectFrom('pet')
|
|
143
|
-
* .select('pet.id')
|
|
144
|
-
* .whereRef('pet.owner_id', '=', 'person.id')
|
|
145
|
-
* )
|
|
146
|
-
* .as('pet_owner_count'),
|
|
147
|
-
* (eb) => eb.fn.count<number>('person.id').as('total_count'),
|
|
148
|
-
* ])
|
|
149
|
-
* .executeTakeFirstOrThrow()
|
|
150
|
-
* ```
|
|
151
|
-
*
|
|
152
|
-
* The generated SQL (PostgreSQL):
|
|
153
|
-
*
|
|
154
|
-
* ```sql
|
|
155
|
-
* select count("person"."id") filter(where exists (
|
|
156
|
-
* select "pet"."id"
|
|
157
|
-
* from "pet"
|
|
158
|
-
* where "pet"."owner_id" = "person"."id"
|
|
159
|
-
* )) as "pet_ower_count",
|
|
160
|
-
* count("person"."id") as "total_count"
|
|
161
|
-
* from "person"
|
|
162
|
-
* ```
|
|
123
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
163
124
|
*/
|
|
164
125
|
filterWhereExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
|
|
165
126
|
/**
|
|
166
|
-
*
|
|
167
|
-
* the `filter` clause.
|
|
127
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
168
128
|
*/
|
|
169
129
|
filterWhereNotExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
|
|
170
130
|
/**
|
|
@@ -180,13 +140,12 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
|
|
|
180
140
|
* ```ts
|
|
181
141
|
* const result = await db
|
|
182
142
|
* .selectFrom('person')
|
|
183
|
-
* .select([
|
|
184
|
-
*
|
|
185
|
-
*
|
|
186
|
-
*
|
|
187
|
-
*
|
|
188
|
-
*
|
|
189
|
-
* (eb) => eb.fn.count<number>('id').as('total_count'),
|
|
143
|
+
* .select((eb) => [
|
|
144
|
+
* eb.fn
|
|
145
|
+
* .count<number>('id')
|
|
146
|
+
* .filterWhereRef('first_name', '=', 'last_name')
|
|
147
|
+
* .as('repeat_name_count'),
|
|
148
|
+
* eb.fn.count<number>('id').as('total_count'),
|
|
190
149
|
* ])
|
|
191
150
|
* .executeTakeFirstOrThrow()
|
|
192
151
|
* ```
|
|
@@ -202,64 +161,27 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
|
|
|
202
161
|
*/
|
|
203
162
|
filterWhereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
|
|
204
163
|
/**
|
|
205
|
-
*
|
|
206
|
-
* Otherwise works just like {@link filterWhere}.
|
|
207
|
-
*
|
|
208
|
-
* Similar to {@link WhereInterface}'s `orWhere` method.
|
|
209
|
-
*
|
|
210
|
-
* ### Examples
|
|
211
|
-
*
|
|
212
|
-
* For some reason you're tasked with counting adults (18+) or people called
|
|
213
|
-
* "Bob" versus general public:
|
|
214
|
-
*
|
|
215
|
-
* ```ts
|
|
216
|
-
* const result = await db
|
|
217
|
-
* .selectFrom('person')
|
|
218
|
-
* .select([
|
|
219
|
-
* (eb) =>
|
|
220
|
-
* eb.fn
|
|
221
|
-
* .count<number>('id')
|
|
222
|
-
* .filterWhere('age', '>=', '18')
|
|
223
|
-
* .orFilterWhere('first_name', '=', 'Bob')
|
|
224
|
-
* .as('adult_or_bob_count'),
|
|
225
|
-
* (eb) => eb.fn.count<number>('id').as('total_count'),
|
|
226
|
-
* ])
|
|
227
|
-
* .executeTakeFirstOrThrow()
|
|
228
|
-
* ```
|
|
229
|
-
*
|
|
230
|
-
* The generated SQL (PostgreSQL):
|
|
231
|
-
*
|
|
232
|
-
* ```sql
|
|
233
|
-
* select
|
|
234
|
-
* count("id") filter(where "age" >= $1 or "first_name" = $2) as "adult_or_bob_count",
|
|
235
|
-
* count("id") as "total_count"
|
|
236
|
-
* from "person"
|
|
237
|
-
* ```
|
|
164
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
238
165
|
*/
|
|
239
166
|
orFilterWhere<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs: OperandValueExpressionOrList<DB, TB, RE>): AggregateFunctionBuilder<DB, TB, O>;
|
|
240
|
-
|
|
167
|
+
/**
|
|
168
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
169
|
+
*/
|
|
170
|
+
orFilterWhere(factory: WhereExpressionFactory<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
|
|
171
|
+
/**
|
|
172
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
173
|
+
*/
|
|
241
174
|
orFilterWhere(expression: Expression<any>): AggregateFunctionBuilder<DB, TB, O>;
|
|
242
175
|
/**
|
|
243
|
-
*
|
|
244
|
-
* the `filter` clause.
|
|
245
|
-
*
|
|
246
|
-
* Similar to {@link WhereInterface}'s `orWhereExists` method.
|
|
176
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
247
177
|
*/
|
|
248
178
|
orFilterWhereExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
|
|
249
179
|
/**
|
|
250
|
-
*
|
|
251
|
-
* the `filter` clause.
|
|
252
|
-
*
|
|
253
|
-
* Similar to {@link WhereInterface}'s `orWhereNotExists` method.
|
|
180
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
254
181
|
*/
|
|
255
182
|
orFilterWhereNotExists(arg: ExistsExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
|
|
256
183
|
/**
|
|
257
|
-
*
|
|
258
|
-
* like {@link filterWhereRef}.
|
|
259
|
-
*
|
|
260
|
-
* Also see {@link orFilterWhere} and {@link filterWhere}.
|
|
261
|
-
*
|
|
262
|
-
* Similar to {@link WhereInterface}'s `orWhereRef` method.
|
|
184
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
263
185
|
*/
|
|
264
186
|
orFilterWhereRef(lhs: ReferenceExpression<DB, TB>, op: ComparisonOperatorExpression, rhs: ReferenceExpression<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
|
|
265
187
|
/**
|
|
@@ -305,6 +227,11 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
|
|
|
305
227
|
* ```
|
|
306
228
|
*/
|
|
307
229
|
over(over?: OverBuilderCallback<DB, TB>): AggregateFunctionBuilder<DB, TB, O>;
|
|
230
|
+
/**
|
|
231
|
+
* Simply calls the provided function passing `this` as the only argument. `$call` returns
|
|
232
|
+
* what the provided function returns.
|
|
233
|
+
*/
|
|
234
|
+
$call<T>(func: (qb: this) => T): T;
|
|
308
235
|
/**
|
|
309
236
|
* Creates the OperationNode that describes how to compile this expression into SQL.
|
|
310
237
|
*
|
|
@@ -5,7 +5,7 @@ import { AliasNode } from '../operation-node/alias-node.js';
|
|
|
5
5
|
import { IdentifierNode } from '../operation-node/identifier-node.js';
|
|
6
6
|
import { preventAwait } from '../util/prevent-await.js';
|
|
7
7
|
import { createOverBuilder } from '../parser/parse-utils.js';
|
|
8
|
-
import {
|
|
8
|
+
import { parseReferentialComparison, parseWhere, } from '../parser/binary-operation-parser.js';
|
|
9
9
|
import { parseExists, parseNotExists, } from '../parser/unary-operation-parser.js';
|
|
10
10
|
export class AggregateFunctionBuilder {
|
|
11
11
|
#props;
|
|
@@ -78,44 +78,7 @@ export class AggregateFunctionBuilder {
|
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
80
|
/**
|
|
81
|
-
*
|
|
82
|
-
*
|
|
83
|
-
* Similar to {@link WhereInterface}'s `whereExists` method.
|
|
84
|
-
*
|
|
85
|
-
* ### Examples
|
|
86
|
-
*
|
|
87
|
-
* Count pet owners versus general public:
|
|
88
|
-
*
|
|
89
|
-
* ```ts
|
|
90
|
-
* const result = await db
|
|
91
|
-
* .selectFrom('person')
|
|
92
|
-
* .select([
|
|
93
|
-
* (eb) =>
|
|
94
|
-
* eb.fn
|
|
95
|
-
* .count<number>('person.id')
|
|
96
|
-
* .filterWhereExists((qb) =>
|
|
97
|
-
* qb
|
|
98
|
-
* .selectFrom('pet')
|
|
99
|
-
* .select('pet.id')
|
|
100
|
-
* .whereRef('pet.owner_id', '=', 'person.id')
|
|
101
|
-
* )
|
|
102
|
-
* .as('pet_owner_count'),
|
|
103
|
-
* (eb) => eb.fn.count<number>('person.id').as('total_count'),
|
|
104
|
-
* ])
|
|
105
|
-
* .executeTakeFirstOrThrow()
|
|
106
|
-
* ```
|
|
107
|
-
*
|
|
108
|
-
* The generated SQL (PostgreSQL):
|
|
109
|
-
*
|
|
110
|
-
* ```sql
|
|
111
|
-
* select count("person"."id") filter(where exists (
|
|
112
|
-
* select "pet"."id"
|
|
113
|
-
* from "pet"
|
|
114
|
-
* where "pet"."owner_id" = "person"."id"
|
|
115
|
-
* )) as "pet_ower_count",
|
|
116
|
-
* count("person"."id") as "total_count"
|
|
117
|
-
* from "person"
|
|
118
|
-
* ```
|
|
81
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
119
82
|
*/
|
|
120
83
|
filterWhereExists(arg) {
|
|
121
84
|
return new AggregateFunctionBuilder({
|
|
@@ -124,8 +87,7 @@ export class AggregateFunctionBuilder {
|
|
|
124
87
|
});
|
|
125
88
|
}
|
|
126
89
|
/**
|
|
127
|
-
*
|
|
128
|
-
* the `filter` clause.
|
|
90
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
129
91
|
*/
|
|
130
92
|
filterWhereNotExists(arg) {
|
|
131
93
|
return new AggregateFunctionBuilder({
|
|
@@ -146,13 +108,12 @@ export class AggregateFunctionBuilder {
|
|
|
146
108
|
* ```ts
|
|
147
109
|
* const result = await db
|
|
148
110
|
* .selectFrom('person')
|
|
149
|
-
* .select([
|
|
150
|
-
*
|
|
151
|
-
*
|
|
152
|
-
*
|
|
153
|
-
*
|
|
154
|
-
*
|
|
155
|
-
* (eb) => eb.fn.count<number>('id').as('total_count'),
|
|
111
|
+
* .select((eb) => [
|
|
112
|
+
* eb.fn
|
|
113
|
+
* .count<number>('id')
|
|
114
|
+
* .filterWhereRef('first_name', '=', 'last_name')
|
|
115
|
+
* .as('repeat_name_count'),
|
|
116
|
+
* eb.fn.count<number>('id').as('total_count'),
|
|
156
117
|
* ])
|
|
157
118
|
* .executeTakeFirstOrThrow()
|
|
158
119
|
* ```
|
|
@@ -169,9 +130,12 @@ export class AggregateFunctionBuilder {
|
|
|
169
130
|
filterWhereRef(lhs, op, rhs) {
|
|
170
131
|
return new AggregateFunctionBuilder({
|
|
171
132
|
...this.#props,
|
|
172
|
-
aggregateFunctionNode: AggregateFunctionNode.cloneWithFilter(this.#props.aggregateFunctionNode,
|
|
133
|
+
aggregateFunctionNode: AggregateFunctionNode.cloneWithFilter(this.#props.aggregateFunctionNode, parseReferentialComparison(lhs, op, rhs)),
|
|
173
134
|
});
|
|
174
135
|
}
|
|
136
|
+
/**
|
|
137
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
138
|
+
*/
|
|
175
139
|
orFilterWhere(...args) {
|
|
176
140
|
return new AggregateFunctionBuilder({
|
|
177
141
|
...this.#props,
|
|
@@ -179,10 +143,7 @@ export class AggregateFunctionBuilder {
|
|
|
179
143
|
});
|
|
180
144
|
}
|
|
181
145
|
/**
|
|
182
|
-
*
|
|
183
|
-
* the `filter` clause.
|
|
184
|
-
*
|
|
185
|
-
* Similar to {@link WhereInterface}'s `orWhereExists` method.
|
|
146
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
186
147
|
*/
|
|
187
148
|
orFilterWhereExists(arg) {
|
|
188
149
|
return new AggregateFunctionBuilder({
|
|
@@ -191,10 +152,7 @@ export class AggregateFunctionBuilder {
|
|
|
191
152
|
});
|
|
192
153
|
}
|
|
193
154
|
/**
|
|
194
|
-
*
|
|
195
|
-
* the `filter` clause.
|
|
196
|
-
*
|
|
197
|
-
* Similar to {@link WhereInterface}'s `orWhereNotExists` method.
|
|
155
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
198
156
|
*/
|
|
199
157
|
orFilterWhereNotExists(arg) {
|
|
200
158
|
return new AggregateFunctionBuilder({
|
|
@@ -203,17 +161,12 @@ export class AggregateFunctionBuilder {
|
|
|
203
161
|
});
|
|
204
162
|
}
|
|
205
163
|
/**
|
|
206
|
-
*
|
|
207
|
-
* like {@link filterWhereRef}.
|
|
208
|
-
*
|
|
209
|
-
* Also see {@link orFilterWhere} and {@link filterWhere}.
|
|
210
|
-
*
|
|
211
|
-
* Similar to {@link WhereInterface}'s `orWhereRef` method.
|
|
164
|
+
* @deprecated Follow [these](https://github.com/koskimas/kysely/releases/tag/0.24.0) instructions to migrate
|
|
212
165
|
*/
|
|
213
166
|
orFilterWhereRef(lhs, op, rhs) {
|
|
214
167
|
return new AggregateFunctionBuilder({
|
|
215
168
|
...this.#props,
|
|
216
|
-
aggregateFunctionNode: AggregateFunctionNode.cloneWithOrFilter(this.#props.aggregateFunctionNode,
|
|
169
|
+
aggregateFunctionNode: AggregateFunctionNode.cloneWithOrFilter(this.#props.aggregateFunctionNode, parseReferentialComparison(lhs, op, rhs)),
|
|
217
170
|
});
|
|
218
171
|
}
|
|
219
172
|
/**
|
|
@@ -265,6 +218,13 @@ export class AggregateFunctionBuilder {
|
|
|
265
218
|
aggregateFunctionNode: AggregateFunctionNode.cloneWithOver(this.#props.aggregateFunctionNode, (over ? over(builder) : builder).toOperationNode()),
|
|
266
219
|
});
|
|
267
220
|
}
|
|
221
|
+
/**
|
|
222
|
+
* Simply calls the provided function passing `this` as the only argument. `$call` returns
|
|
223
|
+
* what the provided function returns.
|
|
224
|
+
*/
|
|
225
|
+
$call(func) {
|
|
226
|
+
return func(this);
|
|
227
|
+
}
|
|
268
228
|
toOperationNode() {
|
|
269
229
|
return this.#props.aggregateFunctionNode;
|
|
270
230
|
}
|