HasOne: Set a default singularized alias if not defined

lib/associations/has-one.js

@@ -14,15 +14,19 @@ module.exports = (function() {
       this.options.foreignKey = Utils._.underscoredIf(Utils.singularize(this.options.as, this.target.options.language) + "Id", this.options.underscored)
     }
 
+    if (!this.options.as) {
+      this.options.as = Utils.singularize(this.target.tableName, this.target.options.language)
+    }
+
     this.associationAccessor = this.isSelfAssociation
-      ? Utils.combineTableNames(this.target.tableName, this.options.as || this.target.tableName)
+      ? Utils.combineTableNames(this.target.tableName, this.options.as)
       : this.options.as || this.target.tableName
 
     this.options.useHooks = options.useHooks
 
     this.accessors = {
-      get: Utils._.camelize('get_' + (this.options.as || Utils.singularize(this.target.tableName, this.target.options.language))),
-      set: Utils._.camelize('set_' + (this.options.as || Utils.singularize(this.target.tableName, this.target.options.language)))
+      get: Utils._.camelize('get_' + this.options.as),
+      set: Utils._.camelize('set_' + this.options.as)
     }
   }
 

test/associations/has-one.test.js

@@ -16,7 +16,7 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
       Group.hasOne(User, { foreignKey: 'primaryGroupId', as: 'primaryUsers' })
       Group.hasOne(User, { foreignKey: 'secondaryGroupId', as: 'secondaryUsers' })
 
-      expect(Object.keys(Group.associations)).to.deep.equal(['Users', 'primaryUsers', 'secondaryUsers'])
+      expect(Object.keys(Group.associations)).to.deep.equal(['User', 'primaryUsers', 'secondaryUsers'])
     })
   })