Merge https://github.com/SirUli/sequelize into SirUli-8de8ef6e

lib/associations/has-many.js

@@ -51,7 +51,9 @@ module.exports = (function() {
       this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
       this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
       if(!this.isSelfAssociation) this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
       if(!this.isSelfAssociation) this.target.associations[this.associationAccessor].connectorDAO = this.connectorDAO
 
 
-      this.connectorDAO.sync()
+      if(this.options.syncOnAssociation) {
+        this.connectorDAO.sync()
+      }
     } else {
     } else {
       var newAttributes = {}
       var newAttributes = {}
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }
       newAttributes[this.identifier] = { type: DataTypes.INTEGER }

lib/dao-factory.js

@@ -13,6 +13,7 @@ module.exports = (function() {
       validate: {},
       validate: {},
       freezeTableName: false,
       freezeTableName: false,
       underscored: false,
       underscored: false,
+      syncOnAssociation: true,
       paranoid: false
       paranoid: false
     }, options || {})
     }, options || {})