Merge branch 'selfAssociation' of https://github.com/innofluence/sequelize into …

…innofluence-selfAssociation

lib/associations/has-many.js

@@ -9,6 +9,7 @@ module.exports = (function() {
     this.source = srcDAO
     this.target = targetDAO
     this.options = options
+    this.isManyMany = this.options.isManyMany === undefined ? true : this.options.isManyMany
     this.isSelfAssociation = (this.source.tableName == this.target.tableName)
 
     this.associationAccessor = this.combinedName = this.options.joinTableName || Utils.combineTableNames(
@@ -34,7 +35,7 @@ module.exports = (function() {
 
     // is there already a single sided association between the source and the target?
     // or is the association on the model itself?
-    if (this.isSelfAssociation || multiAssociation) {
+    if ((this.isSelfAssociation && this.isManyMany) || multiAssociation) {
       // remove the obsolete association identifier from the source
       if(this.isSelfAssociation) {
         this.foreignIdentifier = Utils._.underscoredIf((this.options.as || this.target.tableName) + 'Id', this.options.underscored)

package.json

 {
   "name": "sequelize",
   "description": "Multi dialect ORM for Node.JS",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "author": "Sascha Depold <sascha@depold.com>",
   "contributors": [
     { "name": "Sascha Depold", "email": "sascha@depold.com" },

spec-jasmine/associations/has-many.spec.js

@@ -93,6 +93,66 @@ describe('HasMany', function() {
       })
     })
 
+  it("should allow selfAssociation to be single linked (only one DAO is created)", function() {
+    var oldLength = sequelize.daoFactoryManager.daos.length;
+    
+    var Comment = sequelize.define('Comment', { content: Sequelize.STRING })
+    Comment.belongsTo(Comment, {as: "Parent"});
+    Comment.hasMany(Comment, {as: 'Children', foreignKey: "ParentId", isManyMany: false})
+    
+    expect(sequelize.daoFactoryManager.daos.length).toEqual(oldLength + 1)
+    
+    Helpers.async(function(done) {
+      Comment.sync({force: true}).success(function() {
+        done()
+      })
+    })
+
+    var parent
+    Helpers.async(function(done) {
+      Comment.create({ content: 'parentComment' }).success(function(p) {
+        parent = p
+        done()
+      })
+    })
+      
+    Helpers.async(function(done) {
+      Comment.create({ content: 'child1' }).success(function(child1) {
+        child1.setParent(parent).success(function() {
+            done()
+          })
+      })
+    })
+    
+    Helpers.async(function(done) {
+      Comment.create({ content: 'child2' }).success(function(child2) {
+        child2.setParent(parent).success(function() {
+          done()
+        })
+      })
+    })
+    Helpers.async(function(done) {
+      Comment.find({where: { content: 'parentComment' }}).success(function(parent) {
+          parent.getChildren().success(function(children) {
+            expect(children.length).toEqual(2)
+          done()
+          })
+        })
+      })
+    })
+  
+    it("should still use many to many for  selfAssociation by default (two DAOs are created)", function() {
+      Helpers.async(function(done) {
+        var oldLength = sequelize.daoFactoryManager.daos.length;
+    
+        var Comment = sequelize.define('Comment', { content: Sequelize.STRING })
+        Comment.belongsTo(Comment, {as: "Parent"})
+        Comment.hasMany(Comment, {as: 'Children'})
+    
+        expect(sequelize.daoFactoryManager.daos.length).toEqual(oldLength + 2)
+        done();
+      })
+    })
   })
 
   describe('bi-directional', function() {