kysely 0.19.11 → 0.20.1

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.
Files changed (116) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/dialect/mysql/mysql-introspector.js +2 -0
  3. package/dist/cjs/dialect/mysql/mysql-query-compiler.d.ts +5 -0
  4. package/dist/cjs/dialect/mysql/mysql-query-compiler.js +16 -0
  5. package/dist/cjs/dialect/postgres/postgres-introspector.js +17 -9
  6. package/dist/cjs/dialect/postgres/postgres-query-compiler.d.ts +1 -3
  7. package/dist/cjs/dialect/postgres/postgres-query-compiler.js +3 -8
  8. package/dist/cjs/dialect/sqlite/sqlite-introspector.js +2 -0
  9. package/dist/cjs/dialect/sqlite/sqlite-query-compiler.d.ts +3 -0
  10. package/dist/cjs/dialect/sqlite/sqlite-query-compiler.js +10 -0
  11. package/dist/cjs/index.d.ts +3 -0
  12. package/dist/cjs/index.js +3 -0
  13. package/dist/cjs/operation-node/create-table-node.d.ts +9 -2
  14. package/dist/cjs/operation-node/create-table-node.js +18 -1
  15. package/dist/cjs/operation-node/delete-query-node.d.ts +3 -0
  16. package/dist/cjs/operation-node/delete-query-node.js +6 -0
  17. package/dist/cjs/operation-node/explain-node.d.ts +16 -0
  18. package/dist/cjs/operation-node/explain-node.js +19 -0
  19. package/dist/cjs/operation-node/foreign-key-constraint-node.d.ts +2 -2
  20. package/dist/cjs/operation-node/insert-query-node.d.ts +2 -0
  21. package/dist/cjs/operation-node/operation-node-transformer.d.ts +2 -0
  22. package/dist/cjs/operation-node/operation-node-transformer.js +14 -0
  23. package/dist/cjs/operation-node/operation-node-visitor.d.ts +2 -0
  24. package/dist/cjs/operation-node/operation-node-visitor.js +1 -0
  25. package/dist/cjs/operation-node/operation-node.d.ts +1 -1
  26. package/dist/cjs/operation-node/reference-node.d.ts +1 -1
  27. package/dist/cjs/operation-node/reference-node.js +1 -2
  28. package/dist/cjs/operation-node/references-node.d.ts +3 -1
  29. package/dist/cjs/operation-node/references-node.js +8 -1
  30. package/dist/cjs/operation-node/select-query-node.d.ts +3 -0
  31. package/dist/cjs/operation-node/select-query-node.js +6 -0
  32. package/dist/cjs/operation-node/selection-node.d.ts +2 -1
  33. package/dist/cjs/operation-node/update-query-node.d.ts +3 -0
  34. package/dist/cjs/operation-node/update-query-node.js +6 -0
  35. package/dist/cjs/parser/on-commit-action-parse.d.ts +2 -0
  36. package/dist/cjs/parser/on-commit-action-parse.js +11 -0
  37. package/dist/cjs/parser/on-modify-action-parser.d.ts +2 -0
  38. package/dist/cjs/parser/on-modify-action-parser.js +11 -0
  39. package/dist/cjs/parser/select-parser.js +2 -1
  40. package/dist/cjs/query-builder/delete-query-builder.d.ts +19 -1
  41. package/dist/cjs/query-builder/delete-query-builder.js +24 -0
  42. package/dist/cjs/query-builder/function-builder.d.ts +3 -3
  43. package/dist/cjs/query-builder/insert-query-builder.d.ts +20 -2
  44. package/dist/cjs/query-builder/insert-query-builder.js +26 -0
  45. package/dist/cjs/query-builder/select-query-builder.d.ts +38 -1
  46. package/dist/cjs/query-builder/select-query-builder.js +45 -2
  47. package/dist/cjs/query-builder/update-query-builder.d.ts +20 -1
  48. package/dist/cjs/query-builder/update-query-builder.js +25 -0
  49. package/dist/cjs/query-compiler/default-query-compiler.d.ts +7 -0
  50. package/dist/cjs/query-compiler/default-query-compiler.js +74 -1
  51. package/dist/cjs/raw-builder/sql.d.ts +96 -96
  52. package/dist/cjs/raw-builder/sql.js +0 -96
  53. package/dist/cjs/schema/column-definition-builder.js +3 -2
  54. package/dist/cjs/schema/create-table-builder.d.ts +54 -0
  55. package/dist/cjs/schema/create-table-builder.js +66 -1
  56. package/dist/cjs/schema/foreign-key-constraint-builder.js +3 -2
  57. package/dist/cjs/util/explainable.d.ts +5 -0
  58. package/dist/cjs/util/explainable.js +2 -0
  59. package/dist/esm/dialect/mysql/mysql-introspector.js +2 -0
  60. package/dist/esm/dialect/mysql/mysql-query-compiler.d.ts +5 -0
  61. package/dist/esm/dialect/mysql/mysql-query-compiler.js +16 -0
  62. package/dist/esm/dialect/postgres/postgres-introspector.js +17 -9
  63. package/dist/esm/dialect/postgres/postgres-query-compiler.d.ts +1 -3
  64. package/dist/esm/dialect/postgres/postgres-query-compiler.js +3 -8
  65. package/dist/esm/dialect/sqlite/sqlite-introspector.js +2 -0
  66. package/dist/esm/dialect/sqlite/sqlite-query-compiler.d.ts +3 -0
  67. package/dist/esm/dialect/sqlite/sqlite-query-compiler.js +10 -0
  68. package/dist/esm/index.d.ts +3 -0
  69. package/dist/esm/index.js +3 -0
  70. package/dist/esm/operation-node/create-table-node.d.ts +9 -2
  71. package/dist/esm/operation-node/create-table-node.js +17 -0
  72. package/dist/esm/operation-node/delete-query-node.d.ts +3 -0
  73. package/dist/esm/operation-node/delete-query-node.js +6 -0
  74. package/dist/esm/operation-node/explain-node.d.ts +16 -0
  75. package/dist/esm/operation-node/explain-node.js +17 -0
  76. package/dist/esm/operation-node/foreign-key-constraint-node.d.ts +2 -2
  77. package/dist/esm/operation-node/insert-query-node.d.ts +2 -0
  78. package/dist/esm/operation-node/operation-node-transformer.d.ts +2 -0
  79. package/dist/esm/operation-node/operation-node-transformer.js +14 -0
  80. package/dist/esm/operation-node/operation-node-visitor.d.ts +2 -0
  81. package/dist/esm/operation-node/operation-node-visitor.js +1 -0
  82. package/dist/esm/operation-node/operation-node.d.ts +1 -1
  83. package/dist/esm/operation-node/reference-node.d.ts +1 -1
  84. package/dist/esm/operation-node/reference-node.js +1 -2
  85. package/dist/esm/operation-node/references-node.d.ts +3 -1
  86. package/dist/esm/operation-node/references-node.js +7 -0
  87. package/dist/esm/operation-node/select-query-node.d.ts +3 -0
  88. package/dist/esm/operation-node/select-query-node.js +6 -0
  89. package/dist/esm/operation-node/selection-node.d.ts +2 -1
  90. package/dist/esm/operation-node/update-query-node.d.ts +3 -0
  91. package/dist/esm/operation-node/update-query-node.js +6 -0
  92. package/dist/esm/parser/on-commit-action-parse.d.ts +2 -0
  93. package/dist/esm/parser/on-commit-action-parse.js +8 -0
  94. package/dist/esm/parser/on-modify-action-parser.d.ts +2 -0
  95. package/dist/esm/parser/on-modify-action-parser.js +8 -0
  96. package/dist/esm/parser/select-parser.js +2 -1
  97. package/dist/esm/query-builder/delete-query-builder.d.ts +19 -1
  98. package/dist/esm/query-builder/delete-query-builder.js +24 -0
  99. package/dist/esm/query-builder/function-builder.d.ts +3 -3
  100. package/dist/esm/query-builder/insert-query-builder.d.ts +20 -2
  101. package/dist/esm/query-builder/insert-query-builder.js +26 -0
  102. package/dist/esm/query-builder/select-query-builder.d.ts +38 -1
  103. package/dist/esm/query-builder/select-query-builder.js +45 -2
  104. package/dist/esm/query-builder/update-query-builder.d.ts +20 -1
  105. package/dist/esm/query-builder/update-query-builder.js +25 -0
  106. package/dist/esm/query-compiler/default-query-compiler.d.ts +7 -0
  107. package/dist/esm/query-compiler/default-query-compiler.js +74 -1
  108. package/dist/esm/raw-builder/sql.d.ts +96 -96
  109. package/dist/esm/raw-builder/sql.js +0 -96
  110. package/dist/esm/schema/column-definition-builder.js +3 -2
  111. package/dist/esm/schema/create-table-builder.d.ts +54 -0
  112. package/dist/esm/schema/create-table-builder.js +66 -1
  113. package/dist/esm/schema/foreign-key-constraint-builder.js +3 -2
  114. package/dist/esm/util/explainable.d.ts +5 -0
  115. package/dist/esm/util/explainable.js +2 -0
  116. package/package.json +3 -1
