Merge pull request #1734 from wbyoung/underscore-tablename

Underscore table name.

lib/model.js

@@ -26,6 +26,7 @@ module.exports = (function() {
       validate: {},
       freezeTableName: false,
       underscored: false,
+      underscoredAll: false,
       paranoid: false,
       whereCollection: null,
       schema: null,
@@ -40,6 +41,7 @@ module.exports = (function() {
     }, options || {})
 
     this.sequelize = options.sequelize
+    this.underscored = this.underscored || this.underscoredAll
 
     // error check options
     Utils._.each(options.validate, function(validator, validatorType) {
@@ -55,7 +57,7 @@ module.exports = (function() {
     this.name = name
 
     if (!this.options.tableName) {
-      this.tableName = this.options.freezeTableName ? name : Utils.pluralize(name, this.options.language)
+      this.tableName = this.options.freezeTableName ? name : Utils._.underscoredIf(Utils.pluralize(name, this.options.language), this.options.underscoredAll)
     } else {
       this.tableName = this.options.tableName
     }