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

Merge pull request #27818 from scotttrinh/union-with-query-builder

Browse Source 
[knex] Allow QueryBuilder in union parameters
This commit is contained in:
Ron Buckton
2018-08-07 13:51:59 -07:00
committed by GitHub
parent 73227df0fd d6504f702a
commit 2025fc00e6
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,9 +312,9 @@ declare namespace Knex {
}
interface Union {
(callback: QueryCallback, wrap?: boolean): QueryBuilder;
(callbacks: QueryCallback[], wrap?: boolean): QueryBuilder;
(...callbacks: QueryCallback[]): QueryBuilder;
(callback: QueryCallback | QueryBuilder | Raw, wrap?: boolean): QueryBuilder;
(callbacks: (QueryCallback | QueryBuilder | Raw)[], wrap?: boolean): QueryBuilder;
(...callbacks: (QueryCallback | QueryBuilder | Raw)[]): QueryBuilder;
// (...callbacks: QueryCallback[], wrap?: boolean): QueryInterface;
}

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

@@ -1145,3 +1145,19 @@ knex('characters')
.whereIn(['name', 'class'], function() {
this.select('name', 'class').from('characters');
});
knex('characters')
.select()
.where({ name: 'Bar', class: 'Fighter' })
.union(knex('characters').select().where({ name: 'Foo', class: 'Druid' }));
knex('characters')
.select()
.where({ name: 'Bar', class: 'Fighter' })
.union([knex('characters').select().where({ name: 'Foo', class: 'Druid' })]);
knex('characters')
.select()
.where({ name: 'Bar', class: 'Fighter' })
.union(
knex('characters').select().where({ name: 'Foo', class: 'Druid' }),
knex('characters').select().where({ name: 'Baz', class: 'Paladin' })
);