formatting

lib/query-interface.js

@@ -109,8 +109,7 @@ module.exports = (function() {
               if (!results[enumIdx]) {
               if (!results[enumIdx]) {
                 sql = self.QueryGenerator.pgEnum(getTableName, keys[i], attributes[keys[i]], options)
                 sql = self.QueryGenerator.pgEnum(getTableName, keys[i], attributes[keys[i]], options)
                 chainer2.add(self.sequelize.query(sql, null, { raw: true }))
                 chainer2.add(self.sequelize.query(sql, null, { raw: true }))
-              }
-              else if (!!results[enumIdx] && !!daoTable) {
+              } else if (!!results[enumIdx] && !!daoTable) {
                 var enumVals = self.QueryGenerator.fromArray(results[enumIdx].enum_value)
                 var enumVals = self.QueryGenerator.fromArray(results[enumIdx].enum_value)
                   , vals = daoTable.rawAttributes[keys[i]].values
                   , vals = daoTable.rawAttributes[keys[i]].values
 
 
@@ -138,16 +137,17 @@ module.exports = (function() {
           sql = self.QueryGenerator.createTableQuery(tableName, attributes, options)
           sql = self.QueryGenerator.createTableQuery(tableName, attributes, options)
 
 
           chainer2.run().success(function() {
           chainer2.run().success(function() {
-            queryAndEmit.call(self, sql, 'createTable')
-            .success(function(res) {
-              self.emit('createTable', null)
-              emitter.emit('success', res)
-            })
-            .error(function(err) {
-              self.emit('createTable', err)
-              emitter.emit('error', err)
-            })
-            .on('sql', function(sql)  { emitter.emit('sql', sql) })
+            queryAndEmit
+              .call(self, sql, 'createTable')
+              .success(function(res) {
+                self.emit('createTable', null)
+                emitter.emit('success', res)
+              })
+              .error(function(err) {
+                self.emit('createTable', err)
+                emitter.emit('error', err)
+              })
+              .on('sql', function(sql)  { emitter.emit('sql', sql) })
           }).error(function(err) {
           }).error(function(err) {
             emitter.emit('error', err)
             emitter.emit('error', err)
           }).on('sql', function(sql) {
           }).on('sql', function(sql) {
@@ -885,15 +885,13 @@ module.exports = (function() {
           sqlOrQueryParams.push({})
           sqlOrQueryParams.push({})
         }
         }
 
 
-        query = this.sequelize.query.apply(this.sequelize, sqlOrQueryParams)
+        emitter.query = this.sequelize.query.apply(this.sequelize, sqlOrQueryParams)
       } else {
       } else {
-        query = this.sequelize.query(sqlOrQueryParams, null, {})
+        emitter.query = this.sequelize.query(sqlOrQueryParams, null, {})
       }
       }
 
 
-      // append the query for better testing
-      emitter.query = query
-
-      query
+      emitter
+        .query
         .success(function(obj) {
         .success(function(obj) {
           options.success && options.success(obj)
           options.success && options.success(obj)
           this.emit(methodName, null)
           this.emit(methodName, null)