Upgrade to Sequelize 6

Author: iam-dev0

.gitignore

@@ -27,3 +27,7 @@ npm-debug.log
 coverage
 .nyc_output
 !test/tsconfig.mocha.js
+
+
+# lockFile
+*.lock

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sequelize-typescript",
-  "version": "1.1.0-beta.0",
+  "version": "1.1.0-beta.1",
   "description": "Decorators and some other features for sequelize",
   "scripts": {
     "build": "tsc",
@@ -61,11 +61,11 @@
     "nyc": "13.3.0",
     "prettyjson": "1.2.1",
     "reflect-metadata": "0.1.9",
-    "sequelize": "5.15.1",
+    "sequelize": "6.2.4",
     "sinon": "1.17.7",
     "sinon-chai": "2.8.0",
     "source-map-support": "0.4.14",
-    "sqlite3": "4.0.4",
+    "sqlite3": "5.0.0",
     "ts-node": "7.0.1",
     "tslint": "5.14.0",
     "typescript": "3.3.3",
@@ -76,10 +76,10 @@
     "@types/node": "*",
     "@types/validator": "*",
     "reflect-metadata": "*",
-    "sequelize": "^5.1.0"
+    "sequelize": "^6.0.0"
   },
   "engines": {
-    "node": ">=0.8.15"
+    "node": ">=10.0.0"
   },
   "nyc": {
     "lines": 85,

src/model/model/model.ts

@@ -1,4 +1,4 @@
-import {InitOptions, Model as OriginModel, ModelAttributes, FindOptions, BuildOptions, Promise} from 'sequelize';
+import {InitOptions, Model as OriginModel, ModelAttributes, FindOptions, BuildOptions} from 'sequelize';
 import {capitalize} from '../../shared/string';
 import {inferAlias} from '../../associations/alias-inference/alias-inference-service';
 import {ModelNotInitializedError} from '../shared/model-not-initialized-error';
@@ -24,7 +24,7 @@ export abstract class Model<T = any, T2 = any> extends OriginModel<T, T2> {
 
   static isInitialized = false;
 
-  static init(attributes: ModelAttributes, options: InitOptions): void {
+  static init(attributes: ModelAttributes, options: InitOptions): Model {
     this.isInitialized = true;
     // @ts-ignore
     return super.init(attributes, options);
@@ -135,7 +135,7 @@ function isFunctionMember(propertyKey: string, target: any): boolean {
 
 function isForbiddenMember(propertyKey: string): boolean {
   const FORBIDDEN_KEYS = ['name', 'constructor', 'length', 'prototype', 'caller', 'arguments', 'apply',
-    'QueryInterface', 'QueryGenerator', 'init', 'replaceHookAliases', 'refreshAttributes', 'inspect'];
+    'queryInterface', 'queryGenerator', 'init', 'replaceHookAliases', 'refreshAttributes', 'inspect'];
   return FORBIDDEN_KEYS.indexOf(propertyKey) !== -1;
 }
 

test/specs/association.spec.ts

@@ -3,7 +3,6 @@
 import {expect, use} from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import * as OriginSequelize from 'sequelize';
-import * as Promise from 'bluebird';
 import {createSequelize} from "../utils/sequelize";
 import {
   Sequelize, Model, Table, Column, BelongsToMany,

test/specs/instance-methods.spec.ts

@@ -1,5 +1,4 @@
 import {expect} from 'chai';
-import * as Promise from 'bluebird';
 import {Model, Table, Column} from "../../src";
 import {createSequelize} from "../utils/sequelize";
 

test/specs/instance.spec.ts

@@ -1,4 +1,4 @@
-import * as Promise from 'bluebird';
+
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { useFakeTimers } from 'sinon';
@@ -656,13 +656,16 @@ describe('instance', () => {
         .create({aNumber: 1, bNumber: 1})
         // TODO Sequelize typings issue caused by sequelize/types/lib/model.d.ts on line 2394
         // TODO The order of overloads is wrong
-        .tap((user) => User.update({bNumber: 2}, {where: {id: user.get('id') as any}}))
+        .then((user) => {
+          User.update({bNumber: 2}, {where: {id: user.get('id') as any}})
+          return user;
+         })
         .then((user) => user.reload({attributes: ['bNumber']}))
         .then((user) => {
           expect(user.get('aNumber')).to.equal(1);
           expect(user.get('bNumber')).to.equal(2);
         })
-    );
+    );   // taps are no more supported 
 
     it('should update read only attributes as well (updatedAt)', () => {
       let _originalUser;
@@ -777,7 +780,8 @@ describe('instance', () => {
             })
             .then((lePlayer: Player) => {
               expect(lePlayer.shoe).not.to.be.null;
-              return lePlayer.shoe.destroy().return(lePlayer);
+               lePlayer.shoe.destroy();  // Destroy Now Returns Void So can't call return() void 
+              return lePlayer;
             })
             .then((lePlayer) => lePlayer.reload() as any)
             .then((lePlayer: Player) => {
@@ -808,8 +812,9 @@ describe('instance', () => {
               return leTeam.players[1]
                 .destroy()
                 .then(() => {
-                  return leTeam.players[0].destroy();
-                }).return(leTeam);
+                   leTeam.players[0].destroy();
+                   return leTeam;  // Destroy Return type is Void
+                })
             })
             .then((leTeam) => leTeam.reload() as any)
             .then((leTeam: Team) => {
@@ -836,7 +841,8 @@ describe('instance', () => {
             })
             .then((leTeam: Team) => {
               expect(leTeam.players).to.have.length(2);
-              return leTeam.players[0].destroy().then(() => leTeam as Team);
+              leTeam.players[0].destroy(); // Since destroy return void now 
+              return leTeam;
             })
             .then((leTeam) => leTeam.reload() as any)
             .then((leTeam: Team) => {
@@ -1665,16 +1671,16 @@ describe('instance', () => {
 
       it('saves many objects that each a have collection of eagerly loaded objects', () =>
 
-        Promise
-          .props({
-            bart: UserEager.create({username: 'bart', age: 20}),
-            lisa: UserEager.create({username: 'lisa', age: 20}),
-            detention1: ProjectEager.create({title: 'detention1', overdueDays: 0}),
-            detention2: ProjectEager.create({title: 'detention2', overdueDays: 0}),
-            exam1: ProjectEager.create({title: 'exam1', overdueDays: 0}),
-            exam2: ProjectEager.create({title: 'exam2', overdueDays: 0})
-          })
-          .then(({bart, lisa, detention1, detention2, exam1, exam2}) =>
+        Promise // Converting to native es6 promises
+          .all([
+             UserEager.create({username: 'bart', age: 20}),
+             UserEager.create({username: 'lisa', age: 20}),
+             ProjectEager.create({title: 'detention1', overdueDays: 0}),
+             ProjectEager.create({title: 'detention2', overdueDays: 0}),
+             ProjectEager.create({title: 'exam1', overdueDays: 0}),
+             ProjectEager.create({title: 'exam2', overdueDays: 0})
+          ])
+          .then(([bart, lisa, detention1, detention2, exam1, exam2]) =>
             Promise
               .all([
                 bart.$set('projects', [detention1, detention2]),
@@ -2414,10 +2420,11 @@ describe('instance', () => {
 
     it('returns an error if the model is not paranoid', () =>
 
-      User.create({username: 'Peter'}).then((user) =>
-        expect(() => user.restore()).to.throw(Error, 'Model is not paranoid')
-      )
-    );
+      User.create({username: 'Peter'}).then((user) =>user.restore()).
+      catch(error=>
+        expect(error.message).to.equal('Model is not paranoid')
+        )
+    );// Native Promises
 
     it('restores a previously deleted model', () => {
 

test/specs/model-methods.spec.ts

@@ -1,5 +1,4 @@
 import {expect} from 'chai';
-import * as Promise from 'bluebird';
 import {Model, Table, Column} from "../../src";
 import {createSequelize} from "../utils/sequelize";
 

test/specs/model.spec.ts

@@ -5,7 +5,6 @@ import {useFakeTimers, stub, spy} from 'sinon';
 import * as sinonChai from 'sinon-chai';
 import * as _ from 'lodash';
 import * as moment from 'moment';
-import * as Promise from 'bluebird';
 import {Op, UniqueConstraintError} from 'sequelize';
 import * as chaiAsPromised from 'chai-as-promised';
 import {createSequelize} from "../utils/sequelize";
@@ -453,9 +452,10 @@ describe('model', () => {
         return Promise.all([
           User.create({username: 'tobi', email: '[email protected]'}),
           User.create({username: 'tobi', email: '[email protected]'})]);
-      }).catch(UniqueConstraintError, (err) => {
+      }) .catch( (err) => {
         expect(err.message).to.equal('User and email must be unique');
-      });
+      });//  Native Catch expect one parameter only
+      
     });
 
     // If you use migrations to create unique indexes that have explicit names and/or contain fields
@@ -509,9 +509,10 @@ describe('model', () => {
         return Promise.all([
           User.create({userId: 1, email: '[email protected]'}),
           User.create({userId: 1, email: '[email protected]'})]);
-      }).catch(UniqueConstraintError, (err) => {
+      }).catch( (err) => {
         expect(err.message).to.equal('User and email must be unique');
-      });
+      });//  Native Catch expect one parameter only
+
     });
 
     it('should allow the user to specify indexes in options', () => {