Merge branch 'master' into issue-70

Author: RobinBuschmann

lib/models/BaseSequelize.ts

@@ -1,5 +1,5 @@
 import {Model} from "./Model";
-import {getModels} from "../services/models";
+import {DEFAULT_DEFINE_OPTIONS, getModels} from "../services/models";
 import {getAssociations, processAssociation} from "../services/association";
 import {ISequelizeConfig} from "../interfaces/ISequelizeConfig";
 import {resolveScopes} from "../services/scopes";
@@ -28,13 +28,16 @@ export abstract class BaseSequelize {
    * Prepares sequelize config passed to original sequelize constructor
    */
   static prepareConfig(config: ISequelizeConfig | ISequelizeValidationOnlyConfig): ISequelizeConfig {
+    if (!config.define) {
+      config.define = {};
+    }
+    config.define = {...DEFAULT_DEFINE_OPTIONS, ...config.define};
 
     if (config.validateOnly) {
 
       return this.getValidationOnlyConfig(config);
     }
-
-    return config as ISequelizeConfig;
+    return {...config as ISequelizeConfig};
   }
 
   static getValidationOnlyConfig(config: ISequelizeConfig | ISequelizeValidationOnlyConfig): ISequelizeConfig {

lib/services/models.ts

@@ -12,7 +12,7 @@ import {uniqueFilter} from "../utils/array";
 const MODEL_NAME_KEY = 'sequelize:modelName';
 const ATTRIBUTES_KEY = 'sequelize:attributes';
 const OPTIONS_KEY = 'sequelize:options';
-const DEFAULT_OPTIONS: DefineOptions<any> = {
+export const DEFAULT_DEFINE_OPTIONS: DefineOptions<any> = {
   timestamps: false
 };
 export const PROPERTY_LINK_TO_ORIG = '__origClass';
@@ -137,7 +137,7 @@ export function getOptions(target: any): DefineOptions<any> | undefined {
  * Sets seuqlize define options to class prototype
  */
 export function setOptions(target: any, options: DefineOptions<any>): void {
-  Reflect.defineMetadata(OPTIONS_KEY, {...DEFAULT_OPTIONS, ...options}, target);
+  Reflect.defineMetadata(OPTIONS_KEY, {...options}, target);
 }
 
 /**

test/specs/models/sequelize.spec.ts

@@ -1,8 +1,12 @@
+/* tslint:disable:max-classes-per-file */
+
 import {expect} from 'chai';
 import {createSequelize} from "../../utils/sequelize";
 import {Game} from "../../models/exports/Game";
 import Gamer from "../../models/exports/gamer.model";
 import {Sequelize} from "../../../lib/models/Sequelize";
+import {Model} from '../../../lib/models/Model';
+import {Table} from '../../../lib/annotations/Table';
 
 describe('sequelize', () => {
 
@@ -16,6 +20,35 @@ describe('sequelize', () => {
 
   });
 
+  describe('global define options', () => {
+
+    const DEFINE_OPTIONS = {timestamps: true, underscoredAll: true};
+    const sequelizeWithDefine = createSequelize(false, DEFINE_OPTIONS);
+
+    it('should have define options', () => {
+      expect(sequelizeWithDefine)
+        .to.have.property('options')
+        .that.has.property('define')
+        .that.eqls(DEFINE_OPTIONS)
+      ;
+    });
+
+    it('should set define options for models', () => {
+      @Table
+      class User extends Model<User> {}
+      sequelizeWithDefine.addModels([User]);
+
+      Object
+        .keys(DEFINE_OPTIONS)
+        .forEach(key => {
+          expect(User)
+            .to.have.property('options')
+            .that.have.property(key, DEFINE_OPTIONS[key]);
+        });
+    });
+
+  });
+
   describe('addModels', () => {
 
     it('should not throw', () => {

test/utils/sequelize.ts

@@ -1,14 +1,15 @@
 import {Sequelize} from "../../lib/models/Sequelize";
 import * as OriginSequelize from "sequelize";
-import {Sequelize as SequelizeType} from "sequelize";
+import {DefineOptions, Sequelize as SequelizeType} from "sequelize";
 
-export function createSequelize(useModelsInPath: boolean = true): Sequelize {
+export function createSequelize(useModelsInPath: boolean = true, define: DefineOptions<any> = {}): Sequelize {
 
   return new Sequelize({
     name: '__',
     dialect: 'sqlite',
     username: 'root',
     password: '',
+    define,
     storage: ':memory:',
     logging: !('SEQ_SILENT' in process.env),
     modelPaths: useModelsInPath ? [__dirname + '/../models'] : []