kysely 0.26.3 → 0.27.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/dist/cjs/dialect/dialect-adapter-base.d.ts +8 -0
- package/dist/cjs/dialect/dialect-adapter-base.js +3 -0
- package/dist/cjs/dialect/dialect-adapter.d.ts +8 -0
- package/dist/cjs/dialect/mssql/mssql-adapter.d.ts +78 -0
- package/dist/cjs/dialect/mssql/mssql-adapter.js +30 -0
- package/dist/cjs/dialect/mssql/mssql-dialect-config.d.ts +143 -0
- package/dist/cjs/dialect/mssql/mssql-dialect-config.js +2 -0
- package/dist/cjs/dialect/mssql/mssql-dialect.d.ts +70 -0
- package/dist/cjs/dialect/mssql/mssql-dialect.js +65 -0
- package/dist/cjs/dialect/mssql/mssql-driver.d.ts +54 -0
- package/dist/cjs/dialect/mssql/mssql-driver.js +268 -0
- package/dist/cjs/dialect/mssql/mssql-introspector.d.ts +20 -0
- package/dist/cjs/dialect/mssql/mssql-introspector.js +97 -0
- package/dist/cjs/dialect/mssql/mssql-query-compiler.d.ts +11 -0
- package/dist/cjs/dialect/mssql/mssql-query-compiler.js +64 -0
- package/dist/cjs/dialect/mysql/mysql-query-compiler.d.ts +2 -0
- package/dist/cjs/dialect/mysql/mysql-query-compiler.js +28 -0
- package/dist/cjs/dialect/postgres/postgres-driver.js +1 -1
- package/dist/cjs/dialect/sqlite/sqlite-adapter.d.ts +1 -1
- package/dist/cjs/dialect/sqlite/sqlite-adapter.js +2 -1
- package/dist/cjs/dialect/sqlite/sqlite-dialect-config.d.ts +1 -0
- package/dist/cjs/dialect/sqlite/sqlite-driver.js +15 -2
- package/dist/cjs/driver/driver.d.ts +1 -1
- package/dist/cjs/driver/driver.js +1 -0
- package/dist/cjs/driver/runtime-driver.js +5 -1
- package/dist/cjs/driver/single-connection-provider.js +7 -8
- package/dist/cjs/expression/expression-builder.d.ts +66 -75
- package/dist/cjs/expression/expression-builder.js +8 -17
- package/dist/cjs/expression/expression-wrapper.d.ts +8 -8
- package/dist/cjs/helpers/mssql.d.ts +152 -0
- package/dist/cjs/helpers/mssql.js +160 -0
- package/dist/cjs/index.d.ts +7 -1
- package/dist/cjs/index.js +6 -0
- package/dist/cjs/migration/migrator.js +12 -16
- package/dist/cjs/operation-node/add-index-node.d.ts +21 -0
- package/dist/cjs/operation-node/add-index-node.js +31 -0
- package/dist/cjs/operation-node/alter-table-node.d.ts +5 -1
- package/dist/cjs/operation-node/column-definition-node.d.ts +1 -0
- package/dist/cjs/operation-node/column-update-node.d.ts +2 -3
- package/dist/cjs/operation-node/create-index-node.d.ts +1 -0
- package/dist/cjs/operation-node/create-table-node.d.ts +1 -0
- package/dist/cjs/operation-node/operation-node-transformer.d.ts +2 -0
- package/dist/cjs/operation-node/operation-node-transformer.js +17 -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 +3 -3
- package/dist/cjs/operation-node/operator-node.js +2 -0
- package/dist/cjs/operation-node/unique-constraint-node.d.ts +4 -1
- package/dist/cjs/operation-node/unique-constraint-node.js +8 -1
- package/dist/cjs/parser/binary-operation-parser.js +1 -1
- package/dist/cjs/parser/coalesce-parser.d.ts +12 -2
- package/dist/cjs/parser/reference-parser.d.ts +2 -1
- package/dist/cjs/parser/update-set-parser.d.ts +5 -2
- package/dist/cjs/parser/update-set-parser.js +13 -3
- package/dist/cjs/query-builder/aggregate-function-builder.d.ts +4 -4
- package/dist/cjs/query-builder/case-builder.d.ts +5 -4
- package/dist/cjs/query-builder/delete-query-builder.d.ts +3 -3
- package/dist/cjs/query-builder/function-module.d.ts +96 -25
- package/dist/cjs/query-builder/function-module.js +17 -3
- package/dist/cjs/query-builder/having-interface.d.ts +3 -5
- package/dist/cjs/query-builder/insert-query-builder.d.ts +27 -9
- package/dist/cjs/query-builder/insert-query-builder.js +3 -3
- package/dist/cjs/query-builder/insert-result.d.ts +8 -1
- package/dist/cjs/query-builder/insert-result.js +8 -1
- package/dist/cjs/query-builder/json-path-builder.d.ts +3 -2
- package/dist/cjs/query-builder/json-path-builder.js +6 -3
- package/dist/cjs/query-builder/on-conflict-builder.d.ts +58 -16
- package/dist/cjs/query-builder/on-conflict-builder.js +1 -6
- package/dist/cjs/query-builder/over-builder.d.ts +2 -2
- package/dist/cjs/query-builder/select-query-builder.d.ts +38 -22
- package/dist/cjs/query-builder/update-query-builder.d.ts +20 -4
- package/dist/cjs/query-builder/update-query-builder.js +2 -2
- package/dist/cjs/query-builder/where-interface.d.ts +3 -3
- package/dist/cjs/query-compiler/default-query-compiler.d.ts +9 -1
- package/dist/cjs/query-compiler/default-query-compiler.js +65 -12
- package/dist/cjs/schema/alter-table-add-index-builder.d.ts +104 -0
- package/dist/cjs/schema/alter-table-add-index-builder.js +146 -0
- package/dist/cjs/schema/alter-table-builder.d.ts +41 -1
- package/dist/cjs/schema/alter-table-builder.js +59 -2
- package/dist/cjs/schema/column-definition-builder.d.ts +25 -0
- package/dist/cjs/schema/column-definition-builder.js +27 -0
- package/dist/cjs/schema/create-index-builder.d.ts +23 -0
- package/dist/cjs/schema/create-index-builder.js +30 -0
- package/dist/cjs/schema/create-table-builder.d.ts +28 -2
- package/dist/cjs/schema/create-table-builder.js +38 -3
- package/dist/cjs/schema/unique-constraint-builder.d.ts +14 -0
- package/dist/cjs/schema/unique-constraint-builder.js +24 -0
- package/dist/cjs/util/log.js +5 -1
- package/dist/cjs/util/object-utils.d.ts +1 -1
- package/dist/cjs/util/type-utils.d.ts +27 -19
- package/dist/esm/dialect/dialect-adapter-base.d.ts +8 -0
- package/dist/esm/dialect/dialect-adapter-base.js +3 -0
- package/dist/esm/dialect/dialect-adapter.d.ts +8 -0
- package/dist/esm/dialect/mssql/mssql-adapter.d.ts +78 -0
- package/dist/esm/dialect/mssql/mssql-adapter.js +27 -0
- package/dist/esm/dialect/mssql/mssql-dialect-config.d.ts +143 -0
- package/dist/esm/dialect/mssql/mssql-dialect-config.js +2 -0
- package/dist/esm/dialect/mssql/mssql-dialect.d.ts +70 -0
- package/dist/esm/dialect/mssql/mssql-dialect.js +62 -0
- package/dist/esm/dialect/mssql/mssql-driver.d.ts +54 -0
- package/dist/esm/dialect/mssql/mssql-driver.js +265 -0
- package/dist/esm/dialect/mssql/mssql-introspector.d.ts +20 -0
- package/dist/esm/dialect/mssql/mssql-introspector.js +94 -0
- package/dist/esm/dialect/mssql/mssql-query-compiler.d.ts +11 -0
- package/dist/esm/dialect/mssql/mssql-query-compiler.js +61 -0
- package/dist/esm/dialect/mysql/mysql-query-compiler.d.ts +2 -0
- package/dist/esm/dialect/mysql/mysql-query-compiler.js +28 -0
- package/dist/esm/dialect/postgres/postgres-driver.js +1 -1
- package/dist/esm/dialect/sqlite/sqlite-adapter.d.ts +1 -1
- package/dist/esm/dialect/sqlite/sqlite-adapter.js +2 -1
- package/dist/esm/dialect/sqlite/sqlite-dialect-config.d.ts +1 -0
- package/dist/esm/dialect/sqlite/sqlite-driver.js +15 -2
- package/dist/esm/driver/driver.d.ts +1 -1
- package/dist/esm/driver/driver.js +1 -0
- package/dist/esm/driver/runtime-driver.js +5 -1
- package/dist/esm/driver/single-connection-provider.js +7 -8
- package/dist/esm/expression/expression-builder.d.ts +66 -75
- package/dist/esm/expression/expression-builder.js +10 -19
- package/dist/esm/expression/expression-wrapper.d.ts +8 -8
- package/dist/esm/helpers/mssql.d.ts +152 -0
- package/dist/esm/helpers/mssql.js +155 -0
- package/dist/esm/index.d.ts +7 -1
- package/dist/esm/index.js +6 -0
- package/dist/esm/migration/migrator.js +12 -16
- package/dist/esm/operation-node/add-index-node.d.ts +21 -0
- package/dist/esm/operation-node/add-index-node.js +29 -0
- package/dist/esm/operation-node/alter-table-node.d.ts +5 -1
- package/dist/esm/operation-node/column-definition-node.d.ts +1 -0
- package/dist/esm/operation-node/column-update-node.d.ts +2 -3
- package/dist/esm/operation-node/create-index-node.d.ts +1 -0
- package/dist/esm/operation-node/create-table-node.d.ts +1 -0
- package/dist/esm/operation-node/operation-node-transformer.d.ts +2 -0
- package/dist/esm/operation-node/operation-node-transformer.js +17 -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 +3 -3
- package/dist/esm/operation-node/operator-node.js +2 -0
- package/dist/esm/operation-node/unique-constraint-node.d.ts +4 -1
- package/dist/esm/operation-node/unique-constraint-node.js +8 -1
- package/dist/esm/parser/binary-operation-parser.js +1 -1
- package/dist/esm/parser/coalesce-parser.d.ts +12 -2
- package/dist/esm/parser/reference-parser.d.ts +2 -1
- package/dist/esm/parser/update-set-parser.d.ts +5 -2
- package/dist/esm/parser/update-set-parser.js +10 -1
- package/dist/esm/query-builder/aggregate-function-builder.d.ts +4 -4
- package/dist/esm/query-builder/case-builder.d.ts +5 -4
- package/dist/esm/query-builder/delete-query-builder.d.ts +3 -3
- package/dist/esm/query-builder/function-module.d.ts +96 -25
- package/dist/esm/query-builder/function-module.js +17 -3
- package/dist/esm/query-builder/having-interface.d.ts +3 -5
- package/dist/esm/query-builder/insert-query-builder.d.ts +27 -9
- package/dist/esm/query-builder/insert-query-builder.js +4 -4
- package/dist/esm/query-builder/insert-result.d.ts +8 -1
- package/dist/esm/query-builder/insert-result.js +8 -1
- package/dist/esm/query-builder/json-path-builder.d.ts +3 -2
- package/dist/esm/query-builder/json-path-builder.js +6 -3
- package/dist/esm/query-builder/on-conflict-builder.d.ts +58 -16
- package/dist/esm/query-builder/on-conflict-builder.js +2 -7
- package/dist/esm/query-builder/over-builder.d.ts +2 -2
- package/dist/esm/query-builder/select-query-builder.d.ts +38 -22
- package/dist/esm/query-builder/update-query-builder.d.ts +20 -4
- package/dist/esm/query-builder/update-query-builder.js +3 -3
- package/dist/esm/query-builder/where-interface.d.ts +3 -3
- package/dist/esm/query-compiler/default-query-compiler.d.ts +9 -1
- package/dist/esm/query-compiler/default-query-compiler.js +65 -12
- package/dist/esm/schema/alter-table-add-index-builder.d.ts +104 -0
- package/dist/esm/schema/alter-table-add-index-builder.js +143 -0
- package/dist/esm/schema/alter-table-builder.d.ts +41 -1
- package/dist/esm/schema/alter-table-builder.js +59 -2
- package/dist/esm/schema/column-definition-builder.d.ts +25 -0
- package/dist/esm/schema/column-definition-builder.js +27 -0
- package/dist/esm/schema/create-index-builder.d.ts +23 -0
- package/dist/esm/schema/create-index-builder.js +30 -0
- package/dist/esm/schema/create-table-builder.d.ts +28 -2
- package/dist/esm/schema/create-table-builder.js +38 -3
- package/dist/esm/schema/unique-constraint-builder.d.ts +14 -0
- package/dist/esm/schema/unique-constraint-builder.js +21 -0
- package/dist/esm/util/log.js +5 -1
- package/dist/esm/util/object-utils.d.ts +1 -1
- package/dist/esm/util/type-utils.d.ts +27 -19
- package/helpers/mssql.d.ts +1 -0
- package/helpers/mssql.js +1 -0
- package/package.json +17 -6
package/dist/esm/index.js
CHANGED
|
@@ -73,6 +73,12 @@ export * from './dialect/postgres/postgres-dialect.js';
|
|
|
73
73
|
export * from './dialect/sqlite/sqlite-query-compiler.js';
|
|
74
74
|
export * from './dialect/sqlite/sqlite-introspector.js';
|
|
75
75
|
export * from './dialect/sqlite/sqlite-adapter.js';
|
|
76
|
+
export * from './dialect/mssql/mssql-adapter.js';
|
|
77
|
+
export * from './dialect/mssql/mssql-dialect-config.js';
|
|
78
|
+
export * from './dialect/mssql/mssql-dialect.js';
|
|
79
|
+
export * from './dialect/mssql/mssql-driver.js';
|
|
80
|
+
export * from './dialect/mssql/mssql-introspector.js';
|
|
81
|
+
export * from './dialect/mssql/mssql-query-compiler.js';
|
|
76
82
|
export * from './query-compiler/default-query-compiler.js';
|
|
77
83
|
export * from './query-compiler/query-compiler.js';
|
|
78
84
|
export * from './migration/migrator.js';
|
|
@@ -218,10 +218,7 @@ export class Migrator {
|
|
|
218
218
|
}
|
|
219
219
|
if (!(await this.#doesSchemaExists())) {
|
|
220
220
|
try {
|
|
221
|
-
await this.#props.db.schema
|
|
222
|
-
.createSchema(this.#migrationTableSchema)
|
|
223
|
-
.ifNotExists()
|
|
224
|
-
.execute();
|
|
221
|
+
await this.#createIfNotExists(this.#props.db.schema.createSchema(this.#migrationTableSchema));
|
|
225
222
|
}
|
|
226
223
|
catch (error) {
|
|
227
224
|
// At least on PostgreSQL, `if not exists` doesn't guarantee the `create schema`
|
|
@@ -237,20 +234,15 @@ export class Migrator {
|
|
|
237
234
|
if (!(await this.#doesTableExists(this.#migrationTable))) {
|
|
238
235
|
try {
|
|
239
236
|
if (this.#migrationTableSchema) {
|
|
240
|
-
await this.#props.db.schema
|
|
241
|
-
.createSchema(this.#migrationTableSchema)
|
|
242
|
-
.ifNotExists()
|
|
243
|
-
.execute();
|
|
237
|
+
await this.#createIfNotExists(this.#props.db.schema.createSchema(this.#migrationTableSchema));
|
|
244
238
|
}
|
|
245
|
-
await this.#props.db.schema
|
|
239
|
+
await this.#createIfNotExists(this.#props.db.schema
|
|
246
240
|
.withPlugin(this.#schemaPlugin)
|
|
247
241
|
.createTable(this.#migrationTable)
|
|
248
|
-
.ifNotExists()
|
|
249
242
|
.addColumn('name', 'varchar(255)', (col) => col.notNull().primaryKey())
|
|
250
243
|
// The migration run time as ISO string. This is not a real date type as we
|
|
251
244
|
// can't know which data type is supported by all future dialects.
|
|
252
|
-
.addColumn('timestamp', 'varchar(255)', (col) => col.notNull())
|
|
253
|
-
.execute();
|
|
245
|
+
.addColumn('timestamp', 'varchar(255)', (col) => col.notNull()));
|
|
254
246
|
}
|
|
255
247
|
catch (error) {
|
|
256
248
|
// At least on PostgreSQL, `if not exists` doesn't guarantee the `create table`
|
|
@@ -265,13 +257,11 @@ export class Migrator {
|
|
|
265
257
|
async #ensureMigrationLockTableExists() {
|
|
266
258
|
if (!(await this.#doesTableExists(this.#migrationLockTable))) {
|
|
267
259
|
try {
|
|
268
|
-
await this.#props.db.schema
|
|
260
|
+
await this.#createIfNotExists(this.#props.db.schema
|
|
269
261
|
.withPlugin(this.#schemaPlugin)
|
|
270
262
|
.createTable(this.#migrationLockTable)
|
|
271
|
-
.ifNotExists()
|
|
272
263
|
.addColumn('id', 'varchar(255)', (col) => col.notNull().primaryKey())
|
|
273
|
-
.addColumn('is_locked', 'integer', (col) => col.notNull().defaultTo(0))
|
|
274
|
-
.execute();
|
|
264
|
+
.addColumn('is_locked', 'integer', (col) => col.notNull().defaultTo(0)));
|
|
275
265
|
}
|
|
276
266
|
catch (error) {
|
|
277
267
|
// At least on PostgreSQL, `if not exists` doesn't guarantee the `create table`
|
|
@@ -479,6 +469,12 @@ export class Migrator {
|
|
|
479
469
|
}
|
|
480
470
|
return { results };
|
|
481
471
|
}
|
|
472
|
+
async #createIfNotExists(qb) {
|
|
473
|
+
if (this.#props.db.getExecutor().adapter.supportsCreateIfNotExists) {
|
|
474
|
+
qb = qb.ifNotExists();
|
|
475
|
+
}
|
|
476
|
+
await qb.execute();
|
|
477
|
+
}
|
|
482
478
|
}
|
|
483
479
|
class MigrationResultSetError extends Error {
|
|
484
480
|
#resultSet;
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { IdentifierNode } from './identifier-node.js';
|
|
2
|
+
import { OperationNode } from './operation-node.js';
|
|
3
|
+
import { RawNode } from './raw-node.js';
|
|
4
|
+
export type AddIndexNodeProps = Omit<AddIndexNode, 'kind' | 'name'>;
|
|
5
|
+
export interface AddIndexNode extends OperationNode {
|
|
6
|
+
readonly kind: 'AddIndexNode';
|
|
7
|
+
readonly name: IdentifierNode;
|
|
8
|
+
readonly columns?: OperationNode[];
|
|
9
|
+
readonly unique?: boolean;
|
|
10
|
+
readonly using?: RawNode;
|
|
11
|
+
readonly ifNotExists?: boolean;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* @internal
|
|
15
|
+
*/
|
|
16
|
+
export declare const AddIndexNode: Readonly<{
|
|
17
|
+
is(node: OperationNode): node is AddIndexNode;
|
|
18
|
+
create(name: string): AddIndexNode;
|
|
19
|
+
cloneWith(node: AddIndexNode, props: AddIndexNodeProps): AddIndexNode;
|
|
20
|
+
cloneWithColumns(node: AddIndexNode, columns: OperationNode[]): AddIndexNode;
|
|
21
|
+
}>;
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/// <reference types="./add-index-node.d.ts" />
|
|
2
|
+
import { freeze } from '../util/object-utils.js';
|
|
3
|
+
import { IdentifierNode } from './identifier-node.js';
|
|
4
|
+
/**
|
|
5
|
+
* @internal
|
|
6
|
+
*/
|
|
7
|
+
export const AddIndexNode = freeze({
|
|
8
|
+
is(node) {
|
|
9
|
+
return node.kind === 'AddIndexNode';
|
|
10
|
+
},
|
|
11
|
+
create(name) {
|
|
12
|
+
return freeze({
|
|
13
|
+
kind: 'AddIndexNode',
|
|
14
|
+
name: IdentifierNode.create(name)
|
|
15
|
+
});
|
|
16
|
+
},
|
|
17
|
+
cloneWith(node, props) {
|
|
18
|
+
return freeze({
|
|
19
|
+
...node,
|
|
20
|
+
...props,
|
|
21
|
+
});
|
|
22
|
+
},
|
|
23
|
+
cloneWithColumns(node, columns) {
|
|
24
|
+
return freeze({
|
|
25
|
+
...node,
|
|
26
|
+
columns: [...(node.columns || []), ...columns],
|
|
27
|
+
});
|
|
28
|
+
},
|
|
29
|
+
});
|
|
@@ -8,7 +8,9 @@ import { AlterColumnNode } from './alter-column-node.js';
|
|
|
8
8
|
import { AddConstraintNode } from './add-constraint-node.js';
|
|
9
9
|
import { DropConstraintNode } from './drop-constraint-node.js';
|
|
10
10
|
import { ModifyColumnNode } from './modify-column-node.js';
|
|
11
|
-
|
|
11
|
+
import { DropIndexNode } from './drop-index-node.js';
|
|
12
|
+
import { AddIndexNode } from './add-index-node.js';
|
|
13
|
+
export type AlterTableNodeTableProps = Pick<AlterTableNode, 'renameTo' | 'setSchema' | 'addConstraint' | 'dropConstraint' | 'addIndex' | 'dropIndex'>;
|
|
12
14
|
export type AlterTableColumnAlterationNode = RenameColumnNode | AddColumnNode | DropColumnNode | AlterColumnNode | ModifyColumnNode;
|
|
13
15
|
export interface AlterTableNode extends OperationNode {
|
|
14
16
|
readonly kind: 'AlterTableNode';
|
|
@@ -18,6 +20,8 @@ export interface AlterTableNode extends OperationNode {
|
|
|
18
20
|
readonly columnAlterations?: ReadonlyArray<AlterTableColumnAlterationNode>;
|
|
19
21
|
readonly addConstraint?: AddConstraintNode;
|
|
20
22
|
readonly dropConstraint?: DropConstraintNode;
|
|
23
|
+
readonly addIndex?: AddIndexNode;
|
|
24
|
+
readonly dropIndex?: DropIndexNode;
|
|
21
25
|
}
|
|
22
26
|
/**
|
|
23
27
|
* @internal
|
|
@@ -20,6 +20,7 @@ export interface ColumnDefinitionNode extends OperationNode {
|
|
|
20
20
|
readonly unsigned?: boolean;
|
|
21
21
|
readonly frontModifiers?: ReadonlyArray<OperationNode>;
|
|
22
22
|
readonly endModifiers?: ReadonlyArray<OperationNode>;
|
|
23
|
+
readonly nullsNotDistinct?: boolean;
|
|
23
24
|
}
|
|
24
25
|
/**
|
|
25
26
|
* @internal
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { ColumnNode } from './column-node.js';
|
|
2
1
|
import { OperationNode } from './operation-node.js';
|
|
3
2
|
export interface ColumnUpdateNode extends OperationNode {
|
|
4
3
|
readonly kind: 'ColumnUpdateNode';
|
|
5
|
-
readonly column:
|
|
4
|
+
readonly column: OperationNode;
|
|
6
5
|
readonly value: OperationNode;
|
|
7
6
|
}
|
|
8
7
|
/**
|
|
@@ -10,5 +9,5 @@ export interface ColumnUpdateNode extends OperationNode {
|
|
|
10
9
|
*/
|
|
11
10
|
export declare const ColumnUpdateNode: Readonly<{
|
|
12
11
|
is(node: OperationNode): node is ColumnUpdateNode;
|
|
13
|
-
create(column:
|
|
12
|
+
create(column: OperationNode, value: OperationNode): ColumnUpdateNode;
|
|
14
13
|
}>;
|
|
@@ -16,6 +16,7 @@ export interface CreateTableNode extends OperationNode {
|
|
|
16
16
|
readonly onCommit?: OnCommitAction;
|
|
17
17
|
readonly frontModifiers?: ReadonlyArray<OperationNode>;
|
|
18
18
|
readonly endModifiers?: ReadonlyArray<OperationNode>;
|
|
19
|
+
readonly selectQuery?: OperationNode;
|
|
19
20
|
}
|
|
20
21
|
/**
|
|
21
22
|
* @internal
|
|
@@ -85,6 +85,7 @@ import { JSONPathNode } from './json-path-node.js';
|
|
|
85
85
|
import { JSONPathLegNode } from './json-path-leg-node.js';
|
|
86
86
|
import { JSONOperatorChainNode } from './json-operator-chain-node.js';
|
|
87
87
|
import { TupleNode } from './tuple-node.js';
|
|
88
|
+
import { AddIndexNode } from './add-index-node.js';
|
|
88
89
|
/**
|
|
89
90
|
* Transforms an operation node tree into another one.
|
|
90
91
|
*
|
|
@@ -199,6 +200,7 @@ export declare class OperationNodeTransformer {
|
|
|
199
200
|
protected transformJSONPathLeg(node: JSONPathLegNode): JSONPathLegNode;
|
|
200
201
|
protected transformJSONOperatorChain(node: JSONOperatorChainNode): JSONOperatorChainNode;
|
|
201
202
|
protected transformTuple(node: TupleNode): TupleNode;
|
|
203
|
+
protected transformAddIndex(node: AddIndexNode): AddIndexNode;
|
|
202
204
|
protected transformDataType(node: DataTypeNode): DataTypeNode;
|
|
203
205
|
protected transformSelectAll(node: SelectAllNode): SelectAllNode;
|
|
204
206
|
protected transformIdentifier(node: IdentifierNode): IdentifierNode;
|
|
@@ -119,6 +119,7 @@ export class OperationNodeTransformer {
|
|
|
119
119
|
JSONPathLegNode: this.transformJSONPathLeg.bind(this),
|
|
120
120
|
JSONOperatorChainNode: this.transformJSONOperatorChain.bind(this),
|
|
121
121
|
TupleNode: this.transformTuple.bind(this),
|
|
122
|
+
AddIndexNode: this.transformAddIndex.bind(this),
|
|
122
123
|
});
|
|
123
124
|
transformNode(node) {
|
|
124
125
|
if (!node) {
|
|
@@ -295,6 +296,7 @@ export class OperationNodeTransformer {
|
|
|
295
296
|
onCommit: node.onCommit,
|
|
296
297
|
frontModifiers: this.transformNodeList(node.frontModifiers),
|
|
297
298
|
endModifiers: this.transformNodeList(node.endModifiers),
|
|
299
|
+
selectQuery: this.transformNode(node.selectQuery),
|
|
298
300
|
});
|
|
299
301
|
}
|
|
300
302
|
transformColumnDefinition(node) {
|
|
@@ -313,6 +315,7 @@ export class OperationNodeTransformer {
|
|
|
313
315
|
generated: this.transformNode(node.generated),
|
|
314
316
|
frontModifiers: this.transformNodeList(node.frontModifiers),
|
|
315
317
|
endModifiers: this.transformNodeList(node.endModifiers),
|
|
318
|
+
nullsNotDistinct: node.nullsNotDistinct,
|
|
316
319
|
});
|
|
317
320
|
}
|
|
318
321
|
transformAddColumn(node) {
|
|
@@ -414,6 +417,7 @@ export class OperationNodeTransformer {
|
|
|
414
417
|
using: this.transformNode(node.using),
|
|
415
418
|
ifNotExists: node.ifNotExists,
|
|
416
419
|
where: this.transformNode(node.where),
|
|
420
|
+
nullsNotDistinct: node.nullsNotDistinct,
|
|
417
421
|
});
|
|
418
422
|
}
|
|
419
423
|
transformList(node) {
|
|
@@ -443,6 +447,7 @@ export class OperationNodeTransformer {
|
|
|
443
447
|
kind: 'UniqueConstraintNode',
|
|
444
448
|
columns: this.transformNodeList(node.columns),
|
|
445
449
|
name: this.transformNode(node.name),
|
|
450
|
+
nullsNotDistinct: node.nullsNotDistinct,
|
|
446
451
|
});
|
|
447
452
|
}
|
|
448
453
|
transformForeignKeyConstraint(node) {
|
|
@@ -531,6 +536,8 @@ export class OperationNodeTransformer {
|
|
|
531
536
|
columnAlterations: this.transformNodeList(node.columnAlterations),
|
|
532
537
|
addConstraint: this.transformNode(node.addConstraint),
|
|
533
538
|
dropConstraint: this.transformNode(node.dropConstraint),
|
|
539
|
+
addIndex: this.transformNode(node.addIndex),
|
|
540
|
+
dropIndex: this.transformNode(node.dropIndex),
|
|
534
541
|
});
|
|
535
542
|
}
|
|
536
543
|
transformDropColumn(node) {
|
|
@@ -763,6 +770,16 @@ export class OperationNodeTransformer {
|
|
|
763
770
|
values: this.transformNodeList(node.values),
|
|
764
771
|
});
|
|
765
772
|
}
|
|
773
|
+
transformAddIndex(node) {
|
|
774
|
+
return requireAllProps({
|
|
775
|
+
kind: 'AddIndexNode',
|
|
776
|
+
name: this.transformNode(node.name),
|
|
777
|
+
columns: this.transformNodeList(node.columns),
|
|
778
|
+
unique: node.unique,
|
|
779
|
+
using: this.transformNode(node.using),
|
|
780
|
+
ifNotExists: node.ifNotExists,
|
|
781
|
+
});
|
|
782
|
+
}
|
|
766
783
|
transformDataType(node) {
|
|
767
784
|
// An Object.freezed leaf node. No need to clone.
|
|
768
785
|
return node;
|
|
@@ -85,6 +85,7 @@ import { JSONPathNode } from './json-path-node.js';
|
|
|
85
85
|
import { JSONPathLegNode } from './json-path-leg-node.js';
|
|
86
86
|
import { JSONOperatorChainNode } from './json-operator-chain-node.js';
|
|
87
87
|
import { TupleNode } from './tuple-node.js';
|
|
88
|
+
import { AddIndexNode } from './add-index-node.js';
|
|
88
89
|
export declare abstract class OperationNodeVisitor {
|
|
89
90
|
#private;
|
|
90
91
|
protected readonly nodeStack: OperationNode[];
|
|
@@ -176,4 +177,5 @@ export declare abstract class OperationNodeVisitor {
|
|
|
176
177
|
protected abstract visitJSONPathLeg(node: JSONPathLegNode): void;
|
|
177
178
|
protected abstract visitJSONOperatorChain(node: JSONOperatorChainNode): void;
|
|
178
179
|
protected abstract visitTuple(node: TupleNode): void;
|
|
180
|
+
protected abstract visitAddIndex(node: AddIndexNode): void;
|
|
179
181
|
}
|
|
@@ -92,6 +92,7 @@ export class OperationNodeVisitor {
|
|
|
92
92
|
JSONPathLegNode: this.visitJSONPathLeg.bind(this),
|
|
93
93
|
JSONOperatorChainNode: this.visitJSONOperatorChain.bind(this),
|
|
94
94
|
TupleNode: this.visitTuple.bind(this),
|
|
95
|
+
AddIndexNode: this.visitAddIndex.bind(this),
|
|
95
96
|
});
|
|
96
97
|
visitNode = (node) => {
|
|
97
98
|
this.nodeStack.push(node);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type OperationNodeKind = 'IdentifierNode' | 'SchemableIdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | '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' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode' | 'SelectModifierNode' | 'CreateTypeNode' | 'DropTypeNode' | 'ExplainNode' | 'DefaultInsertValueNode' | 'AggregateFunctionNode' | 'OverNode' | 'PartitionByNode' | 'PartitionByItemNode' | 'SetOperationNode' | 'BinaryOperationNode' | 'UnaryOperationNode' | 'UsingNode' | 'FunctionNode' | 'CaseNode' | 'WhenNode' | 'JSONReferenceNode' | 'JSONPathNode' | 'JSONPathLegNode' | 'JSONOperatorChainNode' | 'TupleNode';
|
|
1
|
+
export type OperationNodeKind = 'IdentifierNode' | 'SchemableIdentifierNode' | 'RawNode' | 'SelectQueryNode' | 'SelectionNode' | 'ReferenceNode' | 'ColumnNode' | 'TableNode' | 'AliasNode' | 'FromNode' | 'SelectAllNode' | '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' | 'CreateViewNode' | 'DropViewNode' | 'GeneratedNode' | 'DefaultValueNode' | 'OnNode' | 'ValuesNode' | 'CommonTableExpressionNameNode' | 'SelectModifierNode' | 'CreateTypeNode' | 'DropTypeNode' | 'ExplainNode' | 'DefaultInsertValueNode' | 'AggregateFunctionNode' | 'OverNode' | 'PartitionByNode' | 'PartitionByItemNode' | 'SetOperationNode' | 'BinaryOperationNode' | 'UnaryOperationNode' | 'UsingNode' | 'FunctionNode' | 'CaseNode' | 'WhenNode' | 'JSONReferenceNode' | 'JSONPathNode' | 'JSONPathLegNode' | 'JSONOperatorChainNode' | 'TupleNode' | 'AddIndexNode';
|
|
2
2
|
export interface OperationNode {
|
|
3
3
|
readonly kind: OperationNodeKind;
|
|
4
4
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { OperationNode } from './operation-node.js';
|
|
2
|
-
export declare const COMPARISON_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "&&", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "regexp"];
|
|
2
|
+
export declare const COMPARISON_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "&&", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "regexp", "is distinct from", "is not distinct from"];
|
|
3
3
|
export declare const ARITHMETIC_OPERATORS: readonly ["+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>"];
|
|
4
4
|
export declare const JSON_OPERATORS: readonly ["->", "->>"];
|
|
5
|
-
export declare const BINARY_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "&&", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "regexp", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||"];
|
|
5
|
+
export declare const BINARY_OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "&&", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "regexp", "is distinct from", "is not distinct from", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||"];
|
|
6
6
|
export declare const UNARY_FILTER_OPERATORS: readonly ["exists", "not exists"];
|
|
7
7
|
export declare const UNARY_OPERATORS: readonly ["not", "-", "exists", "not exists"];
|
|
8
|
-
export declare const OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "&&", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "regexp", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||", "->", "->>", "not", "-", "exists", "not exists", "between", "between symmetric"];
|
|
8
|
+
export declare const OPERATORS: readonly ["=", "==", "!=", "<>", ">", ">=", "<", "<=", "in", "not in", "is", "is not", "like", "not like", "match", "ilike", "not ilike", "@>", "<@", "&&", "?", "?&", "!<", "!>", "<=>", "!~", "~", "~*", "!~*", "@@", "@@@", "!!", "<->", "regexp", "is distinct from", "is not distinct from", "+", "-", "*", "/", "%", "^", "&", "|", "#", "<<", ">>", "&&", "||", "->", "->>", "not", "-", "exists", "not exists", "between", "between symmetric"];
|
|
9
9
|
export type ComparisonOperator = (typeof COMPARISON_OPERATORS)[number];
|
|
10
10
|
export type ArithmeticOperator = (typeof ARITHMETIC_OPERATORS)[number];
|
|
11
11
|
export type JSONOperator = (typeof JSON_OPERATORS)[number];
|
|
@@ -5,11 +5,14 @@ export interface UniqueConstraintNode extends OperationNode {
|
|
|
5
5
|
readonly kind: 'UniqueConstraintNode';
|
|
6
6
|
readonly columns: ReadonlyArray<ColumnNode>;
|
|
7
7
|
readonly name?: IdentifierNode;
|
|
8
|
+
readonly nullsNotDistinct?: boolean;
|
|
8
9
|
}
|
|
10
|
+
export type UniqueConstraintNodeProps = Omit<Partial<UniqueConstraintNode>, 'kind'>;
|
|
9
11
|
/**
|
|
10
12
|
* @internal
|
|
11
13
|
*/
|
|
12
14
|
export declare const UniqueConstraintNode: Readonly<{
|
|
13
15
|
is(node: OperationNode): node is UniqueConstraintNode;
|
|
14
|
-
create(columns: string[], constraintName?: string): UniqueConstraintNode;
|
|
16
|
+
create(columns: string[], constraintName?: string, nullsNotDistinct?: boolean): UniqueConstraintNode;
|
|
17
|
+
cloneWith(node: UniqueConstraintNode, props: UniqueConstraintNodeProps): UniqueConstraintNode;
|
|
15
18
|
}>;
|
|
@@ -9,11 +9,18 @@ export const UniqueConstraintNode = freeze({
|
|
|
9
9
|
is(node) {
|
|
10
10
|
return node.kind === 'UniqueConstraintNode';
|
|
11
11
|
},
|
|
12
|
-
create(columns, constraintName) {
|
|
12
|
+
create(columns, constraintName, nullsNotDistinct) {
|
|
13
13
|
return freeze({
|
|
14
14
|
kind: 'UniqueConstraintNode',
|
|
15
15
|
columns: freeze(columns.map(ColumnNode.create)),
|
|
16
16
|
name: constraintName ? IdentifierNode.create(constraintName) : undefined,
|
|
17
|
+
nullsNotDistinct,
|
|
18
|
+
});
|
|
19
|
+
},
|
|
20
|
+
cloneWith(node, props) {
|
|
21
|
+
return freeze({
|
|
22
|
+
...node,
|
|
23
|
+
...props,
|
|
17
24
|
});
|
|
18
25
|
},
|
|
19
26
|
});
|
|
@@ -35,7 +35,7 @@ export function parseFilterObject(obj, combinator) {
|
|
|
35
35
|
export function parseFilterList(list, combinator) {
|
|
36
36
|
const combine = combinator === 'and' ? AndNode.create : OrNode.create;
|
|
37
37
|
if (list.length === 0) {
|
|
38
|
-
return ValueNode.createImmediate(combinator === 'and');
|
|
38
|
+
return BinaryOperationNode.create(ValueNode.createImmediate(1), OperatorNode.create('='), ValueNode.createImmediate(combinator === 'and' ? 1 : 0));
|
|
39
39
|
}
|
|
40
40
|
let node = toOperationNode(list[0]);
|
|
41
41
|
for (let i = 1; i < list.length; ++i) {
|
|
@@ -1,2 +1,12 @@
|
|
|
1
|
-
import { ExtractTypeFromReferenceExpression
|
|
2
|
-
export type
|
|
1
|
+
import { ExtractTypeFromReferenceExpression } from './reference-parser.js';
|
|
2
|
+
export type ExtractTypeFromCoalesce1<DB, TB extends keyof DB, R1> = ExtractTypeFromReferenceExpression<DB, TB, R1>;
|
|
3
|
+
export type ExtractTypeFromCoalesce2<DB, TB extends keyof DB, R1, R2> = ExtractTypeFromCoalesceValues2<ExtractTypeFromReferenceExpression<DB, TB, R1>, ExtractTypeFromReferenceExpression<DB, TB, R2>>;
|
|
4
|
+
type ExtractTypeFromCoalesceValues2<V1, V2> = null extends V1 ? null extends V2 ? V1 | V2 : NotNull<V1 | V2> : NotNull<V1>;
|
|
5
|
+
export type ExtractTypeFromCoalesce3<DB, TB extends keyof DB, R1, R2, R3> = ExtractTypeFromCoalesceValues3<ExtractTypeFromReferenceExpression<DB, TB, R1>, ExtractTypeFromReferenceExpression<DB, TB, R2>, ExtractTypeFromReferenceExpression<DB, TB, R3>>;
|
|
6
|
+
type ExtractTypeFromCoalesceValues3<V1, V2, V3> = null extends V1 ? null extends V2 ? null extends V3 ? V1 | V2 | V3 : NotNull<V1 | V2 | V3> : NotNull<V1 | V2> : NotNull<V1>;
|
|
7
|
+
export type ExtractTypeFromCoalesce4<DB, TB extends keyof DB, R1, R2, R3, R4> = ExtractTypeFromCoalesceValues4<ExtractTypeFromReferenceExpression<DB, TB, R1>, ExtractTypeFromReferenceExpression<DB, TB, R2>, ExtractTypeFromReferenceExpression<DB, TB, R3>, ExtractTypeFromReferenceExpression<DB, TB, R4>>;
|
|
8
|
+
type ExtractTypeFromCoalesceValues4<V1, V2, V3, V4> = null extends V1 ? null extends V2 ? null extends V3 ? null extends V4 ? V1 | V2 | V3 | V4 : NotNull<V1 | V2 | V3 | V4> : NotNull<V1 | V2 | V3> : NotNull<V1 | V2> : NotNull<V1>;
|
|
9
|
+
export type ExtractTypeFromCoalesce5<DB, TB extends keyof DB, R1, R2, R3, R4, R5> = ExtractTypeFromCoalesceValues5<ExtractTypeFromReferenceExpression<DB, TB, R1>, ExtractTypeFromReferenceExpression<DB, TB, R2>, ExtractTypeFromReferenceExpression<DB, TB, R3>, ExtractTypeFromReferenceExpression<DB, TB, R4>, ExtractTypeFromReferenceExpression<DB, TB, R5>>;
|
|
10
|
+
type ExtractTypeFromCoalesceValues5<V1, V2, V3, V4, V5> = null extends V1 ? null extends V2 ? null extends V3 ? null extends V4 ? null extends V5 ? V1 | V2 | V3 | V4 | V5 : NotNull<V1 | V2 | V3 | V4 | V5> : NotNull<V1 | V2 | V3 | V4> : NotNull<V1 | V2 | V3> : NotNull<V1 | V2> : NotNull<V1>;
|
|
11
|
+
type NotNull<T> = Exclude<T, null>;
|
|
12
|
+
export {};
|
|
@@ -16,7 +16,8 @@ export type StringReference<DB, TB extends keyof DB> = AnyColumn<DB, TB> | AnyCo
|
|
|
16
16
|
export type SimpleReferenceExpression<DB, TB extends keyof DB> = StringReference<DB, TB> | DynamicReferenceBuilder<any>;
|
|
17
17
|
export type ReferenceExpression<DB, TB extends keyof DB> = SimpleReferenceExpression<DB, TB> | ExpressionOrFactory<DB, TB, any>;
|
|
18
18
|
export type ReferenceExpressionOrList<DB, TB extends keyof DB> = ReferenceExpression<DB, TB> | ReadonlyArray<ReferenceExpression<DB, TB>>;
|
|
19
|
-
export type ExtractTypeFromReferenceExpression<DB, TB extends keyof DB, RE, DV = unknown> =
|
|
19
|
+
export type ExtractTypeFromReferenceExpression<DB, TB extends keyof DB, RE, DV = unknown> = SelectType<ExtractRawTypeFromReferenceExpression<DB, TB, RE, DV>>;
|
|
20
|
+
export type ExtractRawTypeFromReferenceExpression<DB, TB extends keyof DB, RE, DV = unknown> = RE extends string ? ExtractTypeFromStringReference<DB, TB, RE> : RE extends SelectQueryBuilderExpression<infer O> ? O[keyof O] | null : RE extends (qb: any) => SelectQueryBuilderExpression<infer O> ? O[keyof O] | null : RE extends Expression<infer O> ? O : RE extends (qb: any) => Expression<infer O> ? O : DV;
|
|
20
21
|
export type ExtractTypeFromStringReference<DB, TB extends keyof DB, RE extends string, DV = unknown> = RE extends `${infer SC}.${infer T}.${infer C}` ? `${SC}.${T}` extends TB ? C extends keyof DB[`${SC}.${T}`] ? DB[`${SC}.${T}`][C] : never : never : RE extends `${infer T}.${infer C}` ? T extends TB ? C extends keyof DB[T] ? DB[T][C] : never : never : RE extends AnyColumn<DB, TB> ? ExtractColumnType<DB, TB, RE> : DV;
|
|
21
22
|
export type OrderedColumnName<C extends string> = C extends `${string} ${infer O}` ? O extends OrderByDirection ? C : never : C;
|
|
22
23
|
export type ExtractColumnNameFromOrderedColumnName<C extends string> = C extends `${infer CL} ${infer O}` ? O extends OrderByDirection ? CL : never : C;
|
|
@@ -2,9 +2,12 @@ import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
|
|
|
2
2
|
import { ExpressionBuilder } from '../expression/expression-builder.js';
|
|
3
3
|
import { UpdateKeys, UpdateType } from '../util/column-type.js';
|
|
4
4
|
import { ValueExpression } from './value-parser.js';
|
|
5
|
+
import { ExtractRawTypeFromReferenceExpression, ReferenceExpression } from './reference-parser.js';
|
|
5
6
|
export type UpdateObject<DB, TB extends keyof DB, UT extends keyof DB = TB> = {
|
|
6
7
|
[C in UpdateKeys<DB[UT]>]?: ValueExpression<DB, TB, UpdateType<DB[UT][C]>> | undefined;
|
|
7
8
|
};
|
|
8
9
|
export type UpdateObjectFactory<DB, TB extends keyof DB, UT extends keyof DB> = (eb: ExpressionBuilder<DB, TB>) => UpdateObject<DB, TB, UT>;
|
|
9
|
-
export type
|
|
10
|
-
export
|
|
10
|
+
export type UpdateObjectExpression<DB, TB extends keyof DB, UT extends keyof DB = TB> = UpdateObject<DB, TB, UT> | UpdateObjectFactory<DB, TB, UT>;
|
|
11
|
+
export type ExtractUpdateTypeFromReferenceExpression<DB, TB extends keyof DB, RE, DV = unknown> = UpdateType<ExtractRawTypeFromReferenceExpression<DB, TB, RE, DV>>;
|
|
12
|
+
export declare function parseUpdate(...args: [UpdateObjectExpression<any, any, any>] | [ReferenceExpression<any, any>, ValueExpression<any, any, any>]): ReadonlyArray<ColumnUpdateNode>;
|
|
13
|
+
export declare function parseUpdateObjectExpression(update: UpdateObjectExpression<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
|
|
@@ -4,7 +4,16 @@ import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
|
|
|
4
4
|
import { expressionBuilder, } from '../expression/expression-builder.js';
|
|
5
5
|
import { isFunction } from '../util/object-utils.js';
|
|
6
6
|
import { parseValueExpression } from './value-parser.js';
|
|
7
|
-
|
|
7
|
+
import { parseReferenceExpression, } from './reference-parser.js';
|
|
8
|
+
export function parseUpdate(...args) {
|
|
9
|
+
if (args.length === 2) {
|
|
10
|
+
return [
|
|
11
|
+
ColumnUpdateNode.create(parseReferenceExpression(args[0]), parseValueExpression(args[1])),
|
|
12
|
+
];
|
|
13
|
+
}
|
|
14
|
+
return parseUpdateObjectExpression(args[0]);
|
|
15
|
+
}
|
|
16
|
+
export function parseUpdateObjectExpression(update) {
|
|
8
17
|
const updateObj = isFunction(update) ? update(expressionBuilder()) : update;
|
|
9
18
|
return Object.entries(updateObj)
|
|
10
19
|
.filter(([_, value]) => value !== undefined)
|
|
@@ -116,8 +116,8 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
|
|
|
116
116
|
* from "person"
|
|
117
117
|
* ```
|
|
118
118
|
*/
|
|
119
|
-
filterWhere<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs:
|
|
120
|
-
filterWhere
|
|
119
|
+
filterWhere<RE extends ReferenceExpression<DB, TB>, VE extends OperandValueExpressionOrList<DB, TB, RE>>(lhs: RE, op: ComparisonOperatorExpression, rhs: VE): AggregateFunctionBuilder<DB, TB, O>;
|
|
120
|
+
filterWhere<E extends ExpressionOrFactory<DB, TB, SqlBool>>(expression: E): AggregateFunctionBuilder<DB, TB, O>;
|
|
121
121
|
/**
|
|
122
122
|
* Adds a `filter` clause with a nested `where` clause after the function, where
|
|
123
123
|
* both sides of the operator are references to columns.
|
|
@@ -150,7 +150,7 @@ export declare class AggregateFunctionBuilder<DB, TB extends keyof DB, O = unkno
|
|
|
150
150
|
* from "person"
|
|
151
151
|
* ```
|
|
152
152
|
*/
|
|
153
|
-
filterWhereRef
|
|
153
|
+
filterWhereRef<LRE extends ReferenceExpression<DB, TB>, RRE extends ReferenceExpression<DB, TB>>(lhs: LRE, op: ComparisonOperatorExpression, rhs: RRE): AggregateFunctionBuilder<DB, TB, O>;
|
|
154
154
|
/**
|
|
155
155
|
* Adds an `over` clause (window functions) after the function.
|
|
156
156
|
*
|
|
@@ -239,4 +239,4 @@ export declare class AliasedAggregateFunctionBuilder<DB, TB extends keyof DB, O
|
|
|
239
239
|
export interface AggregateFunctionBuilderProps {
|
|
240
240
|
aggregateFunctionNode: AggregateFunctionNode;
|
|
241
241
|
}
|
|
242
|
-
export type OverBuilderCallback<DB, TB extends keyof DB> = (builder: OverBuilder<DB, TB>) => OverBuilder<
|
|
242
|
+
export type OverBuilderCallback<DB, TB extends keyof DB> = (builder: OverBuilder<DB, TB>) => OverBuilder<any, any>;
|
|
@@ -3,6 +3,7 @@ import { ExpressionWrapper } from '../expression/expression-wrapper.js';
|
|
|
3
3
|
import { ReferenceExpression } from '../parser/reference-parser.js';
|
|
4
4
|
import { CaseNode } from '../operation-node/case-node.js';
|
|
5
5
|
import { ComparisonOperatorExpression, OperandValueExpressionOrList } from '../parser/binary-operation-parser.js';
|
|
6
|
+
import { ExtractTypeFromValueExpression } from '../parser/value-parser.js';
|
|
6
7
|
import { KyselyTypeError } from '../util/type-error.js';
|
|
7
8
|
export declare class CaseBuilder<DB, TB extends keyof DB, W = unknown, O = never> implements Whenable<DB, TB, W, O> {
|
|
8
9
|
#private;
|
|
@@ -12,7 +13,7 @@ export declare class CaseBuilder<DB, TB extends keyof DB, W = unknown, O = never
|
|
|
12
13
|
*
|
|
13
14
|
* A `when` call must be followed by a {@link CaseThenBuilder.then} call.
|
|
14
15
|
*/
|
|
15
|
-
when<RE extends ReferenceExpression<DB, TB>>(lhs: unknown extends W ? RE : KyselyTypeError<'when(lhs, op, rhs) is not supported when using case(value)'>, op: ComparisonOperatorExpression, rhs:
|
|
16
|
+
when<RE extends ReferenceExpression<DB, TB>, VE extends OperandValueExpressionOrList<DB, TB, RE>>(lhs: unknown extends W ? RE : KyselyTypeError<'when(lhs, op, rhs) is not supported when using case(value)'>, op: ComparisonOperatorExpression, rhs: VE): CaseThenBuilder<DB, TB, W, O>;
|
|
16
17
|
when(expression: Expression<W>): CaseThenBuilder<DB, TB, W, O>;
|
|
17
18
|
when(value: unknown extends W ? KyselyTypeError<'when(value) is only supported when using case(value)'> : W): CaseThenBuilder<DB, TB, W, O>;
|
|
18
19
|
}
|
|
@@ -28,7 +29,7 @@ export declare class CaseThenBuilder<DB, TB extends keyof DB, W, O> {
|
|
|
28
29
|
* A `then` call can be followed by {@link Whenable.when}, {@link CaseWhenBuilder.else},
|
|
29
30
|
* {@link CaseWhenBuilder.end} or {@link CaseWhenBuilder.endCase} call.
|
|
30
31
|
*/
|
|
31
|
-
then<
|
|
32
|
+
then<E extends Expression<any>>(expression: E): CaseWhenBuilder<DB, TB, W, O | ExtractTypeFromValueExpression<E>>;
|
|
32
33
|
then<V>(value: V): CaseWhenBuilder<DB, TB, W, O | V>;
|
|
33
34
|
}
|
|
34
35
|
export declare class CaseWhenBuilder<DB, TB extends keyof DB, W, O> implements Whenable<DB, TB, W, O>, Endable<DB, TB, O | null> {
|
|
@@ -39,7 +40,7 @@ export declare class CaseWhenBuilder<DB, TB extends keyof DB, W, O> implements W
|
|
|
39
40
|
*
|
|
40
41
|
* A `when` call must be followed by a {@link CaseThenBuilder.then} call.
|
|
41
42
|
*/
|
|
42
|
-
when<RE extends ReferenceExpression<DB, TB>>(lhs: unknown extends W ? RE : KyselyTypeError<'when(lhs, op, rhs) is not supported when using case(value)'>, op: ComparisonOperatorExpression, rhs:
|
|
43
|
+
when<RE extends ReferenceExpression<DB, TB>, VE extends OperandValueExpressionOrList<DB, TB, RE>>(lhs: unknown extends W ? RE : KyselyTypeError<'when(lhs, op, rhs) is not supported when using case(value)'>, op: ComparisonOperatorExpression, rhs: VE): CaseThenBuilder<DB, TB, W, O>;
|
|
43
44
|
when(expression: Expression<W>): CaseThenBuilder<DB, TB, W, O>;
|
|
44
45
|
when(value: unknown extends W ? KyselyTypeError<'when(value) is only supported when using case(value)'> : W): CaseThenBuilder<DB, TB, W, O>;
|
|
45
46
|
/**
|
|
@@ -88,7 +89,7 @@ interface Whenable<DB, TB extends keyof DB, W, O> {
|
|
|
88
89
|
*
|
|
89
90
|
* A `when` call must be followed by a {@link CaseThenBuilder.then} call.
|
|
90
91
|
*/
|
|
91
|
-
when<RE extends ReferenceExpression<DB, TB>>(lhs: unknown extends W ? RE : KyselyTypeError<'when(lhs, op, rhs) is not supported when using case(value)'>, op: ComparisonOperatorExpression, rhs:
|
|
92
|
+
when<RE extends ReferenceExpression<DB, TB>, VE extends OperandValueExpressionOrList<DB, TB, RE>>(lhs: unknown extends W ? RE : KyselyTypeError<'when(lhs, op, rhs) is not supported when using case(value)'>, op: ComparisonOperatorExpression, rhs: VE): CaseThenBuilder<DB, TB, W, O>;
|
|
92
93
|
when(expression: Expression<W>): CaseThenBuilder<DB, TB, W, O>;
|
|
93
94
|
when(value: unknown extends W ? KyselyTypeError<'when(value) is only supported when using case(value)'> : W): CaseThenBuilder<DB, TB, W, O>;
|
|
94
95
|
}
|
|
@@ -325,8 +325,8 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
|
|
|
325
325
|
* .execute()
|
|
326
326
|
* ```
|
|
327
327
|
*/
|
|
328
|
-
where<RE extends ReferenceExpression<DB, TB>>(lhs: RE, op: ComparisonOperatorExpression, rhs:
|
|
329
|
-
where
|
|
328
|
+
where<RE extends ReferenceExpression<DB, TB>, VE extends OperandValueExpressionOrList<DB, TB, RE>>(lhs: RE, op: ComparisonOperatorExpression, rhs: VE): DeleteQueryBuilder<DB, TB, O>;
|
|
329
|
+
where<E extends ExpressionOrFactory<DB, TB, SqlBool>>(expression: E): DeleteQueryBuilder<DB, TB, O>;
|
|
330
330
|
/**
|
|
331
331
|
* Adds a `where` clause where both sides of the operator are references
|
|
332
332
|
* to columns.
|
|
@@ -378,7 +378,7 @@ export declare class DeleteQueryBuilder<DB, TB extends keyof DB, O> implements W
|
|
|
378
378
|
* ) as "pet_name"
|
|
379
379
|
* from "person"
|
|
380
380
|
*/
|
|
381
|
-
whereRef
|
|
381
|
+
whereRef<LRE extends ReferenceExpression<DB, TB>, RRE extends ReferenceExpression<DB, TB>>(lhs: LRE, op: ComparisonOperatorExpression, rhs: RRE): DeleteQueryBuilder<DB, TB, O>;
|
|
382
382
|
/**
|
|
383
383
|
* Clears all where expressions from the query.
|
|
384
384
|
*
|