Merge branch 'master' into fix-model

Author: theoludwig

README.md

@@ -285,6 +285,7 @@ Design type      | Sequelize data type
  `string`        | `STRING`
  `boolean`       | `BOOLEAN`
  `number`        | `INTEGER`
+ `bigint`        | `BIGINT`
  `Date`          | `DATE`
  `Buffer`        | `BLOB`
 

src/model/table/table-options.ts

@@ -1,6 +1,6 @@
-import {ModelOptions} from "sequelize";
+import {Model, ModelOptions} from "sequelize";
 
-export interface TableOptions extends ModelOptions {
+export interface TableOptions<M extends Model = Model> extends ModelOptions<M> {
   modelName?: string;
 
   /**

src/model/table/table.ts

@@ -2,7 +2,7 @@ import {TableOptions} from "./table-options";
 import {Model} from "../model/model";
 import {setModelName, addOptions} from "../shared/model-service";
 
-export function Table(options: TableOptions): Function;
+export function Table<M extends Model = Model>(options: TableOptions<M>): Function;
 export function Table(target: Function): void;
 export function Table(arg: any): void | Function {
 

src/sequelize/data-type/data-type-service.ts

@@ -18,6 +18,8 @@ export function inferDataType(designType: any): DataTypeAbstract | undefined {
   switch (designType) {
     case String:
       return DataTypes.STRING;
+    case BigInt:
+      return DataTypes.BIGINT;
     case Number:
       return DataTypes.INTEGER;
     case Boolean:

test/specs/table_column.spec.ts

@@ -1,7 +1,7 @@
 import {expect, use} from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import {ModelAttributes} from 'sequelize';
-import {Model, Table, Column, DataType} from "../../src";
+import {Model, Table, Column, DataType, AutoIncrement, PrimaryKey} from "../../src";
 import {createSequelize} from "../utils/sequelize";
 import {User} from "../models/User";
 import {getOptions} from "../../src/model/shared/model-service";
@@ -197,6 +197,22 @@ describe('table_column', () => {
 
   describe('column', () => {
 
+    it('should infer the correct data type for bigint', () => {
+      @Table
+      class BigIntModel extends Model {
+        @PrimaryKey
+        @AutoIncrement
+        @Column
+        id: bigint;
+      }
+
+      sequelize.addModels([BigIntModel]);
+
+      const attributes = getAttributes(BigIntModel.prototype);
+
+      expect(attributes.id.type).to.equal(DataType.BIGINT);
+    });
+
     it('should create appropriate sql query', () => {
 
       const seq = createSequelize(false);

test/types/model.spec.ts

@@ -10,3 +10,16 @@ export class User extends Model {
   @Column(DataType.ARRAY(DataType.STRING))
   myCol: string[];
 }
+
+@Table<Post>({
+  hooks: {
+    beforeUpdate: (instance) => {
+      // without generic random will result in error
+      instance.random = 4;
+    },
+  },
+})
+export class Post extends Model {
+  @Column(DataType.INTEGER)
+  random: number;
+}