Skip to content

Commit f257ae4

Browse files
committed
fix next branch following rebase.
1 parent d0bda20 commit f257ae4

10 files changed

Lines changed: 36 additions & 24 deletions

File tree

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
"devDependencies": {
111111
"@arethetypeswrong/cli": "^0.18.2",
112112
"@ark/attest": "^0.55.0",
113+
"@electric-sql/pglite": "^0.3.14",
113114
"@types/better-sqlite3": "^7.6.13",
114115
"@types/chai": "^5.2.3",
115116
"@types/chai-as-promised": "^8.0.2",

pnpm-lock.yaml

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/driver/runtime-driver.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import type { DialectAdapter } from '../dialect/dialect-adapter.js'
12
import type { CompiledQuery } from '../query-compiler/compiled-query.js'
23
import type { QueryCompiler } from '../query-compiler/query-compiler.js'
34
import type { Log } from '../util/log.js'
45
import { performanceNow } from '../util/performance-now.js'
6+
import { ConnectionMutex } from './connection-mutex.js'
57
import type { DatabaseConnection, QueryResult } from './database-connection.js'
68
import type { Driver, TransactionSettings } from './driver.js'
79

src/operation-node/create-table-node.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type { TableNode } from './table-node.js'
44
import type { ConstraintNode } from './constraint-node.js'
55
import type { ColumnDefinitionNode } from './column-definition-node.js'
66
import type { ArrayItemType } from '../util/type-utils.js'
7+
import type { AddIndexNode } from './add-index-node.js'
78

89
export const ON_COMMIT_ACTIONS = ['preserve rows', 'delete rows', 'drop']
910
export type OnCommitAction = ArrayItemType<typeof ON_COMMIT_ACTIONS>

src/plugin/safe-null-comparison/safe-null-comparison-plugin.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { QueryResult } from '../../driver/database-connection.js'
2-
import { RootOperationNode } from '../../query-compiler/query-compiler.js'
3-
import { UnknownRow } from '../../util/type-utils.js'
4-
import {
1+
import type { QueryResult } from '../../driver/database-connection.js'
2+
import type { RootOperationNode } from '../../query-compiler/query-compiler.js'
3+
import type { UnknownRow } from '../../util/type-utils.js'
4+
import type {
55
KyselyPlugin,
66
PluginTransformQueryArgs,
77
PluginTransformResultArgs,

src/query-builder/case-builder.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
import type { Expression } from '../expression/expression.js'
22
import { ExpressionWrapper } from '../expression/expression-wrapper.js'
33
import { freeze } from '../util/object-utils.js'
4-
import type { ReferenceExpression } from '../parser/reference-parser.js'
4+
import {
5+
parseReferenceExpression,
6+
type ExtractTypeFromReferenceExpression,
7+
type ReferenceExpression,
8+
} from '../parser/reference-parser.js'
59
import { CaseNode } from '../operation-node/case-node.js'
610
import { WhenNode } from '../operation-node/when-node.js'
711
import {
812
type ComparisonOperatorExpression,
913
type OperandValueExpressionOrList,
14+
parseReferentialBinaryOperation,
1015
parseValueBinaryOperationOrExpression,
1116
} from '../parser/binary-operation-parser.js'
1217
import {
@@ -222,7 +227,7 @@ export class CaseWhenBuilder<DB, TB extends keyof DB, W, O>
222227
* Adds an `else` clause to the `case` statement where the value is a reference to a column.
223228
*
224229
* See {@link else} for value-first variant.
225-
*
230+
*
226231
* An `elseRef` call must be followed by an {@link Endable.end} or {@link Endable.endCase} call.
227232
*/
228233
elseRef<RE extends ReferenceExpression<DB, TB>>(

src/schema/alter-table-builder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type { OperationNodeSource } from '../operation-node/operation-node-sourc
77
import { RenameColumnNode } from '../operation-node/rename-column-node.js'
88
import type { CompiledQuery } from '../query-compiler/compiled-query.js'
99
import type { Compilable } from '../util/compilable.js'
10-
import { freeze, noop } from '../util/object-utils.js'
10+
import { freeze, isString, noop } from '../util/object-utils.js'
1111
import {
1212
ColumnDefinitionBuilder,
1313
type ColumnDefinitionBuilderCallback,
@@ -56,7 +56,7 @@ import {
5656
} from './check-constraint-builder.js'
5757
import { RenameConstraintNode } from '../operation-node/rename-constraint-node.js'
5858
import {
59-
ExpressionOrFactory,
59+
type ExpressionOrFactory,
6060
parseExpression,
6161
} from '../parser/expression-parser.js'
6262

src/schema/create-table-add-index-builder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AddIndexNode } from '../operation-node/add-index-node.js'
2-
import { IndexType } from '../operation-node/create-index-node.js'
3-
import { OperationNodeSource } from '../operation-node/operation-node-source.js'
2+
import type { IndexType } from '../operation-node/create-index-node.js'
3+
import type { OperationNodeSource } from '../operation-node/operation-node-source.js'
44
import { RawNode } from '../operation-node/raw-node.js'
55

66
export class CreateTableAddIndexBuilder implements OperationNodeSource {

src/schema/create-table-builder.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import type { Compilable } from '../util/compilable.js'
99
import type { QueryExecutor } from '../query-executor/query-executor.js'
1010
import { ColumnDefinitionBuilder } from './column-definition-builder.js'
1111
import type { QueryId } from '../util/query-id.js'
12-
import { freeze, noop } from '../util/object-utils.js'
12+
import { freeze, isString, noop } from '../util/object-utils.js'
1313
import { ForeignKeyConstraintNode } from '../operation-node/foreign-key-constraint-node.js'
1414
import { ColumnNode } from '../operation-node/column-node.js'
1515
import {
@@ -31,7 +31,7 @@ import {
3131
type UniqueConstraintNodeBuilderCallback,
3232
} from './unique-constraint-builder.js'
3333
import {
34-
ExpressionOrFactory,
34+
type ExpressionOrFactory,
3535
parseExpression,
3636
} from '../parser/expression-parser.js'
3737
import {
@@ -45,7 +45,7 @@ import {
4545
import { AddIndexNode } from '../operation-node/add-index-node.js'
4646
import {
4747
CreateTableAddIndexBuilder,
48-
CreateTableAddIndexBuilderCallback,
48+
type CreateTableAddIndexBuilderCallback,
4949
} from './create-table-add-index-builder.js'
5050

5151
/**

test/node/src/with-schema.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,8 @@ for (const dialect of DIALECTS) {
337337

338338
await query.execute()
339339
})
340-
})
341340

342-
if (dialect === 'postgres') {
341+
if (sqlSpec === 'postgres') {
343342
it('should also add schema to using clause', async () => {
344343
const query = ctx.db
345344
.withSchema('mammals')
@@ -363,12 +362,13 @@ for (const dialect of DIALECTS) {
363362
}
364363
})
365364

366-
describe('delete from', () => {
367-
it('should add schema', async () => {
368-
const query = ctx.db
369-
.withSchema('mammals')
370-
.deleteFrom('pet')
371-
.where('pet.name', '=', 'Doggo')
365+
describe('update', () => {
366+
it('should add schema', async () => {
367+
const query = ctx.db
368+
.withSchema('mammals')
369+
.updateTable('pet')
370+
.where('pet.name', '=', 'Doggo')
371+
.set({ species: 'cat' })
372372

373373
testSql(query, dialect, {
374374
postgres: {

0 commit comments

Comments
 (0)