Merge pull request DefinitelyTyped#14588 from zaggino/sequelize/paran…

…oid-2 fix FindOrInitializeOptions and FindCreateFindOptions
DrFrankenstein · Feb 14, 2017 · 4f17805 · 4f17805
2 parents 9cddec2 + 01a2d0e
commit 4f17805
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/sequelize/index.d.ts b/sequelize/index.d.ts
@@ -3319,38 +3319,25 @@ declare namespace sequelize {
     /**
      * Options for Model.findOrInitialize method
      */
-    interface FindOrInitializeOptions<TAttributes> extends LoggingOptions {
-
-        /**
-         * A hash of search attributes.
-         */
-        where: string | WhereOptions;
+    interface FindOrInitializeOptions<TAttributes> extends FindOptions {
 
         /**
          * Default values to use if building a new instance
          */
         defaults?: TAttributes;
 
-        /**
-         * Transaction to run query under
-         */
-        transaction?: Transaction;
     }
 
     /**
-         * Options for Model.findOrInitialize method
+     * Options for Model.findOrInitialize method
      */
-    interface FindCreateFindOptions<TAttributes> {
+    interface FindCreateFindOptions<TAttributes> extends FindOptions {
 
         /**
-             * A hash of search attributes.
-         */
-        where: string | WhereOptions;
-
-        /**
-             * Default values to use if building a new instance
+         * Default values to use if building a new instance
          */
         defaults?: TAttributes;
+
     }
 
     /**

diff --git a/sequelize/sequelize-tests.ts b/sequelize/sequelize-tests.ts
@@ -977,6 +977,7 @@ let findOrRetVal: Promise<[AnyInstance, boolean]>;
 findOrRetVal = User.findOrInitialize( { where : { username : 'foo' } } );
 findOrRetVal = User.findOrInitialize( { where : { username : 'foo' }, transaction : t } );
 findOrRetVal = User.findOrInitialize( { where : { username : 'foo' }, defaults : { foo : 'asd' }, transaction : t } );
+findOrRetVal = User.findOrInitialize( { where : { username : 'foo' }, defaults : { foo : 'asd' }, paranoid : false } );
 
 findOrRetVal = User.findOrCreate( { where : { a : 'b' }, defaults : { json : { a : { b : 'c' }, d : [1, 2, 3] } } } );
 findOrRetVal = User.findOrCreate( { where : { a : 'b' }, defaults : { json : 'a', data : 'b' } } );
@@ -989,7 +990,6 @@ findOrRetVal = User.findOrCreate( { where : { objectId : 'asdasdasd' }, defaults
 findOrRetVal = User.findOrCreate( { where : { id : undefined }, defaults : { name : Math.random().toString() } } );
 findOrRetVal = User.findOrCreate( { where : { email : 'unique.email.@d.com', companyId : Math.floor( Math.random() * 5 ) } } );
 findOrRetVal = User.findOrCreate( { where : { objectId : 1 }, defaults : { bool : false } } );
-findOrRetVal = User.findOrCreate( { where : 'c', defaults : {} } );
 
 User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) } );