Skip to content

Commit

Permalink
chore: run prettier. (#1128)
Browse files Browse the repository at this point in the history
  • Loading branch information
igalklebanov authored Aug 25, 2024
1 parent 8ee0125 commit 4022a5e
Show file tree
Hide file tree
Showing 18 changed files with 159 additions and 154 deletions.
6 changes: 5 additions & 1 deletion src/dialect/postgres/postgres-introspector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion src/operation-node/output-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const OutputNode = freeze({

cloneWithSelections(
output: OutputNode,
selections: ReadonlyArray<OperationNode>
selections: ReadonlyArray<OperationNode>,
): OutputNode {
return freeze({
...output,
Expand Down
2 changes: 1 addition & 1 deletion src/operation-node/select-query-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export const SelectQueryNode = freeze({

cloneWithFetch(
selectNode: SelectQueryNode,
fetch: FetchNode
fetch: FetchNode,
): SelectQueryNode {
return freeze({
...selectNode,
Expand Down
7 changes: 4 additions & 3 deletions src/parser/select-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ export type SelectArg<
| ReadonlyArray<SE>
| ((eb: ExpressionBuilder<DB, TB>) => ReadonlyArray<SE>)

type FlattenSelectExpression<SE> = SE extends DynamicReferenceBuilder<infer RA>
? { [R in RA]: DynamicReferenceBuilder<R> }[RA]
: SE
type FlattenSelectExpression<SE> =
SE extends DynamicReferenceBuilder<infer RA>
? { [R in RA]: DynamicReferenceBuilder<R> }[RA]
: SE

type ExtractAliasFromSelectExpression<SE> = SE extends string
? ExtractAliasFromStringSelectExpression<SE>
Expand Down
9 changes: 4 additions & 5 deletions src/parser/value-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ export type ValueExpressionOrList<DB, TB extends keyof DB, V> =
| ValueExpression<DB, TB, V>
| ReadonlyArray<ValueExpression<DB, TB, V>>

export type ExtractTypeFromValueExpressionOrList<VE> = VE extends ReadonlyArray<
infer AV
>
? ExtractTypeFromValueExpression<AV>
: ExtractTypeFromValueExpression<VE>
export type ExtractTypeFromValueExpressionOrList<VE> =
VE extends ReadonlyArray<infer AV>
? ExtractTypeFromValueExpression<AV>
: ExtractTypeFromValueExpression<VE>

export type ExtractTypeFromValueExpression<VE> =
VE extends SelectQueryBuilderExpression<Record<string, infer SV>>
Expand Down
86 changes: 42 additions & 44 deletions src/query-builder/delete-query-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -626,23 +626,23 @@ export class DeleteQueryBuilder<DB, TB extends keyof DB, O>
}

output<OE extends OutputExpression<DB, TB, 'deleted'>>(
selections: readonly OE[]
selections: readonly OE[],
): DeleteQueryBuilder<
DB,
TB,
ReturningRow<DB, TB, O, SelectExpressionFromOutputExpression<OE>>
>

output<CB extends OutputCallback<DB, TB, 'deleted'>>(
callback: CB
callback: CB,
): DeleteQueryBuilder<
DB,
TB,
ReturningRow<DB, TB, O, SelectExpressionFromOutputCallback<CB>>
>

output<OE extends OutputExpression<DB, TB, 'deleted'>>(
selection: OE
selection: OE,
): DeleteQueryBuilder<
DB,
TB,
Expand All @@ -654,19 +654,19 @@ export class DeleteQueryBuilder<DB, TB extends keyof DB, O>
...this.#props,
queryNode: QueryNode.cloneWithOutput(
this.#props.queryNode,
parseSelectArg(args)
parseSelectArg(args),
),
})
}

outputAll(
table: 'deleted'
table: 'deleted',
): DeleteQueryBuilder<DB, TB, ReturningAllRow<DB, TB, O>> {
return new DeleteQueryBuilder({
...this.#props,
queryNode: QueryNode.cloneWithOutput(
this.#props.queryNode,
parseSelectAll(table)
parseSelectAll(table),
),
})
}
Expand Down Expand Up @@ -823,7 +823,6 @@ export class DeleteQueryBuilder<DB, TB extends keyof DB, O>
})
}


/**
* This can be used to add any additional SQL to the end of the query.
*
Expand Down Expand Up @@ -853,7 +852,6 @@ export class DeleteQueryBuilder<DB, TB extends keyof DB, O>
})
}


/**
* Simply calls the provided function passing `this` as the only argument. `$call` returns
* what the provided function returns.
Expand Down Expand Up @@ -921,8 +919,8 @@ export class DeleteQueryBuilder<DB, TB extends keyof DB, O>
): O2 extends DeleteResult
? DeleteQueryBuilder<DB, TB, DeleteResult>
: O2 extends O & infer E
? DeleteQueryBuilder<DB, TB, O & Partial<E>>
: DeleteQueryBuilder<DB, TB, Partial<O2>> {
? DeleteQueryBuilder<DB, TB, O & Partial<E>>
: DeleteQueryBuilder<DB, TB, Partial<O2>> {
if (condition) {
return func(this) as any
}
Expand Down Expand Up @@ -1176,12 +1174,12 @@ export type DeleteQueryBuilderWithInnerJoin<
? InnerJoinedBuilder<DB, TB, O, A, DB[T]>
: never
: TE extends keyof DB
? DeleteQueryBuilder<DB, TB | TE, O>
: TE extends AliasedExpression<infer QO, infer QA>
? InnerJoinedBuilder<DB, TB, O, QA, QO>
: TE extends (qb: any) => AliasedExpression<infer QO, infer QA>
? InnerJoinedBuilder<DB, TB, O, QA, QO>
: never
? DeleteQueryBuilder<DB, TB | TE, O>
: TE extends AliasedExpression<infer QO, infer QA>
? InnerJoinedBuilder<DB, TB, O, QA, QO>
: TE extends (qb: any) => AliasedExpression<infer QO, infer QA>
? InnerJoinedBuilder<DB, TB, O, QA, QO>
: never

type InnerJoinedBuilder<
DB,
Expand All @@ -1208,12 +1206,12 @@ export type DeleteQueryBuilderWithLeftJoin<
? LeftJoinedBuilder<DB, TB, O, A, DB[T]>
: never
: TE extends keyof DB
? LeftJoinedBuilder<DB, TB, O, TE, DB[TE]>
: TE extends AliasedExpression<infer QO, infer QA>
? LeftJoinedBuilder<DB, TB, O, QA, QO>
: TE extends (qb: any) => AliasedExpression<infer QO, infer QA>
? LeftJoinedBuilder<DB, TB, O, QA, QO>
: never
? LeftJoinedBuilder<DB, TB, O, TE, DB[TE]>
: TE extends AliasedExpression<infer QO, infer QA>
? LeftJoinedBuilder<DB, TB, O, QA, QO>
: TE extends (qb: any) => AliasedExpression<infer QO, infer QA>
? LeftJoinedBuilder<DB, TB, O, QA, QO>
: never

type LeftJoinedBuilder<
DB,
Expand All @@ -1230,8 +1228,8 @@ type LeftJoinedDB<DB, A extends keyof any, R> = DrainOuterGeneric<{
[C in keyof DB | A]: C extends A
? Nullable<R>
: C extends keyof DB
? DB[C]
: never
? DB[C]
: never
}>

export type DeleteQueryBuilderWithRightJoin<
Expand All @@ -1244,12 +1242,12 @@ export type DeleteQueryBuilderWithRightJoin<
? RightJoinedBuilder<DB, TB, O, A, DB[T]>
: never
: TE extends keyof DB
? RightJoinedBuilder<DB, TB, O, TE, DB[TE]>
: TE extends AliasedExpression<infer QO, infer QA>
? RightJoinedBuilder<DB, TB, O, QA, QO>
: TE extends (qb: any) => AliasedExpression<infer QO, infer QA>
? RightJoinedBuilder<DB, TB, O, QA, QO>
: never
? RightJoinedBuilder<DB, TB, O, TE, DB[TE]>
: TE extends AliasedExpression<infer QO, infer QA>
? RightJoinedBuilder<DB, TB, O, QA, QO>
: TE extends (qb: any) => AliasedExpression<infer QO, infer QA>
? RightJoinedBuilder<DB, TB, O, QA, QO>
: never

type RightJoinedBuilder<
DB,
Expand All @@ -1268,10 +1266,10 @@ type RightJoinedDB<
[C in keyof DB | A]: C extends A
? R
: C extends TB
? Nullable<DB[C]>
: C extends keyof DB
? DB[C]
: never
? Nullable<DB[C]>
: C extends keyof DB
? DB[C]
: never
}>

export type DeleteQueryBuilderWithFullJoin<
Expand All @@ -1284,12 +1282,12 @@ export type DeleteQueryBuilderWithFullJoin<
? OuterJoinedBuilder<DB, TB, O, A, DB[T]>
: never
: TE extends keyof DB
? OuterJoinedBuilder<DB, TB, O, TE, DB[TE]>
: TE extends AliasedExpression<infer QO, infer QA>
? OuterJoinedBuilder<DB, TB, O, QA, QO>
: TE extends (qb: any) => AliasedExpression<infer QO, infer QA>
? OuterJoinedBuilder<DB, TB, O, QA, QO>
: never
? OuterJoinedBuilder<DB, TB, O, TE, DB[TE]>
: TE extends AliasedExpression<infer QO, infer QA>
? OuterJoinedBuilder<DB, TB, O, QA, QO>
: TE extends (qb: any) => AliasedExpression<infer QO, infer QA>
? OuterJoinedBuilder<DB, TB, O, QA, QO>
: never

type OuterJoinedBuilder<
DB,
Expand All @@ -1308,8 +1306,8 @@ type OuterJoinedBuilderDB<
[C in keyof DB | A]: C extends A
? Nullable<R>
: C extends TB
? Nullable<DB[C]>
: C extends keyof DB
? DB[C]
: never
? Nullable<DB[C]>
: C extends keyof DB
? DB[C]
: never
}>
19 changes: 9 additions & 10 deletions src/query-builder/insert-query-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
})
}


/**
* This can be used to add any additional SQL to the end of the query.
*
Expand All @@ -366,7 +365,7 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
* The generated SQL (MySQL):
*
* ```sql
* insert into `person`
* insert into `person`
* values (?, ?, ?) -- This is a comment
* ```
*/
Expand Down Expand Up @@ -705,23 +704,23 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
}

output<OE extends OutputExpression<DB, TB, 'inserted'>>(
selections: readonly OE[]
selections: readonly OE[],
): InsertQueryBuilder<
DB,
TB,
ReturningRow<DB, TB, O, SelectExpressionFromOutputExpression<OE>>
>

output<CB extends OutputCallback<DB, TB, 'inserted'>>(
callback: CB
callback: CB,
): InsertQueryBuilder<
DB,
TB,
ReturningRow<DB, TB, O, SelectExpressionFromOutputCallback<CB>>
>

output<OE extends OutputExpression<DB, TB, 'inserted'>>(
selection: OE
selection: OE,
): InsertQueryBuilder<
DB,
TB,
Expand All @@ -733,19 +732,19 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
...this.#props,
queryNode: QueryNode.cloneWithOutput(
this.#props.queryNode,
parseSelectArg(args)
parseSelectArg(args),
),
})
}

