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

Merge pull request #19018 from vesse/bookshelf/enable-where-in-query

Browse Source 
[bookshelf] Allow array value for 'in' query
This commit is contained in:
Bowden Kelly
2017-08-22 10:58:01 -07:00
committed by GitHub
parent 36735d136a 60f9770c88
commit 72c4e7d76c
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
types/bookshelf/bookshelf-tests.ts
View File

@@ -867,6 +867,10 @@ model.where('favorite_color', 'red').fetch().then(() => {
model.where({favorite_color: 'red', shoe_size: 12}).fetch().then(() => {
//...
});
// or
model.where('favorite_color', 'in', ['red', 'green']).fetch().then(() => {
// ...
});
/* Lodash methods, see http://bookshelfjs.org/#Model-subsection-lodash-methods */
@@ -1197,6 +1201,13 @@ ships.trigger('fetched');
/* collection.where(), see http://bookshelfjs.org/#Collection-instance-where */
(new Author())
.where('first_name', 'in', ['User', 'Resu'])
.fetchAll()
.then(() => {
// ...
})
/* collection.withPivot(), see http://bookshelfjs.org/#Collection-instance-withPivot */
{

4
types/bookshelf/index.d.ts vendored
View File

@@ -97,7 +97,7 @@ declare namespace Bookshelf {
/** @deprecated should use `new` objects instead. */
static forge<T>(attributes?: any, options?: ModelOptions): T;
static where<T>(properties: { [key: string]: any }): T;
static where<T>(key: string, operatorOrValue: string | number | boolean, valueIfOperator?: string | number | boolean): T;
static where<T>(key: string, operatorOrValue: string | number | boolean, valueIfOperator?: string | string[] | number | number[] | boolean): T;
belongsTo<R extends Model<any>>(target: { new (...args: any[]): R }, foreignKey?: string, foreignKeyTarget?: string): R;
belongsToMany<R extends Model<any>>(target: { new (...args: any[]): R }, table?: string, foreignKey?: string, otherKey?: string, foreignKeyTarget?: string, otherKeyTarget?: string): Collection<R>;
@@ -126,7 +126,7 @@ declare namespace Bookshelf {
save(attrs?: { [key: string]: any }, options?: SaveOptions): BlueBird<T>;
through<R extends Model<any>>(interim: ModelSubclass, throughForeignKey?: string, otherKey?: string): R;
where(properties: { [key: string]: any }): T;
where(key: string, operatorOrValue: string | number | boolean, valueIfOperator?: string | number | boolean): T;
where(key: string, operatorOrValue: string | number | boolean, valueIfOperator?: string | string[] | number | number[] | boolean): T;
// See https://github.com/tgriesser/bookshelf/blob/0.9.4/src/errors.js
// See https://github.com/tgriesser/bookshelf/blob/0.9.4/src/model.js#L1280