sequelize typings updated; bug fix

sequelize · Dec 18, 2016 · 67a0e2b · 67a0e2b
1 parent b4bf97f
commit 67a0e2b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/annotations/Table.ts b/annotations/Table.ts
@@ -6,19 +6,19 @@ import {DefineOptions} from "sequelize";
 export function Table(options: DefineOptions<any>);
 export function Table(target: any);
 export function Table(any: any) {
-  
+
   if(typeof any === 'function') {
     let target = any;
 
     SequelizeModelService.setModelName(target, target.name);
     SequelizeModelService.setTableName(target, target.name);
-    
+
   } else {
-    
+
     let options = any;
-    
+
     return function (target: any) {
-      
+
       SequelizeModelService.extendOptions(target, options);
       SequelizeModelService.setModelName(target, target.name);
       SequelizeModelService.setTableName(target, target.name);

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@types/node": "6.0.41",
     "@types/reflect-metadata": "0.0.4",
-    "@types/sequelize": "4.0.36",
+    "@types/sequelize": "4.0.39",
     "sequelize": "git+https://github.com/RobinBuschmann/sequelize.git#mysql-jsonb"
   },
   "devDependencies": {

diff --git a/services/SequelizeModelService.js b/services/SequelizeModelService.js
diff --git a/services/SequelizeModelService.js.map b/services/SequelizeModelService.js.map
diff --git a/services/SequelizeModelService.ts b/services/SequelizeModelService.ts
@@ -25,7 +25,7 @@ export class SequelizeModelService {
 
     const options = this.getOptions(_class);
 
-    options.tableName = tableName;
+    if(!options.tableName) options.tableName = tableName;
   }
 
   /**
@@ -146,12 +146,12 @@ export class SequelizeModelService {
    * Extends currently set options with specified additional options
    */
   static extendOptions(_class: any, additionalOptions: DefineOptions<any>) {
-    
+
     const options = this.getOptions(_class);
-    
+
     for(let key in additionalOptions) {
       if(additionalOptions.hasOwnProperty(key)) {
-        
+
         options[key] = additionalOptions[key];
       }
     }