test/associations/alias.js pass

lib/dialects/mssql/sql-generator.js

@@ -528,12 +528,16 @@ module.exports = {
       }
       }
     }
     }
     var associationType = include.association.associationType;
     var associationType = include.association.associationType;
-    var rootKey = primaryKey;
-    console.log(include.association);
-    var joinKey = quoteIdentifier(include.association.foreignKey);
+    var rootKey,joinKey;
     if(associationType === 'BelongsTo'){
     if(associationType === 'BelongsTo'){
       rootKey = quoteIdentifier(include.association.foreignKey);
       rootKey = quoteIdentifier(include.association.foreignKey);
       joinKey = primaryKey;
       joinKey = primaryKey;
+    }else if (associationType === 'HasMany'){
+      rootKey = primaryKey;
+      joinKey = quoteIdentifier(include.association.identifier);
+    }else{
+      rootKey = primaryKey;
+      joinKey = quoteIdentifier(include.association.foreignKey);
     }
     }
     var joinType = include.required ? 'INNER JOIN' : 'LEFT OUTER JOIN';
     var joinType = include.required ? 'INNER JOIN' : 'LEFT OUTER JOIN';
 
 
@@ -559,7 +563,7 @@ module.exports = {
       var val = where[key];
       var val = where[key];
       var operator = '=';
       var operator = '=';
 
 
-      if (val == 'NULL') {
+      if (val === 'NULL') {
         operator = 'IS';
         operator = 'IS';
       }
       }