@@ -7,102 +7,6 @@ import { parseTable } from '../parser/table-parser.js';
7
7
  import { parseValueExpression } from '../parser/value-parser.js';
8
8
  import { createQueryId } from '../util/query-id.js';
9
9
  import { RawBuilder } from './raw-builder.js';
10
- /**
11
- * Template tag for creating raw SQL snippets and queries.
12
- *
13
- * ```ts
14
- * import { sql } from 'kysely'
15
- *
16
- * const id = 123
17
- *
18
- * const snippet = sql<Person[]>`select * from person where id = ${id}`
19
- * ```
20
- *
21
- * Substitutions (the things inside `${}`) are automatically passed to the database
22
- * as parameters and are NOT interpolated to the SQL string. There's no need to worry
23
- * about SQL injection vulnerabilities.
24
- *
25
- * If you need your substitutions to be interpreted as identifiers, value literals or
26
- * lists of things, see the {@link Sql.ref}, {@link Sql.table}, {@link Sql.id},
27
- * {@link Sql.literal}, {@link Sql.raw} and {@link Sql.join} functions.
28
- *
29
- * You can pass sql snippets returned by the `sql` tag pretty much anywhere. Whenever
30
- * something can't be done using the Kysely API, you should be able to drop down to
31
- * raw SQL using the `sql` tag. Here's an example query that uses raw sql in a bunch
32
- * of methods:
33
- *
34
- * ```ts
35
- * const persons = await db
36
- * .selectFrom('person')
37
- * .select(
38
- * // If you use `sql` in a select statement, remember to call the `as`
39
- * // method to give it an alias. Otherwise Kysely is not able to add
40
- * // the column to the result type.
41
- * sql<string>`concat(first_name, ' ', last_name)`.as('full_name')
42
- * )
43
- * .where(sql`birthdate between ${date1} and ${date2}`)
44
- * // Here we assume we have list of nicknames for the person
45
- * // (a list of strings) and we use the PostgreSQL `@>` operator
46
- * // to test if all of them are valid nicknames for the user.
47
- * .where('nicknames', '@>', sql`ARRAY[${sql.join(nicknames)}]`)
48
- * .orderBy(sql`concat(first_name, ' ', last_name)`)
49
- * .execute()
50
- * ```
51
- *
52
- * The generated SQL (PostgreSQL):
53
- *
54
- * ```sql
55
- * select concat(first_name, ' ', last_name) as "full_name"
56
- * from "person"
57
- * where birthdate between $1 and $2
58
- * and "nicknames" @> ARRAY[$3, $4, $5, $6, $7, $8, $9, $10]
59
- * order by concat(first_name, ' ', last_name)
60
- * ```
61
- *
62
- * SQL snippets can be executed by calling the `execute` method and passing a `Kysely`
63
- * instance as the only argument:
64
- *
65
- * ```ts
66
- * const result = await sql<Person[]>`select * from person`.execute(db)
67
- * ```
68
- *
69
- * You can merge other `sql` expressions and queries using substitutions:
70
- *
71
- * ```ts
72
- * const petName = db.selectFrom('pet').select('name').limit(1)
73
- * const fullName = sql`concat(first_name, ' ', last_name)`
74
- *
75
- * sql`
76
- * select ${fullName} as full_name, ${petName} as pet_name
77
- * from person
78
- * `
79
- * ```
80
- *
81
- * Substitutions also handle {@link ExpressionBuilder.ref},
82
- * {@link DynamicModule.ref} and pretty much anything else you
83
- * throw at it. Here's an example of calling a function in a
84
- * type-safe way:
85
- *
86
- * ```ts
87
- * db.selectFrom('person')
88
- * .select([
89
- * 'first_name',
90
- * 'last_name',
91
- * (eb) => {
92
- * // The `eb.ref` method is type-safe and only accepts
93
- * // column references that are possible.
94
- * const firstName = eb.ref('first_name')
95
- * const lastName = eb.ref('last_name')
96
- *
97
- * const fullName = sql<string>`concat(${firstName}, ' ', ${lastName})`
98
- * return fullName.as('full_name')
99
- * }
100
- * ])
101
- * ```
102
- *
103
- * don't know if that amount of ceremony is worth the small increase in
104
- * type-safety though... But it's possible.
105
- */
106
10
  export const sql = Object.assign((sqlFragments, ...parameters) => {
107
11
  return new RawBuilder({
108
12
  queryId: createQueryId(),
@@ -9,6 +9,7 @@ import { ColumnDefinitionNode } from '../operation-node/column-definition-node.j
9
9
  import { parseDefaultValueExpression, } from '../parser/default-value-parser.js';
10
10
  import { GeneratedNode } from '../operation-node/generated-node.js';
11
11
  import { DefaultValueNode } from '../operation-node/default-value-node.js';
12
+ import { parseOnModifyForeignAction } from '../parser/on-modify-action-parser.js';
12
13
  export class ColumnDefinitionBuilder {
13
14
  #node;
14
15
  constructor(node) {
@@ -36,7 +37,7 @@ export class ColumnDefinitionBuilder {
36
37
  throw new Error('on delete constraint can only be added for foreign keys');
37
38
  }
38
39
  return new ColumnDefinitionBuilder(ColumnDefinitionNode.cloneWith(this.#node, {
39
- references: ReferencesNode.cloneWithOnDelete(this.#node.references, onDelete),
40
+ references: ReferencesNode.cloneWithOnDelete(this.#node.references, parseOnModifyForeignAction(onDelete)),
40
41
  }));
41
42
  }
42
43
  onUpdate(onUpdate) {
@@ -44,7 +45,7 @@ export class ColumnDefinitionBuilder {
44
45
  throw new Error('on update constraint can only be added for foreign keys');
45
46
  }
46
47
  return new ColumnDefinitionBuilder(ColumnDefinitionNode.cloneWith(this.#node, {
47
- references: ReferencesNode.cloneWithOnUpdate(this.#node.references, onUpdate),
48
+ references: ReferencesNode.cloneWithOnUpdate(this.#node.references, parseOnModifyForeignAction(onUpdate)),
48
49
  }));
49
50
  }
50
51
  unique() {
@@ -149,6 +149,60 @@ export declare class CreateTableBuilder<TB extends string, C extends string = ne
149
149
  * ```
150
150
  */
151
151
  addForeignKeyConstraint(constraintName: string, columns: C[], targetTable: string, targetColumns: string[], build?: ForeignKeyConstraintBuilderCallback): CreateTableBuilder<TB, C>;
152
+ /**
153
+ * This can be used to add any additional SQL to the front of the query __after__ the `create` keyword.
154
+ *
155
+ * Also see {@link temporary}.
156
+ *
157
+ * ### Examples
158
+ *
159
+ * ```ts
160
+ * db.schema.createTable('person')
161
+ * .modifyFront(sql`global temporary`)
162
+ * .addColumn('id', 'integer', col => col => primaryKey())
163
+ * .addColumn('first_name', 'varchar(64)', col => col.notNull())
164
+ * .addColumn('last_name', 'varchar(64), col => col.notNull())
165
+ * .execute()
166
+ * ```
167
+ *
168
+ * The generated SQL (Postgres):
169
+ *
170
+ * ```sql
171
+ * create global temporary table "person" (
172
+ * "id" integer primary key,
173
+ * "first_name" varchar(64) not null,
174
+ * "last_name" varchar(64) not null
175
+ * )
176
+ * ```
177
+ */
178
+ modifyFront(modifier: AnyRawBuilder): CreateTableBuilder<TB, C>;
179
+ /**
180
+ * This can be used to add any additional SQL to the end of the query.
181
+ *
182
+ * Also see {@link onCommit}.
183
+ *
184
+ * ### Examples
185
+ *
186
+ * ```ts
187
+ * db.schema.createTable('person')
188
+ * .addColumn('id', 'integer', col => col => primaryKey())
189
+ * .addColumn('first_name', 'varchar(64)', col => col.notNull())
190
+ * .addColumn('last_name', 'varchar(64), col => col.notNull())
191
+ * .modifyEnd(sql`collate utf8_unicode_ci`)
192
+ * .execute()
193
+ * ```
194
+ *
195
+ * The generated SQL (MySQL):
196
+ *
197
+ * ```sql
198
+ * create table `person` (
199
+ * `id` integer primary key,
200
+ * `first_name` varchar(64) not null,
201
+ * `last_name` varchar(64) not null
202
+ * ) collate utf8_unicode_ci
203
+ * ```
204
+ */
205
+ modifyEnd(modifier: AnyRawBuilder): CreateTableBuilder<TB, C>;
152
206
  toOperationNode(): CreateTableNode;
153
207
  compile(): CompiledQuery;
154
208
  execute(): Promise<void>;
@@ -12,6 +12,7 @@ import { PrimaryConstraintNode } from '../operation-node/primary-constraint-node
12
12
  import { UniqueConstraintNode } from '../operation-node/unique-constraint-node.js';
13
13
  import { CheckConstraintNode } from '../operation-node/check-constraint-node.js';
14
14
  import { parseTable } from '../parser/table-parser.js';
15
+ import { parseOnCommitAction } from '../parser/on-commit-action-parse.js';
15
16
  /**
16
17
  * This builder can be used to create a `create table` query.
17
18
  */
@@ -43,7 +44,7 @@ export class CreateTableBuilder {
43
44
  return new CreateTableBuilder({
44
45
  ...this.#props,
45
46
  createTableNode: CreateTableNode.cloneWith(this.#props.createTableNode, {
46
- onCommit,
47
+ onCommit: parseOnCommitAction(onCommit),
47
48
  }),
48
49
  });
49
50
  }
@@ -203,6 +204,70 @@ export class CreateTableBuilder {
203
204
  createTableNode: CreateTableNode.cloneWithConstraint(this.#props.createTableNode, builder.toOperationNode()),
204
205
  });
205
206
  }
207
+ /**
208
+ * This can be used to add any additional SQL to the front of the query __after__ the `create` keyword.
209
+ *
210
+ * Also see {@link temporary}.
211
+ *
212
+ * ### Examples
213
+ *
214
+ * ```ts
215
+ * db.schema.createTable('person')
216
+ * .modifyFront(sql`global temporary`)
217
+ * .addColumn('id', 'integer', col => col => primaryKey())
218
+ * .addColumn('first_name', 'varchar(64)', col => col.notNull())
219
+ * .addColumn('last_name', 'varchar(64), col => col.notNull())
220
+ * .execute()
221
+ * ```
222
+ *
223
+ * The generated SQL (Postgres):
224
+ *
225
+ * ```sql
226
+ * create global temporary table "person" (
227
+ * "id" integer primary key,
228
+ * "first_name" varchar(64) not null,
229
+ * "last_name" varchar(64) not null
230
+ * )
231
+ * ```
232
+ */
233
+ modifyFront(modifier) {
234
+ return new CreateTableBuilder({
235
+ ...this.#props,
236
+ createTableNode: CreateTableNode.cloneWithFrontModifier(this.#props.createTableNode, modifier.toOperationNode()),
237
+ });
238
+ }
239
+ /**
240
+ * This can be used to add any additional SQL to the end of the query.
241
+ *
242
+ * Also see {@link onCommit}.
243
+ *
244
+ * ### Examples
245
+ *
246
+ * ```ts
247
+ * db.schema.createTable('person')
248
+ * .addColumn('id', 'integer', col => col => primaryKey())
249
+ * .addColumn('first_name', 'varchar(64)', col => col.notNull())
250
+ * .addColumn('last_name', 'varchar(64), col => col.notNull())
251
+ * .modifyEnd(sql`collate utf8_unicode_ci`)
252
+ * .execute()
253
+ * ```
254
+ *
255
+ * The generated SQL (MySQL):
256
+ *
257
+ * ```sql
258
+ * create table `person` (
259
+ * `id` integer primary key,
260
+ * `first_name` varchar(64) not null,
261
+ * `last_name` varchar(64) not null
262
+ * ) collate utf8_unicode_ci
263
+ * ```
264
+ */
265
+ modifyEnd(modifier) {
266
+ return new CreateTableBuilder({
267
+ ...this.#props,
268
+ createTableNode: CreateTableNode.cloneWithEndModifier(this.#props.createTableNode, modifier.toOperationNode()),
269
+ });
270
+ }
206
271
  toOperationNode() {
207
272
  return this.#props.executor.transformQuery(this.#props.createTableNode, this.#props.queryId);
208
273
  }
@@ -1,5 +1,6 @@
1
1
  /// <reference types="./foreign-key-constraint-builder.d.ts" />
2
2
  import { ForeignKeyConstraintNode } from '../operation-node/foreign-key-constraint-node.js';
3
+ import { parseOnModifyForeignAction } from '../parser/on-modify-action-parser.js';
3
4
  import { preventAwait } from '../util/prevent-await.js';
4
5
  export class ForeignKeyConstraintBuilder {
5
6
  #node;
@@ -8,12 +9,12 @@ export class ForeignKeyConstraintBuilder {
8
9
  }
9
10
  onDelete(onDelete) {
10
11
  return new ForeignKeyConstraintBuilder(ForeignKeyConstraintNode.cloneWith(this.#node, {
11
- onDelete,
12
+ onDelete: parseOnModifyForeignAction(onDelete),
12
13
  }));
13
14
  }
14
15
  onUpdate(onUpdate) {
15
16
  return new ForeignKeyConstraintBuilder(ForeignKeyConstraintNode.cloneWith(this.#node, {
16
- onUpdate,
17
+ onUpdate: parseOnModifyForeignAction(onUpdate),
17
18
  }));
18
19
  }
19
20
  toOperationNode() {
@@ -0,0 +1,5 @@
1
+ import { AnyRawBuilder } from './type-utils.js';
2
+ export declare type ExplainFormat = 'text' | 'xml' | 'json' | 'yaml' | 'traditional' | 'tree';
3
+ export interface Explainable {
4
+ explain<O extends Record<string, any> = Record<string, any>>(format?: ExplainFormat, options?: AnyRawBuilder): Promise<O[]>;
5
+ }
@@ -0,0 +1,2 @@
1
+ /// <reference types="./explainable.d.ts" />
2
+ export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kysely",
3
- "version": "0.19.11",
3
+ "version": "0.20.1",
4
4
  "description": "Type safe SQL query builder",
5
5
  "repository": {
6
6
  "type": "git",
@@ -48,6 +48,7 @@
48
48
  "@types/chai-subset": "^1.3.3",
49
49
  "@types/mocha": "^9.1.1",
50
50
  "@types/pg": "^8.6.5",
51
+ "@types/sinon": "^10.0.13",
51
52
  "better-sqlite3": "^7.5.3",
52
53
  "chai": "^4.3.6",
53
54
  "chai-as-promised": "^7.1.1",
@@ -59,6 +60,7 @@
59
60
  "pg-cursor": "^2.7.3",
60
61
  "playwright": "^1.22.2",
61
62
  "prettier": "^2.7.1",
63
+ "sinon": "^14.0.0",
62
64
  "tsd": "^0.21.0",
63
65
  "typedoc": "^0.23.6",
64
66
  "typescript": "4.7.4"