vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-12 04:50:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24141 from TheGuarantors/correct_sequelize_typings

Browse Source 
sequelize: Correct some typings definitions
This commit is contained in:
Armando Aguirre
2018-03-08 11:18:50 -08:00
committed by GitHub
parent 174ea860ee dfb8f459ae
commit 5d5f69e602
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/sequelize/index.d.ts
Vendored
+3 -3
View File
@@ -3136,11 +3136,11 @@ declare namespace sequelize {
$ilike: string | WherePGStatement;
$notLike: string | WherePGStatement;
$notILike: string | WherePGStatement;
$between: [number, number];
$between: [number, number] | [Date, Date];
"..": [number, number];
$notBetween: [number, number];
"!..": [number, number];
$overlap: [number, number];
$overlap: [number, number] | [string, string];
"&&": [number, number];
$contains: any;
"@>": any;
@@ -3155,7 +3155,7 @@ declare namespace sequelize {
* typesafety, but there is no way to pass the tests if we just remove it.
*/
type WhereOptions<T> = {
[P in keyof T]?: string | number | boolean | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | Array<string | number> | null;
[P in keyof T]?: string | number | boolean | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | WhereNested | Array<string | number> | null;
};
/**
types/sequelize/sequelize-tests.ts
+7
View File
@@ -915,6 +915,8 @@ User.findAll( { where : { intVal : { '!..' : [8, 10] } } } );
User.findAll( { where : { theDate : { between : ['2013-01-02', '2013-01-11'] } } } );
User.findAll( { where : { theDate : { between : ['2013-01-02', '2013-01-11'] }, intVal : 10 } } );
User.findAll( { where : { theDate : { between : ['2012-12-10', '2013-01-02'] } } } );
User.findAll( { where : { theDate : { between : [1, 3] } } } );
User.findAll( { where : { theDate : { between : [new Date(0), new Date(1000)] } } } );
User.findAll( { where : { theDate : { nbetween : ['2013-01-04', '2013-01-20'] } } } );
User.findAll( { order : [s.col( 'name' )] } );
User.findAll( { order : [['theDate', 'DESC']] } );
@@ -948,6 +950,11 @@ User.findAll( { where: s.where(s.fn('lower', s.col('email')), s.fn('lower', 'TES
User.findAll( { subQuery: false, include : [User], order : [[User, User, 'numYears', 'c']] } );
User.findAll( { rejectOnEmpty: true });
User.findAll( { where: { $and:[ { username: "user" }, { theDate: new Date() } ] } } );
User.findAll( { where: { $or:[ { username: "user" }, { theDate: new Date() } ] } } );
User.findAll( { where: { $and:[ { username: { $not: "user" } }, { theDate: new Date() } ] } } );
User.findAll( { where: { $or:[ { username: { $not: "user" } }, { theDate: new Date() } ] } } );
User.findAll( { where: { emails: { $overlap: ["me@mail.com", "you@mail.com"] } } } );
User.findById( 'a string' );