Merge branch 'master' into issue-109

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

@@ -11,28 +11,27 @@ import {ISequelizeAssociation} from "../../interfaces/ISequelizeAssociation";
 export class Sequelize extends SequelizeOrigin implements BaseSequelize {
 
   // to fix "$1" called with something that's not an instance of Sequelize.Model
-  Model: any = Function;
+  Model: any;
 
-  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) {
-
-    super(
-      (typeof config === "string") ?
-        config : // URI string
-        BaseSequelize.isISequelizeUriConfig(config) ?
-          config.uri : // URI string from ISequelizeUriConfig
-          BaseSequelize.prepareConfig(config) // Config object (ISequelizeConfig)
-    );
-
-    if (BaseSequelize.isISequelizeUriConfig(config)) {
-      this.options = {...this.options, ...config};
+    if (typeof config === "string") {
+      super(config);
+    } else if (BaseSequelize.isISequelizeUriConfig(config)) {
+      super(config.url, config);
+    } else {
+      super(BaseSequelize.prepareConfig(config));
     }
 
+    this.throughMap = {};
+    this._ = {};
+    this.Model = Function;
+
     if (typeof config !== "string") {
       this.init(config);
     }

lib/models/v4/Sequelize.ts

@@ -9,26 +9,24 @@ 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) {
-
-    super(
-      (typeof config === "string") ?
-        config : // URI string
-        BaseSequelize.isISequelizeUriConfig(config) ?
-          config.uri : // URI string from ISequelizeUriConfig
-          BaseSequelize.prepareConfig(config) // Config object (ISequelizeConfig)
-    );
-
-    if (BaseSequelize.isISequelizeUriConfig(config)) {
-      this.options = {...this.options, ...config};
+    if (typeof config === "string") {
+      super(config);
+    } else if (BaseSequelize.isISequelizeUriConfig(config)) {
+      super(config.url, config);
+    } else {
+      super(BaseSequelize.prepareConfig(config));
     }
 
+    this.throughMap = {};
+    this._ = {};
+
     if (typeof config !== "string") {
       this.init(config);
     }
@@ -44,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

lib/services/models.ts

@@ -249,7 +249,7 @@ export function inferAlias(options: any, source: any): any {
     options.include = [options.include];
   } else if (!options.include.length) {
     delete options.include;
-    return;
+    return options;
   }
 
   // convert all included elements to { model: Model } form

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "sequelize-typescript",
-  "version": "0.5.0-beta.1",
+  "version": "0.5.0",
   "description": "Decorators and some other extras for sequelize (v3 + v4)",
   "scripts": {
     "build": "tsc --project lib/models/v4 && tsc",
@@ -21,6 +21,18 @@
     "type": "git",
     "url": "git+https://github.com/RobinBuschmann/sequelize-typescript.git"
   },
+  "keywords": [
+    "orm",
+    "object relational mapper",
+    "sequelize",
+    "typescript",
+    "decorators",
+    "mysql",
+    "sqlite",
+    "postgresql",
+    "postgres",
+    "mssql"
+  ],
   "author": "Robin Buschmann",
   "license": "MIT",
   "bugs": {

package.json

@@ -900,6 +900,36 @@ describe('model', () => {
           expect(u.username).to.equal('A fancy name');
         });
     });
+
+    it('should filter based on the where clause even if IFindOptions.include is []', () => {
+      @Table({paranoid: true, timestamps: true})
+      class User extends Model<User> {
+
+        @Column
+        username: string;
+      }
+      sequelize.addModels([User]);
+
+      return User.sync({force: true})
+        .then(() => {
+          return User.create({username: 'a1'});
+        })
+        .then(() => {
+          return User.create({username: 'a2'});
+        })
+        .then(() => {
+          return User.findOne<User>({where: {username: 'a2'}, include: []});
+        })
+        .then((u) => {
+          expect(u.username).to.equal('a2');
+        })
+        .then(() => {
+          return User.findOne<User>({where: {username: 'a1'}, include: []});
+        })
+        .then((u) => {
+          expect(u.username).to.equal('a1');
+        })
+    });
   });
 
   describe('findOrInitialize', () => {

test/specs/model.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}