kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-24 05:06:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed the JoinClause's interface for on, andOn and orOn to accept a callback that takes another JoinClause, instead of QueryCallback. This was invalid and prevented deeper nesting join on statements. (#29252)

Browse Source
This commit is contained in:
Gregroam
2018-10-05 06:43:16 +13:00
committed by Wesley Wigham
parent 2debc8b4cc
commit 9d4276aff3
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
types/knex/index.d.ts vendored
View File

@@ -188,9 +188,13 @@ declare namespace Knex {
interface Distinct extends ColumnNameQueryBuilder {
}
interface JoinCallback {
(this: JoinClause, join: JoinClause): void;
}
interface Join {
(raw: Raw): QueryBuilder;
(tableName: TableName | QueryCallback, clause: (this: JoinClause, join: JoinClause) => void): QueryBuilder;
(tableName: TableName | QueryCallback, clause: JoinCallback): QueryBuilder;
(tableName: TableName | QueryCallback, columns: { [key: string]: string | number | Raw }): QueryBuilder;
(tableName: TableName | QueryCallback, raw: Raw): QueryBuilder;
(tableName: TableName | QueryCallback, column1: string, column2: string): QueryBuilder;
@@ -200,19 +204,19 @@ declare namespace Knex {
interface JoinClause {
on(raw: Raw): JoinClause;
on(callback: QueryCallback): JoinClause;
on(callback: JoinCallback): JoinClause;
on(columns: { [key: string]: string | Raw }): JoinClause;
on(column1: string, column2: string): JoinClause;
on(column1: string, raw: Raw): JoinClause;
on(column1: string, operator: string, column2: string | Raw): JoinClause;
andOn(raw: Raw): JoinClause;
andOn(callback: QueryCallback): JoinClause;
andOn(callback: JoinCallback): JoinClause;
andOn(columns: { [key: string]: string | Raw }): JoinClause;
andOn(column1: string, column2: string): JoinClause;
andOn(column1: string, raw: Raw): JoinClause;
andOn(column1: string, operator: string, column2: string | Raw): JoinClause;
orOn(raw: Raw): JoinClause;
orOn(callback: QueryCallback): JoinClause;
orOn(callback: JoinCallback): JoinClause;
orOn(columns: { [key: string]: string | Raw }): JoinClause;
orOn(column1: string, column2: string): JoinClause;
orOn(column1: string, raw: Raw): JoinClause;

13
types/knex/knex-tests.ts
View File

@@ -496,6 +496,13 @@ knex.select('*').from('users').leftJoin('accounts', (join: Knex.JoinClause) => {
join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
});
knex.select('*').from('users').leftJoin('accounts', (join) => {
join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
.andOn((join2) => {
join2.on('col1', 'col2').orOn('col3', 'col4');
});
});
knex.select('*').from('users').leftOuterJoin('accounts', 'users.id', 'accounts.user_id');
knex.select('*').from('users').leftOuterJoin('accounts', function() {
@@ -1035,13 +1042,13 @@ knex('users')
.select('*')
.join('contacts', function(builder) {
this.on(function(builder) {
let self: Knex.QueryBuilder = this;
let self: Knex.JoinClause = this;
self = builder;
}).andOn(function(builder) {
let self: Knex.QueryBuilder = this;
let self: Knex.JoinClause = this;
self = builder;
}).orOn(function(builder) {
let self: Knex.QueryBuilder = this;
let self: Knex.JoinClause = this;
self = builder;
}).onExists(function(builder) {
let self: Knex.QueryBuilder = this;