outputAll(
table: 'inserted'
table: 'inserted',
): InsertQueryBuilder<DB, TB, ReturningAllRow<DB, TB, O>> {
return new InsertQueryBuilder({
...this.#props,
queryNode: QueryNode.cloneWithOutput(
this.#props.queryNode,
parseSelectAll(table)
parseSelectAll(table),
),
})
}
Expand Down Expand Up @@ -843,8 +842,8 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
): O2 extends InsertResult
? InsertQueryBuilder<DB, TB, InsertResult>
: O2 extends O & infer E
? InsertQueryBuilder<DB, TB, O & Partial<E>>
: InsertQueryBuilder<DB, TB, Partial<O2>> {
? InsertQueryBuilder<DB, TB, O & Partial<E>>
: InsertQueryBuilder<DB, TB, Partial<O2>> {
if (condition) {
return func(this) as any
}
Expand Down
8 changes: 5 additions & 3 deletions src/query-builder/merge-query-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class MergeQueryBuilder<DB, TT extends keyof DB, O>
* .modifyEnd(sql.raw('-- this is a comment'))
* .execute()
* ```
*
*
* The generated SQL (PostgreSQL):
*
* ```sql
Expand Down Expand Up @@ -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<any>): WheneableMergeQueryBuilder<DB, TT, ST, O> {
modifyEnd(
modifier: Expression<any>,
): WheneableMergeQueryBuilder<DB, TT, ST, O> {
return new WheneableMergeQueryBuilder({
...this.#props,
queryNode: QueryNode.cloneWithEndModifier(
Expand Down
Loading

0 comments on commit 4022a5e

Please sign in to comment.