Style guide fixes

lib/associations/belongs-to.js

@@ -22,11 +22,11 @@ module.exports = (function() {
   // the id is in the source table
   BelongsTo.prototype.injectAttributes = function() {
     var newAttributes  = {}
+      , targetKeys     = Object.keys(this.target.primaryKeys)
+      , keyType        = ((this.target.hasPrimaryKeys && targetKeys.length === 1) ? this.target.rawAttributes[targetKeys[0]].type : DataTypes.INTEGER)
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName, this.target.options.language) + "Id", this.source.options.underscored)
-    var targetKeys = Object.keys(this.target.primaryKeys)
-    var keyType = ((this.target.hasPrimaryKeys && targetKeys.length === 1) ? this.target.rawAttributes[targetKeys[0]].type : DataTypes.INTEGER)
-    newAttributes[this.identifier] = { type: this.options.keyType ||keyType }
+    newAttributes[this.identifier] = { type: this.options.keyType || keyType }
     Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.target, this.source, this.options)
     Utils._.defaults(this.source.rawAttributes, newAttributes)
 

lib/associations/has-many-double-linked.js

@@ -57,10 +57,9 @@ module.exports = (function() {
     var self = this
       , chainer             = new Utils.QueryChainer()
       , association         = self.__factory.target.associations[self.__factory.associationAccessor]
-      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
-
-    var sourceKeys = Object.keys(self.__factory.source.primaryKeys);
-    var targetKeys = Object.keys(self.__factory.target.primaryKeys);
+      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
+      , sourceKeys          = Object.keys(self.__factory.source.primaryKeys)
+      , targetKeys          = Object.keys(self.__factory.target.primaryKeys)
 
     var obsoleteAssociations = oldAssociations.filter(function (old) {
       // Return only those old associations that are not found in new

lib/associations/has-one.js

@@ -27,10 +27,10 @@ module.exports = (function() {
   // the id is in the target table
   HasOne.prototype.injectAttributes = function() {
     var newAttributes = {}
+      , sourceKeys    = Object.keys(this.source.primaryKeys)
+      , keyType       = ((this.source.hasPrimaryKeys && sourceKeys.length === 1) ? this.source.rawAttributes[sourceKeys[0]].type : DataTypes.INTEGER)
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName, this.source.options.language) + "Id", this.options.underscored)
-    var sourceKeys = Object.keys(this.source.primaryKeys)
-    var keyType = ((this.source.hasPrimaryKeys && sourceKeys.length === 1) ? this.source.rawAttributes[sourceKeys[0]].type : DataTypes.INTEGER)
     newAttributes[this.identifier] = { type: this.options.keyType || keyType }
     Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
     Utils._.defaults(this.target.rawAttributes, newAttributes)

lib/dialects/mysql/query-generator.js

@@ -189,27 +189,28 @@ module.exports = (function() {
           optAttributes = optAttributes.concat(attributes)
 
           var table = include.daoFactory.tableName
-          var as = include.as
+            , as    = include.as
 
           if (!include.association.connectorDAO) {
             var primaryKeysLeft = ((include.association.associationType === 'BelongsTo') ? Object.keys(include.association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
-            var tableLeft = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
-            var attrLeft = ((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])
-            var tableRight = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
-            var attrRight = include.association.identifier
+              , tableLeft       = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
+              , attrLeft        = ((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])
+              , tableRight      = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
+              , attrRight       = include.association.identifier
+
             joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableLeft) + "." + this.quoteIdentifier(attrLeft) + " = " + this.quoteIdentifier(tableRight) + "." + this.quoteIdentifier(attrRight)
           } else {
-            var primaryKeysSource = Object.keys(include.association.source.primaryKeys);
-            var tableSource = tableName
-            var identSource = include.association.identifier
-            var attrSource = ((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])
+            var primaryKeysSource = Object.keys(include.association.source.primaryKeys)
+              , tableSource       = tableName
+              , identSource       = include.association.identifier
+              , attrSource        = ((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])
 
-            var primaryKeysTarget = Object.keys(include.association.target.primaryKeys);
-            var tableTarget = include.as
-            var identTarget = include.association.foreignIdentifier
-            var attrTarget = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
+            var primaryKeysTarget = Object.keys(include.association.target.primaryKeys)
+              , tableTarget       = include.as
+              , identTarget       = include.association.foreignIdentifier
+              , attrTarget        = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
 
-            var tableJunction = include.association.connectorDAO.tableName
+            var tableJunction     = include.association.connectorDAO.tableName
             joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(tableJunction) + " ON " + this.quoteIdentifier(tableSource) + "." + this.quoteIdentifier(attrSource) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identSource)
             joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableTarget) + "." + this.quoteIdentifier(attrTarget) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identTarget)
           }

lib/dialects/postgres/query-generator.js

@@ -272,8 +272,8 @@ module.exports = (function() {
               attrRight:  this.quoteIdentifier(include.association.identifier)
             })
           } else {
-            var primaryKeysSource = Object.keys(include.association.source.primaryKeys);
-            var primaryKeysTarget = Object.keys(include.association.target.primaryKeys);
+            var primaryKeysSource = Object.keys(include.association.source.primaryKeys)
+              , primaryKeysTarget = Object.keys(include.association.target.primaryKeys)
 
             query += Utils._.template(joinQuery)({
               table:      this.quoteIdentifiers(include.association.connectorDAO.tableName),

lib/dialects/sqlite/query-generator.js

@@ -171,27 +171,28 @@ module.exports = (function() {
           optAttributes = optAttributes.concat(attributes)
 
           var table = include.daoFactory.tableName
-          var as = include.as
+            , as    = include.as
 
           if (!include.association.connectorDAO) {
             var primaryKeysLeft = ((include.association.associationType === 'BelongsTo') ? Object.keys(include.association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
-            var tableLeft = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
-            var attrLeft = ((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])
-            var tableRight = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
-            var attrRight = include.association.identifier
+              , tableLeft       = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
+              , attrLeft        = ((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])
+              , tableRight      = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
+              , attrRight       = include.association.identifier
+              
             joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableLeft) + "." + this.quoteIdentifier(attrLeft) + " = " + this.quoteIdentifier(tableRight) + "." + this.quoteIdentifier(attrRight)
           } else {
-            var primaryKeysSource = Object.keys(include.association.source.primaryKeys);
-            var tableSource = tableName
-            var identSource = include.association.identifier
-            var attrSource = ((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])
+            var primaryKeysSource = Object.keys(include.association.source.primaryKeys)
+              , tableSource       = tableName
+              , identSource       = include.association.identifier
+              , attrSource        = ((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])
 
-            var primaryKeysTarget = Object.keys(include.association.target.primaryKeys);
-            var tableTarget = include.as
-            var identTarget = include.association.foreignIdentifier
-            var attrTarget = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
+            var primaryKeysTarget = Object.keys(include.association.target.primaryKeys)
+              , tableTarget       = include.as
+              , identTarget       = include.association.foreignIdentifier
+              , attrTarget        = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
 
-            var tableJunction = include.association.connectorDAO.tableName
+            var tableJunction     = include.association.connectorDAO.tableName
             joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(tableJunction) + " ON " + this.quoteIdentifier(tableSource) + "." + this.quoteIdentifier(attrSource) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identSource)
             joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableTarget) + "." + this.quoteIdentifier(attrTarget) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identTarget)
           }