Skip to content

Commit

Permalink
style: format source files
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Aug 28, 2020
1 parent 6b84db3 commit e10c01e
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 19 deletions.
3 changes: 2 additions & 1 deletion adonis-typings/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ declare module '@ioc:Adonis/Lucid/Model' {
export interface ModelQueryBuilderContract<
Model extends LucidModel,
Result extends any = InstanceType<Model>
> extends ChainableContract, ExcutableQueryBuilderContract<Result[]> {
> extends ChainableContract,
ExcutableQueryBuilderContract<Result[]> {
model: Model

/**
Expand Down
2 changes: 1 addition & 1 deletion npm-audit.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h5 class="card-title">
<div class="card">
<div class="card-body">
<h5 class="card-title">
August 28th 2020, 2:22:15 pm
August 28th 2020, 2:29:53 pm
</h5>
<p class="card-text">Last updated</p>
</div>
Expand Down
16 changes: 9 additions & 7 deletions src/Database/QueryBuilder/Chainable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1027,13 +1027,15 @@ export abstract class Chainable extends Macroable implements ChainableContract {
}

if (Array.isArray(column)) {
this.knexQuery.orderBy(column.map((col) => {
if (col.column) {
col.column = this.resolveKey(col.column)
return col
}
return this.resolveKey(col)
}))
this.knexQuery.orderBy(
column.map((col) => {
if (col.column) {
col.column = this.resolveKey(col.column)
return col
}
return this.resolveKey(col)
})
)
return this
}

Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/Base/QueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import { ModelQueryBuilder } from '../../QueryBuilder'
/**
* Base query builder for ORM Relationships
*/
export abstract class BaseQueryBuilder extends ModelQueryBuilder
export abstract class BaseQueryBuilder
extends ModelQueryBuilder
implements RelationQueryBuilderContract<LucidModel, LucidRow> {
/**
* Eager constraints
Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/Base/SubQueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import { ModelQueryBuilder } from '../../QueryBuilder'
/**
* Base query builder for ORM Relationships
*/
export abstract class BaseSubQueryBuilder extends ModelQueryBuilder
export abstract class BaseSubQueryBuilder
extends ModelQueryBuilder
implements RelationSubQueryBuilderContract<LucidModel> {
/**
* The counter for the self join alias. Usually will be set by
Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/BelongsTo/SubQueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import { RelationSubQueryBuilderContract } from '@ioc:Adonis/Lucid/Relations'
import { BelongsTo } from './index'
import { BaseSubQueryBuilder } from '../Base/SubQueryBuilder'

export class BelongsToSubQueryBuilder extends BaseSubQueryBuilder
export class BelongsToSubQueryBuilder
extends BaseSubQueryBuilder
implements RelationSubQueryBuilderContract<LucidModel> {
protected appliedConstraints: boolean = false

Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/HasMany/QueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import { BaseQueryBuilder } from '../Base/QueryBuilder'
* Extends the model query builder for executing queries in scope
* to the current relationship
*/
export class HasManyQueryBuilder extends BaseQueryBuilder
export class HasManyQueryBuilder
extends BaseQueryBuilder
implements HasManyQueryBuilderContract<LucidModel, LucidModel> {
protected appliedConstraints: boolean = false

Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/HasMany/SubQueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import { RelationSubQueryBuilderContract } from '@ioc:Adonis/Lucid/Relations'
import { HasMany } from './index'
import { BaseSubQueryBuilder } from '../Base/SubQueryBuilder'

export class HasManySubQueryBuilder extends BaseSubQueryBuilder
export class HasManySubQueryBuilder
extends BaseSubQueryBuilder
implements RelationSubQueryBuilderContract<LucidModel> {
protected appliedConstraints: boolean = false

Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/HasManyThrough/QueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import { BaseQueryBuilder } from '../Base/QueryBuilder'
* Extends the model query builder for executing queries in scope
* to the current relationship
*/
export class HasManyThroughQueryBuilder extends BaseQueryBuilder
export class HasManyThroughQueryBuilder
extends BaseQueryBuilder
implements HasManyThroughQueryBuilderContract<LucidModel, LucidModel> {
protected cherryPickingKeys: boolean = false
protected appliedConstraints: boolean = false
Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/HasManyThrough/SubQueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import { BaseSubQueryBuilder } from '../Base/SubQueryBuilder'
* Extends the model query builder for executing queries in scope
* to the current relationship
*/
export class HasManyThroughSubQueryBuilder extends BaseSubQueryBuilder
export class HasManyThroughSubQueryBuilder
extends BaseSubQueryBuilder
implements RelationSubQueryBuilderContract<LucidModel> {
/**
* A boolean to track if query constraints for the relationship
Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/HasOne/SubQueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import { RelationSubQueryBuilderContract } from '@ioc:Adonis/Lucid/Relations'
import { HasOne } from './index'
import { BaseSubQueryBuilder } from '../Base/SubQueryBuilder'

export class HasOneSubQueryBuilder extends BaseSubQueryBuilder
export class HasOneSubQueryBuilder
extends BaseSubQueryBuilder
implements RelationSubQueryBuilderContract<LucidModel> {
protected appliedConstraints: boolean = false

Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/ManyToMany/QueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import { BaseQueryBuilder } from '../Base/QueryBuilder'
* Extends the model query builder for executing queries in scope
* to the current relationship
*/
export class ManyToManyQueryBuilder extends BaseQueryBuilder
export class ManyToManyQueryBuilder
extends BaseQueryBuilder
implements ManyToManyQueryBuilderContract<LucidModel, LucidModel> {
private pivotQuery = false
private relatedTable = this.relation.relatedModel().table
Expand Down
3 changes: 2 additions & 1 deletion src/Orm/Relations/ManyToMany/SubQueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import { BaseSubQueryBuilder } from '../Base/SubQueryBuilder'
/**
* Exposes the API to construct sub queries for a many to many relationships
*/
export class ManyToManySubQueryBuilder extends BaseSubQueryBuilder
export class ManyToManySubQueryBuilder
extends BaseSubQueryBuilder
implements ManyToManySubQueryBuilderContract<LucidModel> {
/**
* Pivot helpers provides the implementation for pivot table constraints
Expand Down

0 comments on commit e10c01e

Please sign in to comment.