diff --git a/src/dialect/postgres/postgres-introspector.ts b/src/dialect/postgres/postgres-introspector.ts index 956cf7ab2..c8c10c43a 100644 --- a/src/dialect/postgres/postgres-introspector.ts +++ b/src/dialect/postgres/postgres-introspector.ts @@ -73,7 +73,11 @@ export class PostgresIntrospector implements DatabaseIntrospector { ]) // r == normal table .where((eb) => - eb.or([eb('c.relkind', '=', 'r'), eb('c.relkind', '=', 'v'), eb('c.relkind', '=', 'p')]), + eb.or([ + eb('c.relkind', '=', 'r'), + eb('c.relkind', '=', 'v'), + eb('c.relkind', '=', 'p'), + ]), ) .where('ns.nspname', '!~', '^pg_') .where('ns.nspname', '!=', 'information_schema') diff --git a/src/operation-node/output-node.ts b/src/operation-node/output-node.ts index 6f28c6b4b..07331253b 100644 --- a/src/operation-node/output-node.ts +++ b/src/operation-node/output-node.ts @@ -23,7 +23,7 @@ export const OutputNode = freeze({ cloneWithSelections( output: OutputNode, - selections: ReadonlyArray + selections: ReadonlyArray, ): OutputNode { return freeze({ ...output, diff --git a/src/operation-node/select-query-node.ts b/src/operation-node/select-query-node.ts index 53ade1b19..e111d3dfd 100644 --- a/src/operation-node/select-query-node.ts +++ b/src/operation-node/select-query-node.ts @@ -147,7 +147,7 @@ export const SelectQueryNode = freeze({ cloneWithFetch( selectNode: SelectQueryNode, - fetch: FetchNode + fetch: FetchNode, ): SelectQueryNode { return freeze({ ...selectNode, diff --git a/src/parser/select-parser.ts b/src/parser/select-parser.ts index f39fbbc44..8bfd43480 100644 --- a/src/parser/select-parser.ts +++ b/src/parser/select-parser.ts @@ -73,9 +73,10 @@ export type SelectArg< | ReadonlyArray | ((eb: ExpressionBuilder) => ReadonlyArray) -type FlattenSelectExpression = SE extends DynamicReferenceBuilder - ? { [R in RA]: DynamicReferenceBuilder }[RA] - : SE +type FlattenSelectExpression = + SE extends DynamicReferenceBuilder + ? { [R in RA]: DynamicReferenceBuilder }[RA] + : SE type ExtractAliasFromSelectExpression = SE extends string ? ExtractAliasFromStringSelectExpression diff --git a/src/parser/value-parser.ts b/src/parser/value-parser.ts index 51bacd43c..99c195cac 100644 --- a/src/parser/value-parser.ts +++ b/src/parser/value-parser.ts @@ -24,11 +24,10 @@ export type ValueExpressionOrList = | ValueExpression | ReadonlyArray> -export type ExtractTypeFromValueExpressionOrList = VE extends ReadonlyArray< - infer AV -> - ? ExtractTypeFromValueExpression - : ExtractTypeFromValueExpression +export type ExtractTypeFromValueExpressionOrList = + VE extends ReadonlyArray + ? ExtractTypeFromValueExpression + : ExtractTypeFromValueExpression export type ExtractTypeFromValueExpression = VE extends SelectQueryBuilderExpression> diff --git a/src/query-builder/delete-query-builder.ts b/src/query-builder/delete-query-builder.ts index c60e817c7..3e3de6a77 100644 --- a/src/query-builder/delete-query-builder.ts +++ b/src/query-builder/delete-query-builder.ts @@ -626,7 +626,7 @@ export class DeleteQueryBuilder } output>( - selections: readonly OE[] + selections: readonly OE[], ): DeleteQueryBuilder< DB, TB, @@ -634,7 +634,7 @@ export class DeleteQueryBuilder > output>( - callback: CB + callback: CB, ): DeleteQueryBuilder< DB, TB, @@ -642,7 +642,7 @@ export class DeleteQueryBuilder > output>( - selection: OE + selection: OE, ): DeleteQueryBuilder< DB, TB, @@ -654,19 +654,19 @@ export class DeleteQueryBuilder ...this.#props, queryNode: QueryNode.cloneWithOutput( this.#props.queryNode, - parseSelectArg(args) + parseSelectArg(args), ), }) } outputAll( - table: 'deleted' + table: 'deleted', ): DeleteQueryBuilder> { return new DeleteQueryBuilder({ ...this.#props, queryNode: QueryNode.cloneWithOutput( this.#props.queryNode, - parseSelectAll(table) + parseSelectAll(table), ), }) } @@ -823,7 +823,6 @@ export class DeleteQueryBuilder }) } - /** * This can be used to add any additional SQL to the end of the query. * @@ -853,7 +852,6 @@ export class DeleteQueryBuilder }) } - /** * Simply calls the provided function passing `this` as the only argument. `$call` returns * what the provided function returns. @@ -921,8 +919,8 @@ export class DeleteQueryBuilder ): O2 extends DeleteResult ? DeleteQueryBuilder : O2 extends O & infer E - ? DeleteQueryBuilder> - : DeleteQueryBuilder> { + ? DeleteQueryBuilder> + : DeleteQueryBuilder> { if (condition) { return func(this) as any } @@ -1176,12 +1174,12 @@ export type DeleteQueryBuilderWithInnerJoin< ? InnerJoinedBuilder : never : TE extends keyof DB - ? DeleteQueryBuilder - : TE extends AliasedExpression - ? InnerJoinedBuilder - : TE extends (qb: any) => AliasedExpression - ? InnerJoinedBuilder - : never + ? DeleteQueryBuilder + : TE extends AliasedExpression + ? InnerJoinedBuilder + : TE extends (qb: any) => AliasedExpression + ? InnerJoinedBuilder + : never type InnerJoinedBuilder< DB, @@ -1208,12 +1206,12 @@ export type DeleteQueryBuilderWithLeftJoin< ? LeftJoinedBuilder : never : TE extends keyof DB - ? LeftJoinedBuilder - : TE extends AliasedExpression - ? LeftJoinedBuilder - : TE extends (qb: any) => AliasedExpression - ? LeftJoinedBuilder - : never + ? LeftJoinedBuilder + : TE extends AliasedExpression + ? LeftJoinedBuilder + : TE extends (qb: any) => AliasedExpression + ? LeftJoinedBuilder + : never type LeftJoinedBuilder< DB, @@ -1230,8 +1228,8 @@ type LeftJoinedDB = DrainOuterGeneric<{ [C in keyof DB | A]: C extends A ? Nullable : C extends keyof DB - ? DB[C] - : never + ? DB[C] + : never }> export type DeleteQueryBuilderWithRightJoin< @@ -1244,12 +1242,12 @@ export type DeleteQueryBuilderWithRightJoin< ? RightJoinedBuilder : never : TE extends keyof DB - ? RightJoinedBuilder - : TE extends AliasedExpression - ? RightJoinedBuilder - : TE extends (qb: any) => AliasedExpression - ? RightJoinedBuilder - : never + ? RightJoinedBuilder + : TE extends AliasedExpression + ? RightJoinedBuilder + : TE extends (qb: any) => AliasedExpression + ? RightJoinedBuilder + : never type RightJoinedBuilder< DB, @@ -1268,10 +1266,10 @@ type RightJoinedDB< [C in keyof DB | A]: C extends A ? R : C extends TB - ? Nullable - : C extends keyof DB - ? DB[C] - : never + ? Nullable + : C extends keyof DB + ? DB[C] + : never }> export type DeleteQueryBuilderWithFullJoin< @@ -1284,12 +1282,12 @@ export type DeleteQueryBuilderWithFullJoin< ? OuterJoinedBuilder : never : TE extends keyof DB - ? OuterJoinedBuilder - : TE extends AliasedExpression - ? OuterJoinedBuilder - : TE extends (qb: any) => AliasedExpression - ? OuterJoinedBuilder - : never + ? OuterJoinedBuilder + : TE extends AliasedExpression + ? OuterJoinedBuilder + : TE extends (qb: any) => AliasedExpression + ? OuterJoinedBuilder + : never type OuterJoinedBuilder< DB, @@ -1308,8 +1306,8 @@ type OuterJoinedBuilderDB< [C in keyof DB | A]: C extends A ? Nullable : C extends TB - ? Nullable - : C extends keyof DB - ? DB[C] - : never + ? Nullable + : C extends keyof DB + ? DB[C] + : never }> diff --git a/src/query-builder/insert-query-builder.ts b/src/query-builder/insert-query-builder.ts index 6b6a6614b..21a850bab 100644 --- a/src/query-builder/insert-query-builder.ts +++ b/src/query-builder/insert-query-builder.ts @@ -350,7 +350,6 @@ export class InsertQueryBuilder }) } - /** * This can be used to add any additional SQL to the end of the query. * @@ -366,7 +365,7 @@ export class InsertQueryBuilder * The generated SQL (MySQL): * * ```sql - * insert into `person` + * insert into `person` * values (?, ?, ?) -- This is a comment * ``` */ @@ -705,7 +704,7 @@ export class InsertQueryBuilder } output>( - selections: readonly OE[] + selections: readonly OE[], ): InsertQueryBuilder< DB, TB, @@ -713,7 +712,7 @@ export class InsertQueryBuilder > output>( - callback: CB + callback: CB, ): InsertQueryBuilder< DB, TB, @@ -721,7 +720,7 @@ export class InsertQueryBuilder > output>( - selection: OE + selection: OE, ): InsertQueryBuilder< DB, TB, @@ -733,19 +732,19 @@ export class InsertQueryBuilder ...this.#props, queryNode: QueryNode.cloneWithOutput( this.#props.queryNode, - parseSelectArg(args) + parseSelectArg(args), ), }) } outputAll( - table: 'inserted' + table: 'inserted', ): InsertQueryBuilder> { return new InsertQueryBuilder({ ...this.#props, queryNode: QueryNode.cloneWithOutput( this.#props.queryNode, - parseSelectAll(table) + parseSelectAll(table), ), }) } @@ -843,8 +842,8 @@ export class InsertQueryBuilder ): O2 extends InsertResult ? InsertQueryBuilder : O2 extends O & infer E - ? InsertQueryBuilder> - : InsertQueryBuilder> { + ? InsertQueryBuilder> + : InsertQueryBuilder> { if (condition) { return func(this) as any } diff --git a/src/query-builder/merge-query-builder.ts b/src/query-builder/merge-query-builder.ts index 9a63c2a21..8bb9881a7 100644 --- a/src/query-builder/merge-query-builder.ts +++ b/src/query-builder/merge-query-builder.ts @@ -85,7 +85,7 @@ export class MergeQueryBuilder * .modifyEnd(sql.raw('-- this is a comment')) * .execute() * ``` - * + * * The generated SQL (PostgreSQL): * * ```sql @@ -301,14 +301,16 @@ export class WheneableMergeQueryBuilder< * .modifyEnd(sql.raw('-- this is a comment')) * .execute() * ``` - * + * * The generated SQL (PostgreSQL): * * ```sql * merge into "person" using "pet" on "pet"."owner_id" = "person"."id" when matched then delete -- this is a comment * ``` */ - modifyEnd(modifier: Expression): WheneableMergeQueryBuilder { + modifyEnd( + modifier: Expression, + ): WheneableMergeQueryBuilder { return new WheneableMergeQueryBuilder({ ...this.#props, queryNode: QueryNode.cloneWithEndModifier( diff --git a/src/query-builder/select-query-builder.ts b/src/query-builder/select-query-builder.ts index 728fbd05d..29dd89be7 100644 --- a/src/query-builder/select-query-builder.ts +++ b/src/query-builder/select-query-builder.ts @@ -2504,12 +2504,12 @@ export type SelectQueryBuilderWithInnerJoin< ? InnerJoinedBuilder : never : TE extends keyof DB - ? SelectQueryBuilder - : TE extends AliasedExpression - ? InnerJoinedBuilder - : TE extends (qb: any) => AliasedExpression - ? InnerJoinedBuilder - : never + ? SelectQueryBuilder + : TE extends AliasedExpression + ? InnerJoinedBuilder + : TE extends (qb: any) => AliasedExpression + ? InnerJoinedBuilder + : never type InnerJoinedBuilder< DB, @@ -2536,12 +2536,12 @@ export type SelectQueryBuilderWithLeftJoin< ? LeftJoinedBuilder : never : TE extends keyof DB - ? LeftJoinedBuilder - : TE extends AliasedExpression - ? LeftJoinedBuilder - : TE extends (qb: any) => AliasedExpression - ? LeftJoinedBuilder - : never + ? LeftJoinedBuilder + : TE extends AliasedExpression + ? LeftJoinedBuilder + : TE extends (qb: any) => AliasedExpression + ? LeftJoinedBuilder + : never type LeftJoinedBuilder< DB, @@ -2558,8 +2558,8 @@ type LeftJoinedDB = DrainOuterGeneric<{ [C in keyof DB | A]: C extends A ? Nullable : C extends keyof DB - ? DB[C] - : never + ? DB[C] + : never }> export type SelectQueryBuilderWithRightJoin< @@ -2572,12 +2572,12 @@ export type SelectQueryBuilderWithRightJoin< ? RightJoinedBuilder : never : TE extends keyof DB - ? RightJoinedBuilder - : TE extends AliasedExpression - ? RightJoinedBuilder - : TE extends (qb: any) => AliasedExpression - ? RightJoinedBuilder - : never + ? RightJoinedBuilder + : TE extends AliasedExpression + ? RightJoinedBuilder + : TE extends (qb: any) => AliasedExpression + ? RightJoinedBuilder + : never type RightJoinedBuilder< DB, @@ -2596,10 +2596,10 @@ type RightJoinedDB< [C in keyof DB | A]: C extends A ? R : C extends TB - ? Nullable - : C extends keyof DB - ? DB[C] - : never + ? Nullable + : C extends keyof DB + ? DB[C] + : never }> export type SelectQueryBuilderWithFullJoin< @@ -2612,12 +2612,12 @@ export type SelectQueryBuilderWithFullJoin< ? OuterJoinedBuilder : never : TE extends keyof DB - ? OuterJoinedBuilder - : TE extends AliasedExpression - ? OuterJoinedBuilder - : TE extends (qb: any) => AliasedExpression - ? OuterJoinedBuilder - : never + ? OuterJoinedBuilder + : TE extends AliasedExpression + ? OuterJoinedBuilder + : TE extends (qb: any) => AliasedExpression + ? OuterJoinedBuilder + : never type OuterJoinedBuilder< DB, @@ -2636,10 +2636,10 @@ type OuterJoinedBuilderDB< [C in keyof DB | A]: C extends A ? Nullable : C extends TB - ? Nullable - : C extends keyof DB - ? DB[C] - : never + ? Nullable + : C extends keyof DB + ? DB[C] + : never }> type TableOrList = diff --git a/src/query-builder/update-query-builder.ts b/src/query-builder/update-query-builder.ts index 4c6323737..b68704198 100644 --- a/src/query-builder/update-query-builder.ts +++ b/src/query-builder/update-query-builder.ts @@ -756,7 +756,7 @@ export class UpdateQueryBuilder * * ### Examples * - * ```ts + * ```ts * await db.updateTable('person') * .set({ age: 39 }) * .where('first_name', '=', 'John') diff --git a/src/query-builder/update-result.ts b/src/query-builder/update-result.ts index bd89b2071..45e689a47 100644 --- a/src/query-builder/update-result.ts +++ b/src/query-builder/update-result.ts @@ -1,7 +1,7 @@ export class UpdateResult { /** * The number of rows the update query updated (even if not changed). - */ + */ readonly numUpdatedRows: bigint /** @@ -9,7 +9,7 @@ export class UpdateResult { * * This is **optional** and only supported in dialects such as MySQL. * You would probably use {@link numUpdatedRows} in most cases. - */ + */ readonly numChangedRows?: bigint constructor(numUpdatedRows: bigint, numChangedRows: bigint | undefined) { diff --git a/src/schema/column-definition-builder.ts b/src/schema/column-definition-builder.ts index d68236655..817c07ee9 100644 --- a/src/schema/column-definition-builder.ts +++ b/src/schema/column-definition-builder.ts @@ -46,7 +46,7 @@ export class ColumnDefinitionBuilder implements OperationNodeSource { */ identity(): ColumnDefinitionBuilder { return new ColumnDefinitionBuilder( - ColumnDefinitionNode.cloneWith(this.#node, { identity: true }) + ColumnDefinitionNode.cloneWith(this.#node, { identity: true }), ) } diff --git a/src/util/type-utils.ts b/src/util/type-utils.ts index 1e0aee3a3..08d702e2d 100644 --- a/src/util/type-utils.ts +++ b/src/util/type-utils.ts @@ -148,11 +148,10 @@ export type IsAny = 0 extends T & 1 ? true : false /** * Evaluates to `true` if the types `T` and `U` are equal. */ -export type Equals = (() => G extends T ? 1 : 2) extends < - G, ->() => G extends U ? 1 : 2 - ? true - : false +export type Equals = + (() => G extends T ? 1 : 2) extends () => G extends U ? 1 : 2 + ? true + : false export type NarrowPartial = DrainOuterGeneric< T extends object diff --git a/test/node/src/delete.test.ts b/test/node/src/delete.test.ts index 69ee370a1..81f4fd386 100644 --- a/test/node/src/delete.test.ts +++ b/test/node/src/delete.test.ts @@ -876,9 +876,9 @@ for (const dialect of DIALECTS) { if (dialect === 'postgres' || dialect === 'mysql') { it('modifyEnd should add arbitrary SQL to the end of the query', async () => { const query = ctx.db - .deleteFrom('person') - .where('first_name', '=', 'Jennifer') - .modifyEnd(sql.raw('-- this is a comment')) + .deleteFrom('person') + .where('first_name', '=', 'Jennifer') + .modifyEnd(sql.raw('-- this is a comment')) testSql(query, dialect, { postgres: { diff --git a/test/node/src/insert.test.ts b/test/node/src/insert.test.ts index 91bf02d16..2d8069784 100644 --- a/test/node/src/insert.test.ts +++ b/test/node/src/insert.test.ts @@ -879,24 +879,24 @@ for (const dialect of DIALECTS) { if (dialect === 'postgres' || dialect === 'mysql') { it('modifyEnd should add arbitrary SQL to the end of the query', async () => { const query = ctx.db - .insertInto('person') - .values({ - gender: 'other' - }) - .modifyEnd(sql.raw('-- this is a comment')) + .insertInto('person') + .values({ + gender: 'other', + }) + .modifyEnd(sql.raw('-- this is a comment')) testSql(query, dialect, { - postgres: { - sql: 'insert into "person" ("gender") values ($1) -- this is a comment', - parameters: ['other'], - }, - mysql: { - sql: 'insert into `person` (`gender`) values (?) -- this is a comment', - parameters: ['other'], - }, - mssql: NOT_SUPPORTED, - sqlite: NOT_SUPPORTED, - }) + postgres: { + sql: 'insert into "person" ("gender") values ($1) -- this is a comment', + parameters: ['other'], + }, + mysql: { + sql: 'insert into `person` (`gender`) values (?) -- this is a comment', + parameters: ['other'], + }, + mssql: NOT_SUPPORTED, + sqlite: NOT_SUPPORTED, + }) const result = await query.execute() diff --git a/test/node/src/introspect.test.ts b/test/node/src/introspect.test.ts index 1aaa58350..24b4910c7 100644 --- a/test/node/src/introspect.test.ts +++ b/test/node/src/introspect.test.ts @@ -294,8 +294,8 @@ for (const dialect of DIALECTS) { hasDefaultValue: false, comment: undefined, }, - ] - } + ], + }, ]) } else if (dialect === 'mysql') { expect(meta).to.eql([ @@ -852,7 +852,7 @@ for (const dialect of DIALECTS) { await ctx.db.schema .createTable('some_schema.pet') .addColumn('some_column', 'integer', (col) => - col.identity().notNull().primaryKey() + col.identity().notNull().primaryKey(), ) .addColumn('some_column_plus_1', sql``, (col) => col.modifyEnd(sql`as (some_column + 1)`), @@ -863,7 +863,10 @@ for (const dialect of DIALECTS) { async function dropSchema() { await ctx.db.schema.dropTable('some_schema.pet').ifExists().execute() - await ctx.db.schema.dropTable('some_schema.pet_partition').ifExists().execute() + await ctx.db.schema + .dropTable('some_schema.pet_partition') + .ifExists() + .execute() await ctx.db.schema.dropSchema('some_schema').ifExists().execute() if (dialect === 'postgres') { diff --git a/test/node/src/update.test.ts b/test/node/src/update.test.ts index 1c1ffed41..b4afdc650 100644 --- a/test/node/src/update.test.ts +++ b/test/node/src/update.test.ts @@ -668,25 +668,25 @@ for (const dialect of DIALECTS) { if (dialect === 'postgres' || dialect === 'mysql') { it('modifyEnd should add arbitrary SQL to the end of the query', async () => { const query = ctx.db - .updateTable('person') - .set({ - gender: 'other' - }) - .where('first_name', '=', 'Jennifer') - .modifyEnd(sql.raw('-- this is a comment')) + .updateTable('person') + .set({ + gender: 'other', + }) + .where('first_name', '=', 'Jennifer') + .modifyEnd(sql.raw('-- this is a comment')) - testSql(query, dialect, { - postgres: { - sql: 'update "person" set "gender" = $1 where "first_name" = $2 -- this is a comment', - parameters: ['other', 'Jennifer'], - }, - mysql: { - sql: 'update `person` set `gender` = ? where `first_name` = ? -- this is a comment', - parameters: ['other', 'Jennifer'], - }, - mssql: NOT_SUPPORTED, - sqlite: NOT_SUPPORTED, - }) + testSql(query, dialect, { + postgres: { + sql: 'update "person" set "gender" = $1 where "first_name" = $2 -- this is a comment', + parameters: ['other', 'Jennifer'], + }, + mysql: { + sql: 'update `person` set `gender` = ? where `first_name` = ? -- this is a comment', + parameters: ['other', 'Jennifer'], + }, + mssql: NOT_SUPPORTED, + sqlite: NOT_SUPPORTED, + }) const result = await query.execute() diff --git a/test/typings/test-d/insert.test-d.ts b/test/typings/test-d/insert.test-d.ts index 371b06260..e8f049ba1 100644 --- a/test/typings/test-d/insert.test-d.ts +++ b/test/typings/test-d/insert.test-d.ts @@ -235,7 +235,7 @@ async function testOutput(db: Kysely) { .output([ 'inserted.id', sql`concat(inserted.first_name, ' ', inserted.last_name)`.as( - 'full_name' + 'full_name', ), ]) .values(person) @@ -253,7 +253,7 @@ async function testOutput(db: Kysely) { // Non-existent column expectError( - db.insertInto('person').output('inserted.not_column').values(person) + db.insertInto('person').output('inserted.not_column').values(person), ) // Without prefix