Merge pull request #125 from RobinBuschmann/issue-121

fixes #121

Author: RobinBuschmann

lib/interfaces/ISequelizeUriConfig.ts

@@ -5,7 +5,7 @@ export interface ISequelizeUriConfig extends Options {
   /**
    * Uri connection string to database
    */
-  uri: string;
+  url: string;
 
   /**
    * Path to models, which should be loaded

lib/models/BaseSequelize.ts

@@ -28,7 +28,7 @@ export abstract class BaseSequelize {
   }
 
   static isISequelizeUriConfig(obj: any): obj is ISequelizeUriConfig {
-    return obj.hasOwnProperty("uri");
+    return obj.hasOwnProperty("url");
   }
 
   static extend(target: any): void {
@@ -79,7 +79,7 @@ export abstract class BaseSequelize {
     models.forEach(model => model.isInitialized = true);
     this.associateModels(models);
     resolveScopes(models);
-    installHooks​​(models);
+    installHooks(models);
     models.forEach(model => this._[model.name] = model);
   }
 

lib/models/v3/Sequelize.ts

@@ -21,16 +21,16 @@ export class Sequelize extends SequelizeOrigin implements BaseSequelize {
 
   constructor(config: SequelizeConfig | string) {
     if (typeof config === "string") {
-      super(config)
-    } else if(BaseSequelize.isISequelizeUriConfig(config)) {
-      super(config.uri, config)
+      super(config);
+    } else if (BaseSequelize.isISequelizeUriConfig(config)) {
+      super(config.url, config);
     } else {
-      super(BaseSequelize.prepareConfig(config))
+      super(BaseSequelize.prepareConfig(config));
     }
 
-    this.throughMap = {}
-    this._ = {}
-    this.Model = Function
+    this.throughMap = {};
+    this._ = {};
+    this.Model = Function;
 
     if (typeof config !== "string") {
       this.init(config);

lib/models/v4/Sequelize.ts

@@ -9,23 +9,23 @@ import {ISequelizeAssociation} from "../../interfaces/ISequelizeAssociation";
 
 export class Sequelize extends OriginSequelize implements BaseSequelize {
 
-  throughMap: {[through: string]: any};
-  _: {[modelName: string]: typeof Model};
+  throughMap: { [through: string]: any };
+  _: { [modelName: string]: typeof Model };
   init: (config: SequelizeConfig) => void;
   addModels: (models: Array<typeof Model> | string[]) => void;
   associateModels: (models: Array<typeof Model>) => void;
 
   constructor(config: SequelizeConfig | string) {
     if (typeof config === "string") {
-      super(config)
-    } else if(BaseSequelize.isISequelizeUriConfig(config)) {
-      super(config.uri, config)
+      super(config);
+    } else if (BaseSequelize.isISequelizeUriConfig(config)) {
+      super(config.url, config);
     } else {
-      super(BaseSequelize.prepareConfig(config))
+      super(BaseSequelize.prepareConfig(config));
     }
 
-    this.throughMap = {}
-    this._ = {}
+    this.throughMap = {};
+    this._ = {};
 
     if (typeof config !== "string") {
       this.init(config);
@@ -42,7 +42,8 @@ export class Sequelize extends OriginSequelize implements BaseSequelize {
     return Through;
   }
 
-  adjustAssociation(model: any, association: ISequelizeAssociation): void {}
+  adjustAssociation(model: any, association: ISequelizeAssociation): void {
+  }
 
   /**
    * Creates sequelize models and registers these models

test/specs/models/sequelize.spec.ts

@@ -56,7 +56,7 @@ describe('sequelize', () => {
   describe('constructor using uri in options object', () => {
 
     const sequelizeUri = new Sequelize({
-      uri: connectionUri,
+      url: connectionUri,
       storage: ':memory:',
       logging: !('SEQ_SILENT' in process.env),
       pool: {max: 8, min: 0}