From 12b6ceb95477e1516d14ee119ee7999516f943d9 Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Fri, 1 Feb 2019 14:27:03 +0200 Subject: [PATCH 1/3] Buffer/Buffer[]/boolean[] in where clause --- types/sequelize/index.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts index a9b59a0766..41bdbe0d12 100644 --- a/types/sequelize/index.d.ts +++ b/types/sequelize/index.d.ts @@ -3155,8 +3155,9 @@ declare namespace sequelize { * We did put Object in the end, because there where query might be a JSON Blob. It cripples a bit the * typesafety, but there is no way to pass the tests if we just remove it. */ + type Primitives = string | number | boolean | Buffer; type WhereOptions = { - [P in keyof T]?: string | number | boolean | WhereLogic | WhereOptions | col | and | or | WhereGeometryOptions | WhereNested | Array | null; + [P in keyof T]?: Primitives | Array | WhereLogic | (T[P] extends Primitives ? null : WhereOptions) | col | and | or | WhereGeometryOptions | WhereNested | null; }; /** From 419620b9260142531e3ef1d930a55e555e8d7b4d Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Fri, 1 Feb 2019 15:47:23 +0200 Subject: [PATCH 2/3] Tests --- types/sequelize/sequelize-tests.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts index e2954e3637..bc0aa7d51d 100644 --- a/types/sequelize/sequelize-tests.ts +++ b/types/sequelize/sequelize-tests.ts @@ -922,6 +922,9 @@ User.findAll( { include : [{ model : Task, paranoid: false }] } ); User.findAll( { transaction : t } ); User.findAll( { where : { data : { name : { last : 's' }, employment : { $ne : 'a' } } }, order : [['id', 'ASC']] } ); User.findAll( { where : { username : ['boo', 'boo2'] } } ); +User.findAll( { where : { username : Buffer.from("a name") } } ); +User.findAll( { where : { username : [Buffer.from("a name")] } } ); +User.findAll( { where : { username : [true] } } ); User.findAll( { where : { username : { like : '%2' } } } ); User.findAll( { where : { theDate : { '..' : ['2013-01-02', '2013-01-11'] } } } ); User.findAll( { where : { intVal : { '!..' : [8, 10] } } } ); From 2497b00908b019167efdc019012c6ae4bc14eed0 Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Mon, 4 Feb 2019 14:02:04 +0200 Subject: [PATCH 3/3] Revert changes in unrelated packages --- types/ember/test/engine.ts | 0 types/ember/v2/index.d.ts | 0 types/ember/v2/test/application.ts | 0 types/ember/v2/test/array-ext.ts | 0 types/ember/v2/test/array.ts | 0 types/ember/v2/test/component.ts | 0 types/ember/v2/test/computed.ts | 0 types/ember/v2/test/controller.ts | 0 types/ember/v2/test/create.ts | 0 types/ember/v2/test/detect-instance.ts | 0 types/ember/v2/test/detect.ts | 0 types/ember/v2/test/ember-tests.ts | 0 types/ember/v2/test/event.ts | 0 types/ember/v2/test/extend.ts | 0 types/ember/v2/test/function-ext.ts | 0 types/ember/v2/test/helper.ts | 0 types/ember/v2/test/inject.ts | 0 types/ember/v2/test/lib/assert.ts | 0 types/ember/v2/test/mixin.ts | 0 types/ember/v2/test/object.ts | 0 types/ember/v2/test/observable.ts | 0 types/ember/v2/test/reopen.ts | 0 types/ember/v2/test/route.ts | 0 types/ember/v2/test/router.ts | 0 types/ember/v2/test/run.ts | 0 types/ember/v2/test/test.ts | 0 types/ember/v2/test/transition.ts | 0 types/ember/v2/test/utils.ts | 0 types/ember/v2/tsconfig.json | 0 types/ember/v2/tslint.json | 0 types/ember__application/test/application.ts | 0 types/ember__array/test/array-ext.ts | 0 types/ember__array/test/array.ts | 0 types/ember__array/test/lib/assert.ts | 0 types/ember__component/test/lib/assert.ts | 0 types/ember__engine/test/engine.ts | 0 types/ember__object/test/detect-instance.ts | 0 types/ember__object/test/detect.ts | 0 types/ember__routing/test/lib/assert.ts | 0 types/ember__routing/test/route.ts | 0 types/ember__routing/test/router.ts | 0 types/meteor/scripts/generate-globals | 0 types/react-native-sortable-list/index.d.ts | 0 types/react-resize-detector/index.d.ts | 0 types/react-resize-detector/react-resize-detector-tests.tsx | 0 types/three/three-core.d.ts | 0 46 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 types/ember/test/engine.ts mode change 100644 => 100755 types/ember/v2/index.d.ts mode change 100644 => 100755 types/ember/v2/test/application.ts mode change 100644 => 100755 types/ember/v2/test/array-ext.ts mode change 100644 => 100755 types/ember/v2/test/array.ts mode change 100644 => 100755 types/ember/v2/test/component.ts mode change 100644 => 100755 types/ember/v2/test/computed.ts mode change 100644 => 100755 types/ember/v2/test/controller.ts mode change 100644 => 100755 types/ember/v2/test/create.ts mode change 100644 => 100755 types/ember/v2/test/detect-instance.ts mode change 100644 => 100755 types/ember/v2/test/detect.ts mode change 100644 => 100755 types/ember/v2/test/ember-tests.ts mode change 100644 => 100755 types/ember/v2/test/event.ts mode change 100644 => 100755 types/ember/v2/test/extend.ts mode change 100644 => 100755 types/ember/v2/test/function-ext.ts mode change 100644 => 100755 types/ember/v2/test/helper.ts mode change 100644 => 100755 types/ember/v2/test/inject.ts mode change 100644 => 100755 types/ember/v2/test/lib/assert.ts mode change 100644 => 100755 types/ember/v2/test/mixin.ts mode change 100644 => 100755 types/ember/v2/test/object.ts mode change 100644 => 100755 types/ember/v2/test/observable.ts mode change 100644 => 100755 types/ember/v2/test/reopen.ts mode change 100644 => 100755 types/ember/v2/test/route.ts mode change 100644 => 100755 types/ember/v2/test/router.ts mode change 100644 => 100755 types/ember/v2/test/run.ts mode change 100644 => 100755 types/ember/v2/test/test.ts mode change 100644 => 100755 types/ember/v2/test/transition.ts mode change 100644 => 100755 types/ember/v2/test/utils.ts mode change 100644 => 100755 types/ember/v2/tsconfig.json mode change 100644 => 100755 types/ember/v2/tslint.json mode change 100644 => 100755 types/ember__application/test/application.ts mode change 100644 => 100755 types/ember__array/test/array-ext.ts mode change 100644 => 100755 types/ember__array/test/array.ts mode change 100644 => 100755 types/ember__array/test/lib/assert.ts mode change 100644 => 100755 types/ember__component/test/lib/assert.ts mode change 100644 => 100755 types/ember__engine/test/engine.ts mode change 100644 => 100755 types/ember__object/test/detect-instance.ts mode change 100644 => 100755 types/ember__object/test/detect.ts mode change 100644 => 100755 types/ember__routing/test/lib/assert.ts mode change 100644 => 100755 types/ember__routing/test/route.ts mode change 100644 => 100755 types/ember__routing/test/router.ts mode change 100644 => 100755 types/meteor/scripts/generate-globals mode change 100644 => 100755 types/react-native-sortable-list/index.d.ts mode change 100644 => 100755 types/react-resize-detector/index.d.ts mode change 100644 => 100755 types/react-resize-detector/react-resize-detector-tests.tsx mode change 100644 => 100755 types/three/three-core.d.ts diff --git a/types/ember/test/engine.ts b/types/ember/test/engine.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/application.ts b/types/ember/v2/test/application.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/array-ext.ts b/types/ember/v2/test/array-ext.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/array.ts b/types/ember/v2/test/array.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/component.ts b/types/ember/v2/test/component.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/computed.ts b/types/ember/v2/test/computed.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/controller.ts b/types/ember/v2/test/controller.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/create.ts b/types/ember/v2/test/create.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/detect-instance.ts b/types/ember/v2/test/detect-instance.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/detect.ts b/types/ember/v2/test/detect.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/ember-tests.ts b/types/ember/v2/test/ember-tests.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/event.ts b/types/ember/v2/test/event.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/extend.ts b/types/ember/v2/test/extend.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/function-ext.ts b/types/ember/v2/test/function-ext.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/helper.ts b/types/ember/v2/test/helper.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/inject.ts b/types/ember/v2/test/inject.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/lib/assert.ts b/types/ember/v2/test/lib/assert.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/mixin.ts b/types/ember/v2/test/mixin.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/object.ts b/types/ember/v2/test/object.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/observable.ts b/types/ember/v2/test/observable.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/reopen.ts b/types/ember/v2/test/reopen.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/route.ts b/types/ember/v2/test/route.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/router.ts b/types/ember/v2/test/router.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/run.ts b/types/ember/v2/test/run.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/test.ts b/types/ember/v2/test/test.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/transition.ts b/types/ember/v2/test/transition.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/test/utils.ts b/types/ember/v2/test/utils.ts old mode 100644 new mode 100755 diff --git a/types/ember/v2/tsconfig.json b/types/ember/v2/tsconfig.json old mode 100644 new mode 100755 diff --git a/types/ember/v2/tslint.json b/types/ember/v2/tslint.json old mode 100644 new mode 100755 diff --git a/types/ember__application/test/application.ts b/types/ember__application/test/application.ts old mode 100644 new mode 100755 diff --git a/types/ember__array/test/array-ext.ts b/types/ember__array/test/array-ext.ts old mode 100644 new mode 100755 diff --git a/types/ember__array/test/array.ts b/types/ember__array/test/array.ts old mode 100644 new mode 100755 diff --git a/types/ember__array/test/lib/assert.ts b/types/ember__array/test/lib/assert.ts old mode 100644 new mode 100755 diff --git a/types/ember__component/test/lib/assert.ts b/types/ember__component/test/lib/assert.ts old mode 100644 new mode 100755 diff --git a/types/ember__engine/test/engine.ts b/types/ember__engine/test/engine.ts old mode 100644 new mode 100755 diff --git a/types/ember__object/test/detect-instance.ts b/types/ember__object/test/detect-instance.ts old mode 100644 new mode 100755 diff --git a/types/ember__object/test/detect.ts b/types/ember__object/test/detect.ts old mode 100644 new mode 100755 diff --git a/types/ember__routing/test/lib/assert.ts b/types/ember__routing/test/lib/assert.ts old mode 100644 new mode 100755 diff --git a/types/ember__routing/test/route.ts b/types/ember__routing/test/route.ts old mode 100644 new mode 100755 diff --git a/types/ember__routing/test/router.ts b/types/ember__routing/test/router.ts old mode 100644 new mode 100755 diff --git a/types/meteor/scripts/generate-globals b/types/meteor/scripts/generate-globals old mode 100644 new mode 100755 diff --git a/types/react-native-sortable-list/index.d.ts b/types/react-native-sortable-list/index.d.ts old mode 100644 new mode 100755 diff --git a/types/react-resize-detector/index.d.ts b/types/react-resize-detector/index.d.ts old mode 100644 new mode 100755 diff --git a/types/react-resize-detector/react-resize-detector-tests.tsx b/types/react-resize-detector/react-resize-detector-tests.tsx old mode 100644 new mode 100755 diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts old mode 100644 new mode 100755