Merge branch 'master' into milestones/2.0.0

Makefile

@@ -13,9 +13,9 @@ teaser:
 
 test:
 	@if [ "$$GREP" ]; then \
-		make teaser && ./node_modules/mocha/bin/mocha --colors --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
+		make teaser && ./node_modules/mocha/bin/mocha --colors -t 10000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
 	else \
-		make teaser && ./node_modules/mocha/bin/mocha --colors --reporter $(REPORTER) $(TESTS); \
+		make teaser && ./node_modules/mocha/bin/mocha --colors -t 10000 --reporter $(REPORTER) $(TESTS); \
 	fi
 
 

lib/dialects/postgres/query-generator.js

@@ -262,7 +262,7 @@ module.exports = (function() {
             query += Utils._.template(joinQuery)({
               table:      this.quoteIdentifiers(include.daoFactory.tableName),
               as:         this.quoteIdentifier(include.as),
-              tableLeft:  this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? include.as : tableName),
+              tableLeft:  this.quoteIdentifier((include.association.associationType === 'BelongsTo') ? include.as : tableName),
               attrLeft:   this.quoteIdentifier(((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])),
               tableRight: this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? tableName : include.as),
               attrRight:  this.quoteIdentifier(include.association.identifier)

test/dao.test.js

@@ -13,8 +13,6 @@ chai.use(datetime)
 chai.Assertion.includeStack = true
 
 describe(Support.getTestDialectTeaser("DAO"), function () {
-  this.timeout(10000)
-
   beforeEach(function(done) {
     this.User = this.sequelize.define('User', {
       username:  { type: DataTypes.STRING },

test/hooks.test.js

@@ -8,8 +8,6 @@ var chai      = require('chai')
 chai.Assertion.includeStack = true
 
 describe(Support.getTestDialectTeaser("Hooks"), function () {
-  this.timeout(10000)
-
   describe('#validate', function() {
     describe('via define', function() {
       describe('on success', function() {