kysely 0.11.3 → 0.12.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/cjs/dialect/dialect-adapter-base.d.ts +36 -0
- package/dist/cjs/dialect/mysql/mysql-adapter.d.ts +36 -0
- package/dist/cjs/dialect/mysql/mysql-dialect.d.ts +16 -0
- package/dist/cjs/dialect/mysql/mysql-driver.d.ts +29 -0
- package/dist/cjs/dialect/mysql/mysql-introspector.d.ts +3 -0
- package/dist/cjs/dialect/postgres/postgres-adapter.d.ts +36 -0
- package/dist/cjs/dialect/postgres/postgres-dialect.d.ts +16 -0
- package/dist/cjs/dialect/postgres/postgres-driver.d.ts +29 -0
- package/dist/cjs/dialect/postgres/postgres-introspector.d.ts +3 -0
- package/dist/cjs/dialect/sqlite/sqlite-adapter.d.ts +36 -0
- package/dist/cjs/dialect/sqlite/sqlite-adapter.js +6 -2
- package/dist/cjs/dialect/sqlite/sqlite-dialect.d.ts +16 -0
- package/dist/cjs/dialect/sqlite/sqlite-driver.d.ts +29 -0
- package/dist/cjs/dialect/sqlite/sqlite-introspector.d.ts +3 -0
- package/dist/cjs/driver/default-connection-provider.d.ts +4 -0
- package/dist/cjs/driver/runtime-driver.d.ts +29 -0
- package/dist/cjs/driver/single-connection-provider.d.ts +4 -0
- package/dist/cjs/dynamic/dynamic-reference-builder.d.ts +1 -0
- package/dist/cjs/dynamic/dynamic-reference-builder.js +9 -1
- package/dist/cjs/dynamic/dynamic.d.ts +6 -7
- package/dist/cjs/dynamic/dynamic.js +6 -7
- package/dist/cjs/index.d.ts +14 -3
- package/dist/cjs/index.js +12 -1
- package/dist/cjs/kysely.d.ts +170 -11
- package/dist/cjs/kysely.js +69 -9
- package/dist/cjs/migration/migration.d.ts +2 -2
- package/dist/cjs/operation-node/common-table-expression-name-node.d.ts +15 -0
- package/dist/cjs/operation-node/common-table-expression-name-node.js +23 -0
- package/dist/cjs/operation-node/common-table-expression-node.d.ts +3 -3
- package/dist/cjs/operation-node/create-table-node.d.ts +6 -2
- package/dist/cjs/operation-node/create-table-node.js +6 -6
- package/dist/cjs/operation-node/create-view-node.d.ts +1 -0
- package/dist/cjs/operation-node/insert-query-node.d.ts +4 -4
- package/dist/cjs/operation-node/operation-node-transformer.d.ts +4 -0
- package/dist/cjs/operation-node/operation-node-transformer.js +20 -1
- package/dist/cjs/operation-node/operation-node-visitor.d.ts +4 -0
- package/dist/cjs/operation-node/operation-node-visitor.js +2 -0
- package/dist/cjs/operation-node/operation-node.d.ts +1 -1
- package/dist/cjs/operation-node/query-node.d.ts +0 -2
- package/dist/cjs/operation-node/query-node.js +0 -10
- package/dist/cjs/operation-node/values-node.d.ts +15 -0
- package/dist/cjs/operation-node/values-node.js +18 -0
- package/dist/cjs/operation-node/with-node.d.ts +3 -1
- package/dist/cjs/operation-node/with-node.js +2 -1
- package/dist/cjs/package.json +1 -3
- package/dist/cjs/parser/complex-expression-parser.d.ts +9 -0
- package/dist/cjs/parser/complex-expression-parser.js +25 -0
- package/dist/cjs/parser/filter-parser.d.ts +13 -4
- package/dist/cjs/parser/filter-parser.js +21 -24
- package/dist/cjs/parser/insert-values-parser.d.ts +7 -10
- package/dist/cjs/parser/insert-values-parser.js +31 -39
- package/dist/cjs/parser/order-by-parser.d.ts +1 -1
- package/dist/cjs/parser/parse-context.d.ts +22 -8
- package/dist/cjs/parser/parse-context.js +10 -10
- package/dist/cjs/parser/reference-parser.d.ts +8 -7
- package/dist/cjs/parser/reference-parser.js +8 -17
- package/dist/cjs/parser/returning-parser.d.ts +1 -5
- package/dist/cjs/parser/select-parser.d.ts +12 -14
- package/dist/cjs/parser/select-parser.js +5 -9
- package/dist/cjs/parser/table-parser.d.ts +9 -11
- package/dist/cjs/parser/table-parser.js +2 -8
- package/dist/cjs/parser/union-parser.d.ts +2 -2
- package/dist/cjs/parser/union-parser.js +1 -6
- package/dist/cjs/parser/update-set-parser.d.ts +2 -8
- package/dist/cjs/parser/update-set-parser.js +6 -26
- package/dist/cjs/parser/value-parser.d.ts +9 -6
- package/dist/cjs/parser/value-parser.js +7 -30
- package/dist/cjs/parser/with-parser.d.ts +36 -6
- package/dist/cjs/parser/with-parser.js +13 -2
- package/dist/cjs/plugin/camel-case/camel-case-plugin.d.ts +34 -0
- package/dist/cjs/plugin/immediate-value.ts/immediate-value-plugin.d.ts +34 -0
- package/dist/cjs/plugin/immediate-value.ts/immediate-value-plugin.js +2 -2
- package/dist/cjs/plugin/with-schema/with-schema-plugin.d.ts +34 -0
- package/dist/cjs/plugin/with-schema/with-schema-transformer.js +8 -0
- package/dist/cjs/query-builder/delete-query-builder.d.ts +647 -0
- package/dist/cjs/query-builder/delete-query-builder.js +185 -0
- package/dist/cjs/query-builder/expression-builder.d.ts +8 -6
- package/dist/cjs/query-builder/expression-builder.js +3 -3
- package/dist/cjs/query-builder/function-builder.d.ts +2 -1
- package/dist/cjs/query-builder/function-builder.js +2 -1
- package/dist/cjs/query-builder/having-interface.d.ts +49 -0
- package/dist/cjs/query-builder/having-interface.js +2 -0
- package/dist/cjs/query-builder/insert-query-builder.d.ts +504 -0
- package/dist/cjs/query-builder/insert-query-builder.js +256 -0
- package/dist/cjs/query-builder/insert-result.d.ts +3 -2
- package/dist/cjs/query-builder/insert-result.js +3 -2
- package/dist/cjs/query-builder/join-builder.d.ts +19 -20
- package/dist/cjs/query-builder/join-builder.js +12 -12
- package/dist/cjs/query-builder/join-interface.d.ts +130 -0
- package/dist/cjs/query-builder/join-interface.js +2 -0
- package/dist/cjs/query-builder/no-result-error.d.ts +9 -0
- package/dist/cjs/query-builder/no-result-error.js +14 -0
- package/dist/cjs/query-builder/returning-interface.d.ts +73 -0
- package/dist/cjs/query-builder/returning-interface.js +2 -0
- package/dist/cjs/query-builder/{query-builder.d.ts → select-query-builder.d.ts} +145 -634
- package/dist/cjs/query-builder/select-query-builder.js +571 -0
- package/dist/cjs/query-builder/update-query-builder.d.ts +735 -0
- package/dist/cjs/query-builder/update-query-builder.js +279 -0
- package/dist/cjs/query-builder/where-interface.d.ts +378 -0
- package/dist/cjs/query-builder/where-interface.js +2 -0
- package/dist/cjs/query-compiler/default-query-compiler.d.ts +4 -0
- package/dist/cjs/query-compiler/default-query-compiler.js +33 -5
- package/dist/cjs/query-creator.d.ts +69 -43
- package/dist/cjs/query-creator.js +66 -29
- package/dist/cjs/query-executor/default-query-executor.d.ts +19 -0
- package/dist/cjs/query-executor/noop-query-executor.d.ts +19 -0
- package/dist/cjs/query-executor/query-executor.d.ts +1 -1
- package/dist/cjs/query-executor/query-executor.js +1 -1
- package/dist/cjs/raw-builder/raw-builder.d.ts +2 -0
- package/dist/cjs/raw-builder/raw-builder.js +7 -1
- package/dist/cjs/schema/alter-table-builder.d.ts +218 -2
- package/dist/cjs/schema/column-definition-builder.d.ts +135 -20
- package/dist/cjs/schema/create-index-builder.d.ts +2 -1
- package/dist/cjs/schema/create-index-builder.js +2 -1
- package/dist/cjs/schema/create-table-builder.d.ts +26 -9
- package/dist/cjs/schema/create-table-builder.js +42 -9
- package/dist/cjs/schema/create-view-builder.d.ts +17 -3
- package/dist/cjs/schema/create-view-builder.js +25 -16
- package/dist/cjs/schema/schema.d.ts +18 -11
- package/dist/cjs/schema/schema.js +18 -11
- package/dist/cjs/util/log.d.ts +3 -2
- package/dist/cjs/util/log.js +8 -15
- package/dist/cjs/util/type-utils.d.ts +7 -7
- package/dist/esm/dialect/dialect-adapter-base.d.ts +36 -0
- package/dist/esm/dialect/mysql/mysql-adapter.d.ts +36 -0
- package/dist/esm/dialect/mysql/mysql-dialect.d.ts +16 -0
- package/dist/esm/dialect/mysql/mysql-driver.d.ts +29 -0
- package/dist/esm/dialect/mysql/mysql-introspector.d.ts +3 -0
- package/dist/esm/dialect/postgres/postgres-adapter.d.ts +36 -0
- package/dist/esm/dialect/postgres/postgres-dialect.d.ts +16 -0
- package/dist/esm/dialect/postgres/postgres-driver.d.ts +29 -0
- package/dist/esm/dialect/postgres/postgres-introspector.d.ts +3 -0
- package/dist/esm/dialect/sqlite/sqlite-adapter.d.ts +36 -0
- package/dist/esm/dialect/sqlite/sqlite-adapter.js +6 -2
- package/dist/esm/dialect/sqlite/sqlite-dialect.d.ts +16 -0
- package/dist/esm/dialect/sqlite/sqlite-driver.d.ts +29 -0
- package/dist/esm/dialect/sqlite/sqlite-introspector.d.ts +3 -0
- package/dist/esm/driver/default-connection-provider.d.ts +4 -0
- package/dist/esm/driver/runtime-driver.d.ts +29 -0
- package/dist/esm/driver/single-connection-provider.d.ts +4 -0
- package/dist/esm/dynamic/dynamic-reference-builder.d.ts +1 -0
- package/dist/esm/dynamic/dynamic-reference-builder.js +7 -0
- package/dist/esm/dynamic/dynamic.d.ts +6 -7
- package/dist/esm/dynamic/dynamic.js +6 -7
- package/dist/esm/index.d.ts +14 -3
- package/dist/esm/index.js +12 -1
- package/dist/esm/kysely.d.ts +170 -11
- package/dist/esm/kysely.js +69 -9
- package/dist/esm/migration/migration.d.ts +2 -2
- package/dist/esm/operation-node/common-table-expression-name-node.d.ts +15 -0
- package/dist/esm/operation-node/common-table-expression-name-node.js +20 -0
- package/dist/esm/operation-node/common-table-expression-node.d.ts +3 -3
- package/dist/esm/operation-node/create-table-node.d.ts +6 -2
- package/dist/esm/operation-node/create-table-node.js +6 -6
- package/dist/esm/operation-node/create-view-node.d.ts +1 -0
- package/dist/esm/operation-node/insert-query-node.d.ts +4 -4
- package/dist/esm/operation-node/operation-node-transformer.d.ts +4 -0
- package/dist/esm/operation-node/operation-node-transformer.js +20 -1
- package/dist/esm/operation-node/operation-node-visitor.d.ts +4 -0
- package/dist/esm/operation-node/operation-node-visitor.js +2 -0
- package/dist/esm/operation-node/operation-node.d.ts +1 -1
- package/dist/esm/operation-node/query-node.d.ts +0 -2
- package/dist/esm/operation-node/query-node.js +0 -10
- package/dist/esm/operation-node/values-node.d.ts +15 -0
- package/dist/esm/operation-node/values-node.js +15 -0
- package/dist/esm/operation-node/with-node.d.ts +3 -1
- package/dist/esm/operation-node/with-node.js +2 -1
- package/dist/esm/package.json +1 -3
- package/dist/esm/parser/complex-expression-parser.d.ts +9 -0
- package/dist/esm/parser/complex-expression-parser.js +20 -0
- package/dist/esm/parser/filter-parser.d.ts +13 -4
- package/dist/esm/parser/filter-parser.js +21 -24
- package/dist/esm/parser/insert-values-parser.d.ts +7 -10
- package/dist/esm/parser/insert-values-parser.js +31 -38
- package/dist/esm/parser/order-by-parser.d.ts +1 -1
- package/dist/esm/parser/parse-context.d.ts +22 -8
- package/dist/esm/parser/parse-context.js +10 -10
- package/dist/esm/parser/reference-parser.d.ts +8 -7
- package/dist/esm/parser/reference-parser.js +9 -18
- package/dist/esm/parser/returning-parser.d.ts +1 -5
- package/dist/esm/parser/select-parser.d.ts +12 -14
- package/dist/esm/parser/select-parser.js +6 -10
- package/dist/esm/parser/table-parser.d.ts +9 -11
- package/dist/esm/parser/table-parser.js +3 -9
- package/dist/esm/parser/union-parser.d.ts +2 -2
- package/dist/esm/parser/union-parser.js +1 -6
- package/dist/esm/parser/update-set-parser.d.ts +2 -8
- package/dist/esm/parser/update-set-parser.js +5 -24
- package/dist/esm/parser/value-parser.d.ts +9 -6
- package/dist/esm/parser/value-parser.js +8 -31
- package/dist/esm/parser/with-parser.d.ts +36 -6
- package/dist/esm/parser/with-parser.js +13 -2
- package/dist/esm/plugin/camel-case/camel-case-plugin.d.ts +34 -0
- package/dist/esm/plugin/immediate-value.ts/immediate-value-plugin.d.ts +34 -0
- package/dist/esm/plugin/immediate-value.ts/immediate-value-plugin.js +2 -2
- package/dist/esm/plugin/with-schema/with-schema-plugin.d.ts +34 -0
- package/dist/esm/plugin/with-schema/with-schema-transformer.js +8 -0
- package/dist/esm/query-builder/delete-query-builder.d.ts +647 -0
- package/dist/esm/query-builder/delete-query-builder.js +181 -0
- package/dist/esm/query-builder/expression-builder.d.ts +8 -6
- package/dist/esm/query-builder/expression-builder.js +3 -3
- package/dist/esm/query-builder/function-builder.d.ts +2 -1
- package/dist/esm/query-builder/function-builder.js +2 -1
- package/dist/esm/query-builder/having-interface.d.ts +49 -0
- package/dist/esm/query-builder/having-interface.js +1 -0
- package/dist/esm/query-builder/insert-query-builder.d.ts +504 -0
- package/dist/esm/query-builder/insert-query-builder.js +252 -0
- package/dist/esm/query-builder/insert-result.d.ts +3 -2
- package/dist/esm/query-builder/insert-result.js +3 -2
- package/dist/esm/query-builder/join-builder.d.ts +19 -20
- package/dist/esm/query-builder/join-builder.js +12 -12
- package/dist/esm/query-builder/join-interface.d.ts +130 -0
- package/dist/esm/query-builder/join-interface.js +1 -0
- package/dist/esm/query-builder/no-result-error.d.ts +9 -0
- package/dist/esm/query-builder/no-result-error.js +10 -0
- package/dist/esm/query-builder/returning-interface.d.ts +73 -0
- package/dist/esm/query-builder/returning-interface.js +1 -0
- package/dist/esm/query-builder/{query-builder.d.ts → select-query-builder.d.ts} +145 -634
- package/dist/esm/query-builder/select-query-builder.js +566 -0
- package/dist/esm/query-builder/update-query-builder.d.ts +735 -0
- package/dist/esm/query-builder/update-query-builder.js +275 -0
- package/dist/esm/query-builder/where-interface.d.ts +378 -0
- package/dist/esm/query-builder/where-interface.js +1 -0
- package/dist/esm/query-compiler/default-query-compiler.d.ts +4 -0
- package/dist/esm/query-compiler/default-query-compiler.js +33 -5
- package/dist/esm/query-creator.d.ts +69 -43
- package/dist/esm/query-creator.js +66 -29
- package/dist/esm/query-executor/default-query-executor.d.ts +19 -0
- package/dist/esm/query-executor/noop-query-executor.d.ts +19 -0
- package/dist/esm/query-executor/query-executor.d.ts +1 -1
- package/dist/esm/query-executor/query-executor.js +1 -1
- package/dist/esm/raw-builder/raw-builder.d.ts +2 -0
- package/dist/esm/raw-builder/raw-builder.js +7 -1
- package/dist/esm/schema/alter-table-builder.d.ts +218 -2
- package/dist/esm/schema/column-definition-builder.d.ts +135 -20
- package/dist/esm/schema/create-index-builder.d.ts +2 -1
- package/dist/esm/schema/create-index-builder.js +2 -1
- package/dist/esm/schema/create-table-builder.d.ts +26 -9
- package/dist/esm/schema/create-table-builder.js +43 -10
- package/dist/esm/schema/create-view-builder.d.ts +17 -3
- package/dist/esm/schema/create-view-builder.js +25 -16
- package/dist/esm/schema/schema.d.ts +18 -11
- package/dist/esm/schema/schema.js +18 -11
- package/dist/esm/util/log.d.ts +3 -2
- package/dist/esm/util/log.js +7 -14
- package/dist/esm/util/type-utils.d.ts +7 -7
- package/package.json +10 -8
- package/dist/cjs/query-builder/query-builder.js +0 -1067
- package/dist/esm/query-builder/query-builder.js +0 -1061
|
@@ -44,6 +44,7 @@ import { ReferencesNode } from './references-node.js';
|
|
|
44
44
|
import { CheckConstraintNode } from './check-constraint-node.js';
|
|
45
45
|
import { WithNode } from './with-node.js';
|
|
46
46
|
import { CommonTableExpressionNode } from './common-table-expression-node.js';
|
|
47
|
+
import { CommonTableExpressionNameNode } from './common-table-expression-name-node.js';
|
|
47
48
|
import { HavingNode } from './having-node.js';
|
|
48
49
|
import { CreateSchemaNode } from './create-schema-node.js';
|
|
49
50
|
import { DropSchemaNode } from './drop-schema-node.js';
|
|
@@ -63,6 +64,7 @@ import { DropViewNode } from './drop-view-node.js';
|
|
|
63
64
|
import { GeneratedAlwaysAsNode } from './generated-always-as-node.js';
|
|
64
65
|
import { DefaultValueNode } from './default-value-node.js';
|
|
65
66
|
import { OnNode } from './on-node.js';
|
|
67
|
+
import { ValuesNode } from './values-node.js';
|
|
66
68
|
/**
|
|
67
69
|
* Transforms an operation node tree into another one.
|
|
68
70
|
*
|
|
@@ -113,6 +115,7 @@ export declare class OperationNodeTransformer {
|
|
|
113
115
|
protected transformRaw(node: RawNode): RawNode;
|
|
114
116
|
protected transformWhere(node: WhereNode): WhereNode;
|
|
115
117
|
protected transformInsertQuery(node: InsertQueryNode): InsertQueryNode;
|
|
118
|
+
protected transformValues(node: ValuesNode): ValuesNode;
|
|
116
119
|
protected transformDeleteQuery(node: DeleteQueryNode): DeleteQueryNode;
|
|
117
120
|
protected transformReturning(node: ReturningNode): ReturningNode;
|
|
118
121
|
protected transformCreateTable(node: CreateTableNode): CreateTableNode;
|
|
@@ -140,6 +143,7 @@ export declare class OperationNodeTransformer {
|
|
|
140
143
|
protected transformCheckConstraint(node: CheckConstraintNode): CheckConstraintNode;
|
|
141
144
|
protected transformWith(node: WithNode): WithNode;
|
|
142
145
|
protected transformCommonTableExpression(node: CommonTableExpressionNode): CommonTableExpressionNode;
|
|
146
|
+
protected transformCommonTableExpressionName(node: CommonTableExpressionNameNode): CommonTableExpressionNameNode;
|
|
143
147
|
protected transformHaving(node: HavingNode): HavingNode;
|
|
144
148
|
protected transformCreateSchema(node: CreateSchemaNode): CreateSchemaNode;
|
|
145
149
|
protected transformDropSchema(node: DropSchemaNode): DropSchemaNode;
|
|
@@ -81,6 +81,7 @@ class OperationNodeTransformer {
|
|
|
81
81
|
CheckConstraintNode: this.transformCheckConstraint.bind(this),
|
|
82
82
|
WithNode: this.transformWith.bind(this),
|
|
83
83
|
CommonTableExpressionNode: this.transformCommonTableExpression.bind(this),
|
|
84
|
+
CommonTableExpressionNameNode: this.transformCommonTableExpressionName.bind(this),
|
|
84
85
|
HavingNode: this.transformHaving.bind(this),
|
|
85
86
|
CreateSchemaNode: this.transformCreateSchema.bind(this),
|
|
86
87
|
DropSchemaNode: this.transformDropSchema.bind(this),
|
|
@@ -98,6 +99,7 @@ class OperationNodeTransformer {
|
|
|
98
99
|
GeneratedAlwaysAsNode: this.transformGeneratedAlwaysAs.bind(this),
|
|
99
100
|
DefaultValueNode: this.transformDefaultValue.bind(this),
|
|
100
101
|
OnNode: this.transformOn.bind(this),
|
|
102
|
+
ValuesNode: this.transformValues.bind(this),
|
|
101
103
|
});
|
|
102
104
|
transformNode = (node) => {
|
|
103
105
|
if (!node) {
|
|
@@ -232,7 +234,7 @@ class OperationNodeTransformer {
|
|
|
232
234
|
kind: 'InsertQueryNode',
|
|
233
235
|
into: this.transformNode(node.into),
|
|
234
236
|
columns: this.transformNodeList(node.columns),
|
|
235
|
-
values: this.
|
|
237
|
+
values: this.transformNode(node.values),
|
|
236
238
|
returning: this.transformNode(node.returning),
|
|
237
239
|
onConflict: this.transformNode(node.onConflict),
|
|
238
240
|
onDuplicateKey: this.transformNode(node.onDuplicateKey),
|
|
@@ -240,6 +242,12 @@ class OperationNodeTransformer {
|
|
|
240
242
|
ignore: node.ignore,
|
|
241
243
|
};
|
|
242
244
|
}
|
|
245
|
+
transformValues(node) {
|
|
246
|
+
return {
|
|
247
|
+
kind: 'ValuesNode',
|
|
248
|
+
values: this.transformNodeList(node.values),
|
|
249
|
+
};
|
|
250
|
+
}
|
|
243
251
|
transformDeleteQuery(node) {
|
|
244
252
|
return {
|
|
245
253
|
kind: 'DeleteQueryNode',
|
|
@@ -262,7 +270,9 @@ class OperationNodeTransformer {
|
|
|
262
270
|
table: this.transformNode(node.table),
|
|
263
271
|
columns: this.transformNodeList(node.columns),
|
|
264
272
|
constraints: this.transformNodeList(node.constraints),
|
|
273
|
+
temporary: node.temporary,
|
|
265
274
|
ifNotExists: node.ifNotExists,
|
|
275
|
+
onCommit: node.onCommit,
|
|
266
276
|
};
|
|
267
277
|
}
|
|
268
278
|
transformColumnDefinition(node) {
|
|
@@ -438,6 +448,7 @@ class OperationNodeTransformer {
|
|
|
438
448
|
return {
|
|
439
449
|
kind: 'WithNode',
|
|
440
450
|
expressions: this.transformNodeList(node.expressions),
|
|
451
|
+
recursive: node.recursive,
|
|
441
452
|
};
|
|
442
453
|
}
|
|
443
454
|
transformCommonTableExpression(node) {
|
|
@@ -447,6 +458,13 @@ class OperationNodeTransformer {
|
|
|
447
458
|
expression: this.transformNode(node.expression),
|
|
448
459
|
};
|
|
449
460
|
}
|
|
461
|
+
transformCommonTableExpressionName(node) {
|
|
462
|
+
return {
|
|
463
|
+
kind: 'CommonTableExpressionNameNode',
|
|
464
|
+
table: this.transformNode(node.table),
|
|
465
|
+
columns: this.transformNodeList(node.columns),
|
|
466
|
+
};
|
|
467
|
+
}
|
|
450
468
|
transformHaving(node) {
|
|
451
469
|
return {
|
|
452
470
|
kind: 'HavingNode',
|
|
@@ -528,6 +546,7 @@ class OperationNodeTransformer {
|
|
|
528
546
|
return {
|
|
529
547
|
kind: 'CreateViewNode',
|
|
530
548
|
name: this.transformNode(node.name),
|
|
549
|
+
temporary: node.temporary,
|
|
531
550
|
orReplace: node.orReplace,
|
|
532
551
|
ifNotExists: node.ifNotExists,
|
|
533
552
|
materialized: node.materialized,
|
|
@@ -44,6 +44,7 @@ import { ReferencesNode } from './references-node.js';
|
|
|
44
44
|
import { CheckConstraintNode } from './check-constraint-node.js';
|
|
45
45
|
import { WithNode } from './with-node.js';
|
|
46
46
|
import { CommonTableExpressionNode } from './common-table-expression-node.js';
|
|
47
|
+
import { CommonTableExpressionNameNode } from './common-table-expression-name-node.js';
|
|
47
48
|
import { HavingNode } from './having-node.js';
|
|
48
49
|
import { CreateSchemaNode } from './create-schema-node.js';
|
|
49
50
|
import { DropSchemaNode } from './drop-schema-node.js';
|
|
@@ -63,6 +64,7 @@ import { DropViewNode } from './drop-view-node.js';
|
|
|
63
64
|
import { GeneratedAlwaysAsNode } from './generated-always-as-node.js';
|
|
64
65
|
import { DefaultValueNode } from './default-value-node.js';
|
|
65
66
|
import { OnNode } from './on-node.js';
|
|
67
|
+
import { ValuesNode } from './values-node.js';
|
|
66
68
|
export declare abstract class OperationNodeVisitor {
|
|
67
69
|
#private;
|
|
68
70
|
protected readonly nodeStack: OperationNode[];
|
|
@@ -109,6 +111,7 @@ export declare abstract class OperationNodeVisitor {
|
|
|
109
111
|
protected abstract visitCheckConstraint(node: CheckConstraintNode): void;
|
|
110
112
|
protected abstract visitWith(node: WithNode): void;
|
|
111
113
|
protected abstract visitCommonTableExpression(node: CommonTableExpressionNode): void;
|
|
114
|
+
protected abstract visitCommonTableExpressionName(node: CommonTableExpressionNameNode): void;
|
|
112
115
|
protected abstract visitHaving(node: HavingNode): void;
|
|
113
116
|
protected abstract visitCreateSchema(node: CreateSchemaNode): void;
|
|
114
117
|
protected abstract visitDropSchema(node: DropSchemaNode): void;
|
|
@@ -132,4 +135,5 @@ export declare abstract class OperationNodeVisitor {
|
|
|
132
135
|
protected abstract visitGeneratedAlwaysAs(node: GeneratedAlwaysAsNode): void;
|
|
133
136
|
protected abstract visitDefaultValue(node: DefaultValueNode): void;
|
|
134
137
|
protected abstract visitOn(node: OnNode): void;
|
|
138
|
+
protected abstract visitValues(node: ValuesNode): void;
|
|
135
139
|
}
|
|
@@ -55,6 +55,7 @@ class OperationNodeVisitor {
|
|
|
55
55
|
CheckConstraintNode: this.visitCheckConstraint.bind(this),
|
|
56
56
|
WithNode: this.visitWith.bind(this),
|
|
57
57
|
CommonTableExpressionNode: this.visitCommonTableExpression.bind(this),
|
|
58
|
+
CommonTableExpressionNameNode: this.visitCommonTableExpressionName.bind(this),
|
|
58
59
|
HavingNode: this.visitHaving.bind(this),
|
|
59
60
|
CreateSchemaNode: this.visitCreateSchema.bind(this),
|
|
60
61
|
DropSchemaNode: this.visitDropSchema.bind(this),
|
|
@@ -72,6 +73,7 @@ class OperationNodeVisitor {
|
|
|
72
73
|
GeneratedAlwaysAsNode: this.visitGeneratedAlwaysAs.bind(this),
|
|
73
74
|
DefaultValueNode: this.visitDefaultValue.bind(this),
|
|
74
75
|
OnNode: this.visitOn.bind(this),
|
|
76
|
+
ValuesNode: this.visitValues.bind(this),
|
|
75
77
|
});
|
|
76
78
|
visitNode = (node) => {
|
|
77
79
|
this.nodeStack.push(node);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedAlwaysAsNode' | 'DefaultValueNode' | 'OnNode';
|
|
1
|
+
export declare type OperationNodeKind = 'IdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | 'FilterNode' | 'AndNode' | 'OrNode' | 'ParensNode' | 'ValueNode' | 'ValueListNode' | 'PrimitiveValueListNode' | 'JoinNode' | 'OperatorNode' | 'WhereNode' | 'InsertQueryNode' | 'DeleteQueryNode' | 'ReturningNode' | 'CreateTableNode' | 'ColumnDefinitionNode' | 'AddColumnNode' | 'DropTableNode' | 'DataTypeNode' | 'OrderByNode' | 'OrderByItemNode' | 'GroupByNode' | 'GroupByItemNode' | 'UpdateQueryNode' | 'ColumnUpdateNode' | 'LimitNode' | 'OffsetNode' | 'OnConflictNode' | 'OnDuplicateKeyNode' | 'CreateIndexNode' | 'DropIndexNode' | 'ListNode' | 'ReferencesNode' | 'PrimaryKeyConstraintNode' | 'UniqueConstraintNode' | 'CheckConstraintNode' | 'ForeignKeyConstraintNode' | 'WithNode' | 'CommonTableExpressionNode' | 'HavingNode' | 'CreateSchemaNode' | 'DropSchemaNode' | 'AlterTableNode' | 'ModifyColumnNode' | 'DropColumnNode' | 'RenameColumnNode' | 'AlterColumnNode' | 'AddConstraintNode' | 'DropConstraintNode' | 'UnionNode' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedAlwaysAsNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode';
|
|
2
2
|
export interface OperationNode {
|
|
3
3
|
readonly kind: OperationNodeKind;
|
|
4
4
|
}
|
|
@@ -14,8 +14,6 @@ export declare type FilterableQueryNode = SelectQueryNode | DeleteQueryNode | Up
|
|
|
14
14
|
*/
|
|
15
15
|
export declare const QueryNode: Readonly<{
|
|
16
16
|
is(node: OperationNode): node is QueryNode;
|
|
17
|
-
isMutating(node: OperationNode): node is MutatingQueryNode;
|
|
18
|
-
isFilterable(node: OperationNode): node is FilterableQueryNode;
|
|
19
17
|
cloneWithWhere<T extends FilterableQueryNode>(node: T, filter: FilterExpressionNode): T;
|
|
20
18
|
cloneWithOrWhere<T_1 extends FilterableQueryNode>(node: T_1, filter: FilterExpressionNode): T_1;
|
|
21
19
|
cloneWithJoin<T_2 extends FilterableQueryNode>(node: T_2, join: JoinNode): T_2;
|
|
@@ -18,16 +18,6 @@ exports.QueryNode = (0, object_utils_js_1.freeze)({
|
|
|
18
18
|
update_query_node_js_1.UpdateQueryNode.is(node) ||
|
|
19
19
|
select_query_node_js_1.SelectQueryNode.is(node));
|
|
20
20
|
},
|
|
21
|
-
isMutating(node) {
|
|
22
|
-
return (delete_query_node_js_1.DeleteQueryNode.is(node) ||
|
|
23
|
-
insert_query_node_js_1.InsertQueryNode.is(node) ||
|
|
24
|
-
update_query_node_js_1.UpdateQueryNode.is(node));
|
|
25
|
-
},
|
|
26
|
-
isFilterable(node) {
|
|
27
|
-
return (select_query_node_js_1.SelectQueryNode.is(node) ||
|
|
28
|
-
delete_query_node_js_1.DeleteQueryNode.is(node) ||
|
|
29
|
-
update_query_node_js_1.UpdateQueryNode.is(node));
|
|
30
|
-
},
|
|
31
21
|
cloneWithWhere(node, filter) {
|
|
32
22
|
return (0, object_utils_js_1.freeze)({
|
|
33
23
|
...node,
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { OperationNode } from './operation-node.js';
|
|
2
|
+
import { PrimitiveValueListNode } from './primitive-value-list-node.js';
|
|
3
|
+
import { ValueListNode } from './value-list-node.js';
|
|
4
|
+
export declare type ValuesItemNode = ValueListNode | PrimitiveValueListNode;
|
|
5
|
+
export interface ValuesNode extends OperationNode {
|
|
6
|
+
readonly kind: 'ValuesNode';
|
|
7
|
+
readonly values: ReadonlyArray<ValuesItemNode>;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* @internal
|
|
11
|
+
*/
|
|
12
|
+
export declare const ValuesNode: Readonly<{
|
|
13
|
+
is(node: OperationNode): node is ValuesNode;
|
|
14
|
+
create(values: ReadonlyArray<ValuesItemNode>): ValuesNode;
|
|
15
|
+
}>;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ValuesNode = void 0;
|
|
4
|
+
const object_utils_js_1 = require("../util/object-utils.js");
|
|
5
|
+
/**
|
|
6
|
+
* @internal
|
|
7
|
+
*/
|
|
8
|
+
exports.ValuesNode = (0, object_utils_js_1.freeze)({
|
|
9
|
+
is(node) {
|
|
10
|
+
return node.kind === 'ValuesNode';
|
|
11
|
+
},
|
|
12
|
+
create(values) {
|
|
13
|
+
return (0, object_utils_js_1.freeze)({
|
|
14
|
+
kind: 'ValuesNode',
|
|
15
|
+
values: (0, object_utils_js_1.freeze)(values),
|
|
16
|
+
});
|
|
17
|
+
},
|
|
18
|
+
});
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { OperationNode } from './operation-node.js';
|
|
2
2
|
import { CommonTableExpressionNode } from './common-table-expression-node.js';
|
|
3
|
+
export declare type WithNodeParams = Omit<WithNode, 'kind' | 'expressions'>;
|
|
3
4
|
export interface WithNode extends OperationNode {
|
|
4
5
|
readonly kind: 'WithNode';
|
|
5
6
|
readonly expressions: ReadonlyArray<CommonTableExpressionNode>;
|
|
7
|
+
readonly recursive?: boolean;
|
|
6
8
|
}
|
|
7
9
|
/**
|
|
8
10
|
* @internal
|
|
9
11
|
*/
|
|
10
12
|
export declare const WithNode: Readonly<{
|
|
11
13
|
is(node: OperationNode): node is WithNode;
|
|
12
|
-
create(expression: CommonTableExpressionNode): WithNode;
|
|
14
|
+
create(expression: CommonTableExpressionNode, params?: WithNodeParams | undefined): WithNode;
|
|
13
15
|
cloneWithExpression(withNode: WithNode, expression: CommonTableExpressionNode): WithNode;
|
|
14
16
|
}>;
|
|
@@ -9,10 +9,11 @@ exports.WithNode = (0, object_utils_js_1.freeze)({
|
|
|
9
9
|
is(node) {
|
|
10
10
|
return node.kind === 'WithNode';
|
|
11
11
|
},
|
|
12
|
-
create(expression) {
|
|
12
|
+
create(expression, params) {
|
|
13
13
|
return (0, object_utils_js_1.freeze)({
|
|
14
14
|
kind: 'WithNode',
|
|
15
15
|
expressions: (0, object_utils_js_1.freeze)([expression]),
|
|
16
|
+
...params,
|
|
16
17
|
});
|
|
17
18
|
},
|
|
18
19
|
cloneWithExpression(withNode, expression) {
|
package/dist/cjs/package.json
CHANGED
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { AliasNode } from '../operation-node/alias-node.js';
|
|
2
|
+
import { RawNode } from '../operation-node/raw-node.js';
|
|
3
|
+
import { SelectQueryNode } from '../operation-node/select-query-node.js';
|
|
4
|
+
import { AliasedQueryBuilderFactory, AliasedRawBuilderFactory, AnyAliasedQueryBuilder, AnyAliasedRawBuilder, AnySelectQueryBuilder, AnyRawBuilder, SelectQueryBuilderFactory, RawBuilderFactory } from '../util/type-utils.js';
|
|
5
|
+
import { ParseContext } from './parse-context.js';
|
|
6
|
+
export declare type ComplexExpression<DB, TB extends keyof DB> = AnySelectQueryBuilder | SelectQueryBuilderFactory<DB, TB> | AnyRawBuilder | RawBuilderFactory<DB, TB>;
|
|
7
|
+
export declare type AliasedComplexExpression<DB, TB extends keyof DB> = AnyAliasedQueryBuilder | AliasedQueryBuilderFactory<DB, TB> | AnyAliasedRawBuilder | AliasedRawBuilderFactory<DB, TB>;
|
|
8
|
+
export declare function parseComplexExpression(ctx: ParseContext, exp: ComplexExpression<any, any>): SelectQueryNode | RawNode;
|
|
9
|
+
export declare function parseAliasedComplexExpression(ctx: ParseContext, exp: AliasedComplexExpression<any, any>): AliasNode;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseAliasedComplexExpression = exports.parseComplexExpression = void 0;
|
|
4
|
+
const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
|
|
5
|
+
const object_utils_js_1 = require("../util/object-utils.js");
|
|
6
|
+
function parseComplexExpression(ctx, exp) {
|
|
7
|
+
if ((0, operation_node_source_js_1.isOperationNodeSource)(exp)) {
|
|
8
|
+
return exp.toOperationNode();
|
|
9
|
+
}
|
|
10
|
+
else if ((0, object_utils_js_1.isFunction)(exp)) {
|
|
11
|
+
return exp(ctx.createExpressionBuilder()).toOperationNode();
|
|
12
|
+
}
|
|
13
|
+
throw new Error(`invalid expression: ${JSON.stringify(exp)}`);
|
|
14
|
+
}
|
|
15
|
+
exports.parseComplexExpression = parseComplexExpression;
|
|
16
|
+
function parseAliasedComplexExpression(ctx, exp) {
|
|
17
|
+
if ((0, operation_node_source_js_1.isOperationNodeSource)(exp)) {
|
|
18
|
+
return exp.toOperationNode();
|
|
19
|
+
}
|
|
20
|
+
else if ((0, object_utils_js_1.isFunction)(exp)) {
|
|
21
|
+
return exp(ctx.createExpressionBuilder()).toOperationNode();
|
|
22
|
+
}
|
|
23
|
+
throw new Error(`invalid aliased expression: ${JSON.stringify(exp)}`);
|
|
24
|
+
}
|
|
25
|
+
exports.parseAliasedComplexExpression = parseAliasedComplexExpression;
|
|
@@ -1,15 +1,24 @@
|
|
|
1
1
|
import { FilterNode } from '../operation-node/filter-node.js';
|
|
2
|
-
import {
|
|
2
|
+
import { AnyRawBuilder } from '../util/type-utils.js';
|
|
3
3
|
import { Operator } from '../operation-node/operator-node.js';
|
|
4
|
-
import { ReferenceExpression } from './reference-parser.js';
|
|
4
|
+
import { ExtractTypeFromReferenceExpression, ReferenceExpression } from './reference-parser.js';
|
|
5
|
+
import { ValueExpression, ValueExpressionOrList } from './value-parser.js';
|
|
5
6
|
import { FilterExpressionNode } from '../operation-node/operation-node-utils.js';
|
|
6
7
|
import { ParseContext } from './parse-context.js';
|
|
7
|
-
|
|
8
|
+
import { WhereInterface } from '../query-builder/where-interface.js';
|
|
9
|
+
import { HavingInterface } from '../query-builder/having-interface.js';
|
|
10
|
+
export declare type FilterValueExpression<DB, TB extends keyof DB, RE> = ValueExpression<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
|
|
11
|
+
export declare type FilterValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
|
|
12
|
+
export declare type ExistsExpression<DB, TB extends keyof DB> = ValueExpression<DB, TB, never>;
|
|
13
|
+
export declare type WhereGrouper<DB, TB extends keyof DB> = (qb: WhereInterface<DB, TB>) => WhereInterface<DB, TB>;
|
|
14
|
+
export declare type HavingGrouper<DB, TB extends keyof DB> = (qb: HavingInterface<DB, TB>) => HavingInterface<DB, TB>;
|
|
8
15
|
export declare type FilterOperator = Operator | AnyRawBuilder;
|
|
16
|
+
declare type FilterType = 'where' | 'having' | 'on';
|
|
9
17
|
export declare function parseWhereFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
|
|
10
18
|
export declare function parseHavingFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
|
|
11
19
|
export declare function parseOnFilter(ctx: ParseContext, args: any[]): FilterExpressionNode;
|
|
12
20
|
export declare function parseReferenceFilter(ctx: ParseContext, lhs: ReferenceExpression<any, any>, op: FilterOperator, rhs: ReferenceExpression<any, any>): FilterNode;
|
|
13
21
|
export declare function parseExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
|
|
14
22
|
export declare function parseNotExistFilter(ctx: ParseContext, arg: ExistsExpression<any, any>): FilterNode;
|
|
15
|
-
export declare function parseFilter(ctx: ParseContext, type:
|
|
23
|
+
export declare function parseFilter(ctx: ParseContext, type: FilterType, args: any[]): FilterExpressionNode;
|
|
24
|
+
export {};
|
|
@@ -9,7 +9,6 @@ const operator_node_js_1 = require("../operation-node/operator-node.js");
|
|
|
9
9
|
const parens_node_js_1 = require("../operation-node/parens-node.js");
|
|
10
10
|
const reference_parser_js_1 = require("./reference-parser.js");
|
|
11
11
|
const value_parser_js_1 = require("./value-parser.js");
|
|
12
|
-
const select_query_node_js_1 = require("../operation-node/select-query-node.js");
|
|
13
12
|
const value_node_js_1 = require("../operation-node/value-node.js");
|
|
14
13
|
function parseWhereFilter(ctx, args) {
|
|
15
14
|
return parseFilter(ctx, 'where', args);
|
|
@@ -40,18 +39,9 @@ function parseFilter(ctx, type, args) {
|
|
|
40
39
|
return parseThreeArgFilter(ctx, args[0], args[1], args[2]);
|
|
41
40
|
}
|
|
42
41
|
else if (args.length === 1) {
|
|
43
|
-
|
|
44
|
-
if ((0, object_utils_js_1.isFunction)(arg)) {
|
|
45
|
-
return GROUP_PARSERS[type](ctx, arg);
|
|
46
|
-
}
|
|
47
|
-
else if ((0, operation_node_source_js_1.isOperationNodeSource)(arg)) {
|
|
48
|
-
const node = arg.toOperationNode();
|
|
49
|
-
if (raw_node_js_1.RawNode.is(node)) {
|
|
50
|
-
return node;
|
|
51
|
-
}
|
|
52
|
-
}
|
|
42
|
+
return parseOneArgFilter(ctx, type, args[0]);
|
|
53
43
|
}
|
|
54
|
-
throw
|
|
44
|
+
throw createFilterError(type, args);
|
|
55
45
|
}
|
|
56
46
|
exports.parseFilter = parseFilter;
|
|
57
47
|
function parseThreeArgFilter(ctx, left, op, right) {
|
|
@@ -64,10 +54,8 @@ function parseIsFilter(ctx, left, op, right) {
|
|
|
64
54
|
return filter_node_js_1.FilterNode.create((0, reference_parser_js_1.parseReferenceExpression)(ctx, left), parseFilterOperator(op), value_node_js_1.ValueNode.createImmediate(right));
|
|
65
55
|
}
|
|
66
56
|
function parseFilterOperator(op) {
|
|
67
|
-
if ((0, object_utils_js_1.isString)(op)) {
|
|
68
|
-
|
|
69
|
-
return operator_node_js_1.OperatorNode.create(op);
|
|
70
|
-
}
|
|
57
|
+
if ((0, object_utils_js_1.isString)(op) && operator_node_js_1.OPERATORS.includes(op)) {
|
|
58
|
+
return operator_node_js_1.OperatorNode.create(op);
|
|
71
59
|
}
|
|
72
60
|
else if ((0, operation_node_source_js_1.isOperationNodeSource)(op)) {
|
|
73
61
|
return op.toOperationNode();
|
|
@@ -75,17 +63,26 @@ function parseFilterOperator(op) {
|
|
|
75
63
|
throw new Error(`invalid comparison operator ${JSON.stringify(op)} passed to a filter method`);
|
|
76
64
|
}
|
|
77
65
|
function parseExistExpression(ctx, type, arg) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
if (
|
|
82
|
-
|
|
66
|
+
return filter_node_js_1.FilterNode.create(undefined, operator_node_js_1.OperatorNode.create(type), (0, value_parser_js_1.parseValueExpressionOrList)(ctx, arg));
|
|
67
|
+
}
|
|
68
|
+
function parseOneArgFilter(ctx, type, arg) {
|
|
69
|
+
if ((0, object_utils_js_1.isFunction)(arg)) {
|
|
70
|
+
return GROUP_PARSERS[type](ctx, arg);
|
|
83
71
|
}
|
|
84
|
-
|
|
72
|
+
else if ((0, operation_node_source_js_1.isOperationNodeSource)(arg)) {
|
|
73
|
+
const node = arg.toOperationNode();
|
|
74
|
+
if (raw_node_js_1.RawNode.is(node)) {
|
|
75
|
+
return node;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
throw createFilterError(type, arg);
|
|
79
|
+
}
|
|
80
|
+
function createFilterError(type, args) {
|
|
81
|
+
return new Error(`invalid arguments passed to a '${type}' method: ${JSON.stringify(args)}`);
|
|
85
82
|
}
|
|
86
83
|
const GROUP_PARSERS = (0, object_utils_js_1.freeze)({
|
|
87
84
|
where(ctx, callback) {
|
|
88
|
-
const query = callback(ctx.createSelectQueryBuilder(
|
|
85
|
+
const query = callback(ctx.createSelectQueryBuilder());
|
|
89
86
|
const queryNode = query.toOperationNode();
|
|
90
87
|
if (!queryNode.where) {
|
|
91
88
|
throw new Error('no `where` methods called insided a group callback');
|
|
@@ -93,7 +90,7 @@ const GROUP_PARSERS = (0, object_utils_js_1.freeze)({
|
|
|
93
90
|
return parens_node_js_1.ParensNode.create(queryNode.where.where);
|
|
94
91
|
},
|
|
95
92
|
having(ctx, callback) {
|
|
96
|
-
const query = callback(ctx.createSelectQueryBuilder(
|
|
93
|
+
const query = callback(ctx.createSelectQueryBuilder());
|
|
97
94
|
const queryNode = query.toOperationNode();
|
|
98
95
|
if (!queryNode.having) {
|
|
99
96
|
throw new Error('no `having` methods called insided a group callback');
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
import { ColumnNode } from '../operation-node/column-node.js';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { AnyQueryBuilder, AnyRawBuilder, GeneratedPlaceholder } from '../util/type-utils.js';
|
|
7
|
-
import { PrimitiveValue } from '../util/object-utils.js';
|
|
2
|
+
import { GeneratedPlaceholder } from '../util/type-utils.js';
|
|
3
|
+
import { ParseContext } from './parse-context.js';
|
|
4
|
+
import { ValueExpression } from './value-parser.js';
|
|
5
|
+
import { ValuesNode } from '../operation-node/values-node.js';
|
|
8
6
|
export declare type InsertObject<DB, TB extends keyof DB> = {
|
|
9
|
-
[C in keyof DB[TB]]: InsertValueExpression<DB[TB][C]>;
|
|
7
|
+
[C in keyof DB[TB]]: InsertValueExpression<DB, TB, DB[TB][C]>;
|
|
10
8
|
};
|
|
11
9
|
export declare type InsertObjectOrList<DB, TB extends keyof DB> = InsertObject<DB, TB> | ReadonlyArray<InsertObject<DB, TB>>;
|
|
12
|
-
declare type InsertValueExpression<T> =
|
|
13
|
-
export declare function parseInsertObjectOrList(args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>,
|
|
14
|
-
export declare function parseInsertValueExpression(value: InsertValueExpression<PrimitiveValue>): ValueNode | RawNode | SelectQueryNode;
|
|
10
|
+
declare type InsertValueExpression<DB, TB extends keyof DB, T> = ValueExpression<DB, TB, T> | GeneratedPlaceholder;
|
|
11
|
+
export declare function parseInsertObjectOrList(ctx: ParseContext, args: InsertObjectOrList<any, any>): [ReadonlyArray<ColumnNode>, ValuesNode];
|
|
15
12
|
export {};
|
|
@@ -1,56 +1,48 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.parseInsertObjectOrList = void 0;
|
|
4
4
|
const column_node_js_1 = require("../operation-node/column-node.js");
|
|
5
|
-
const operation_node_source_js_1 = require("../operation-node/operation-node-source.js");
|
|
6
5
|
const primitive_value_list_node_js_1 = require("../operation-node/primitive-value-list-node.js");
|
|
7
|
-
const query_node_js_1 = require("../operation-node/query-node.js");
|
|
8
6
|
const value_list_node_js_1 = require("../operation-node/value-list-node.js");
|
|
9
|
-
const value_node_js_1 = require("../operation-node/value-node.js");
|
|
10
7
|
const generated_placeholder_js_1 = require("../util/generated-placeholder.js");
|
|
11
8
|
const object_utils_js_1 = require("../util/object-utils.js");
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
const value_parser_js_1 = require("./value-parser.js");
|
|
10
|
+
const values_node_js_1 = require("../operation-node/values-node.js");
|
|
11
|
+
function parseInsertObjectOrList(ctx, args) {
|
|
12
|
+
return parseInsertColumnsAndValues(ctx, Array.isArray(args) ? args : [args]);
|
|
14
13
|
}
|
|
15
14
|
exports.parseInsertObjectOrList = parseInsertObjectOrList;
|
|
16
|
-
function parseInsertColumnsAndValues(rows) {
|
|
17
|
-
const columns =
|
|
18
|
-
|
|
15
|
+
function parseInsertColumnsAndValues(ctx, rows) {
|
|
16
|
+
const columns = parseColumnNamesAndIndexes(rows);
|
|
17
|
+
return [
|
|
18
|
+
(0, object_utils_js_1.freeze)([...columns.keys()].map(column_node_js_1.ColumnNode.create)),
|
|
19
|
+
values_node_js_1.ValuesNode.create(rows.map((row) => parseRowValues(ctx, row, columns))),
|
|
20
|
+
];
|
|
21
|
+
}
|
|
22
|
+
function parseColumnNamesAndIndexes(rows) {
|
|
23
|
+
const columns = new Map();
|
|
19
24
|
for (const row of rows) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
if (!columns.
|
|
23
|
-
columns.
|
|
25
|
+
const cols = Object.keys(row);
|
|
26
|
+
for (const col of cols) {
|
|
27
|
+
if (!columns.has(col) && !(0, generated_placeholder_js_1.isGeneratedPlaceholder)(row[col])) {
|
|
28
|
+
columns.set(col, columns.size);
|
|
24
29
|
}
|
|
25
30
|
}
|
|
26
31
|
}
|
|
27
|
-
|
|
28
|
-
const rowValues = columns.map(() => null);
|
|
29
|
-
for (const column of Object.keys(row)) {
|
|
30
|
-
const columnIdx = columns.indexOf(column);
|
|
31
|
-
if (columnIdx !== -1) {
|
|
32
|
-
rowValues[columnIdx] = row[column];
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
if (rowValues.every(object_utils_js_1.isPrimitive)) {
|
|
36
|
-
values.push(primitive_value_list_node_js_1.PrimitiveValueListNode.create(rowValues));
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
39
|
-
values.push(value_list_node_js_1.ValueListNode.create(rowValues.map(parseInsertValueExpression)));
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
return [columns.map(column_node_js_1.ColumnNode.create), values];
|
|
32
|
+
return columns;
|
|
43
33
|
}
|
|
44
|
-
function
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
const
|
|
50
|
-
if (!
|
|
51
|
-
|
|
34
|
+
function parseRowValues(ctx, row, columns) {
|
|
35
|
+
const rowColumns = Object.keys(row);
|
|
36
|
+
const rowValues = new Array(columns.size).fill(null);
|
|
37
|
+
for (const col of rowColumns) {
|
|
38
|
+
const columnIdx = columns.get(col);
|
|
39
|
+
const value = row[col];
|
|
40
|
+
if (columnIdx !== undefined && !(0, generated_placeholder_js_1.isGeneratedPlaceholder)(value)) {
|
|
41
|
+
rowValues[columnIdx] = value;
|
|
52
42
|
}
|
|
53
43
|
}
|
|
54
|
-
|
|
44
|
+
if (rowValues.every(object_utils_js_1.isPrimitive)) {
|
|
45
|
+
return primitive_value_list_node_js_1.PrimitiveValueListNode.create(rowValues);
|
|
46
|
+
}
|
|
47
|
+
return value_list_node_js_1.ValueListNode.create(rowValues.map((it) => (0, value_parser_js_1.parseValueExpression)(ctx, it)));
|
|
55
48
|
}
|
|
56
|
-
exports.parseInsertValueExpression = parseInsertValueExpression;
|
|
@@ -3,6 +3,6 @@ import { AnyRawBuilder } from '../util/type-utils.js';
|
|
|
3
3
|
import { ParseContext } from './parse-context.js';
|
|
4
4
|
import { ReferenceExpression } from './reference-parser.js';
|
|
5
5
|
export declare type OrderByDirection = 'asc' | 'desc';
|
|
6
|
-
export declare type OrderByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | keyof O;
|
|
6
|
+
export declare type OrderByExpression<DB, TB extends keyof DB, O> = ReferenceExpression<DB, TB> | (keyof O & string);
|
|
7
7
|
export declare type OrderByDirectionExpression = OrderByDirection | AnyRawBuilder;
|
|
8
8
|
export declare function parseOrderBy(ctx: ParseContext, orderBy: OrderByExpression<any, any, any>, direction?: OrderByDirectionExpression): OrderByItemNode;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DialectAdapter } from '../dialect/dialect-adapter.js';
|
|
2
2
|
import { JoinType } from '../operation-node/join-node.js';
|
|
3
3
|
import { JoinBuilder } from '../query-builder/join-builder.js';
|
|
4
|
-
import {
|
|
4
|
+
import { SelectQueryBuilder } from '../query-builder/select-query-builder.js';
|
|
5
5
|
import { ExpressionBuilder } from '../query-builder/expression-builder.js';
|
|
6
6
|
import { QueryCreator } from '../query-creator.js';
|
|
7
7
|
import { TableExpression } from './table-parser.js';
|
|
@@ -14,11 +14,7 @@ export interface ParseContext {
|
|
|
14
14
|
/**
|
|
15
15
|
* Creates a select query builder with a {@link NoopQueryExecutor}.
|
|
16
16
|
*/
|
|
17
|
-
createSelectQueryBuilder(
|
|
18
|
-
/**
|
|
19
|
-
* Creates an instance of a join builder.
|
|
20
|
-
*/
|
|
21
|
-
createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
|
|
17
|
+
createSelectQueryBuilder(): SelectQueryBuilder<any, any, any>;
|
|
22
18
|
/**
|
|
23
19
|
* Creates an expression builder for building stuff like subqueries.
|
|
24
20
|
* {@link NoopQueryExecutor} is used as the executor and the queries
|
|
@@ -29,13 +25,31 @@ export interface ParseContext {
|
|
|
29
25
|
* Creates a query creator with a {@link NoopQueryExecutor}.
|
|
30
26
|
*/
|
|
31
27
|
createQueryCreator(): QueryCreator<any>;
|
|
28
|
+
/**
|
|
29
|
+
* Creates an instance of a join builder.
|
|
30
|
+
*/
|
|
31
|
+
createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
|
|
32
32
|
}
|
|
33
33
|
export declare class DefaultParseContext implements ParseContext {
|
|
34
34
|
#private;
|
|
35
35
|
constructor(adapter: DialectAdapter);
|
|
36
36
|
get adapter(): DialectAdapter;
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
/**
|
|
38
|
+
* Creates a select query builder with a {@link NoopQueryExecutor}.
|
|
39
|
+
*/
|
|
40
|
+
createSelectQueryBuilder(): SelectQueryBuilder<any, any, any>;
|
|
41
|
+
/**
|
|
42
|
+
* Creates an expression builder for building stuff like subqueries.
|
|
43
|
+
* {@link NoopQueryExecutor} is used as the executor and the queries
|
|
44
|
+
* built using the returned builder can never be executed.
|
|
45
|
+
*/
|
|
39
46
|
createExpressionBuilder(): ExpressionBuilder<any, any>;
|
|
47
|
+
/**
|
|
48
|
+
* Creates a query creator with a {@link NoopQueryExecutor}.
|
|
49
|
+
*/
|
|
40
50
|
createQueryCreator(): QueryCreator<any>;
|
|
51
|
+
/**
|
|
52
|
+
* Creates an instance of a join builder.
|
|
53
|
+
*/
|
|
54
|
+
createJoinBuilder(joinType: JoinType, table: TableExpression<any, any>): JoinBuilder<any, any>;
|
|
41
55
|
}
|