Merge branch 'master' of https://github.com/RobinBuschmann/sequelize-typescript

Author: RobinBuschmann

README.md

@@ -19,16 +19,16 @@ Decorators and some other extras for sequelize (v3 + v4).
    - [`@ForeignKey`, `@BelongsTo`, `@HasMany`, `@HasOne`, `@BelongsToMany` API](#foreignkey-belongsto-hasmany-hasone-belongstomany-api)
    - [Generated getter and setter](#type-safe-usage-of-generated-getter-and-setter)
    - [Multiple relations of same models](#multiple-relations-of-same-models)
- - [Model valiation](#model-validation)
+ - [Model validation](#model-validation)
  - [Scopes](#scopes)
  - [Why `() => Model`?](#user-content-why---model)
  - [Recommendations and limitations](#recommendations-and-limitations)
 
 ### Installation
 *sequelize-typescript* requires [sequelize](https://github.com/sequelize/sequelize)
 ```
-npm install sequelize --save // v3
-npm install sequelize@4.0.0-1 --save // or v4
+npm install sequelize --save // v4
+npm install sequelize@3.30.4 --save // or v3
 ```
 and [reflect-metadata](https://www.npmjs.com/package/reflect-metadata)
 ```
@@ -153,7 +153,7 @@ Decorator                             | Description
  `@Unique`                            | sets `attribute.unique=true`
  `@Default(value: any)`               | sets `attribute.defaultValue` to specified value
  `@PrimaryKey`                        | sets `attribute.primaryKey=true`
- Validate annotations                 | see [Model valiation](#model-validation)
+ Validate annotations                 | see [Model validation](#model-validation)
 
 ### Type inference
 The following types can be automatically inferred from javascript type. Others have to be defined explicitly.

package.json

@@ -6,8 +6,8 @@
     "build": "tsc --project lib/models/v4 && tsc",
     "build-tests-es5": "tsc --project test",
     "build-tests-es6": "tsc --project test --target es6 && tsc",
-    "prepare-test-v3": "npm install sequelize@3.30.1 --no-save && npm run build-tests-es5",
-    "prepare-test-v4": "npm install sequelize@4.0.0-1 --no-save && npm run build-tests-es6",
+    "prepare-test-v3": "npm install sequelize@3.30.4 --no-save && npm run build-tests-es5",
+    "prepare-test-v4": "npm install sequelize@4.1.0 --no-save && npm run build-tests-es6",
     "test-v3": "npm run prepare-test-v3 && npm run exec-tests",
     "test-v4": "npm run prepare-test-v4 && npm run exec-tests",
     "cover-v3": "npm run prepare-test-v3 && nyc --exclude lib/models/v4/**/*.js --all --require source-map-support/register mocha test/specs/",

test/specs/model.spec.ts

@@ -1007,7 +1007,7 @@ describe('model', () => {
         throw new Error('Update should throw an error if no where clause is given.');
       }, (err) => {
         expect(err).to.be.an.instanceof(Error);
-        expect(err.message).to.equal('Missing where attribute in the options parameter passed to update.');
+        expect(err.message).to.match(/^Missing where attribute in the options parameter/);
       });
     });