fix(include): fixes bad logic on when to use attribute with subquery naming and …

…when to use attribute directly in joins

fix(include): fixes bad logic on when to use attribute with subquery naming and …
…when to use attribute directly in joins
Mick Hansen
Commit 791b44d5 authored Nov 04, 2014 by Mick Hansen
Showing with 2 additions and 2 deletions
lib/dialects/abstract/query-generator.js
--- a/lib/dialects/abstract/query-generator.js
+++ b/lib/dialects/abstract/query-generator.js
@@ -954,7 +954,7 @@ module.exports = (function() {
            joinOn =
              // Left side
              (
-                (subQuery && !include.subQuery && include.parent.subQuery && !(include.hasParentRequired && include.hasParentWhere)) && self.quoteIdentifier(tableLeft + '.' + attrLeft) ||
+                (subQuery && !include.subQuery && include.parent.subQuery && (include.hasParentRequired || include.hasParentWhere)) && self.quoteIdentifier(tableLeft + '.' + attrLeft) ||
                self.quoteTable(tableLeft) + '.' + self.quoteIdentifier(attrLeft)
              )

@@ -962,7 +962,7 @@ module.exports = (function() {

              // Right side
              (
-                (subQuery && !include.subQuery && include.parent.subQuery && (include.hasParentRequired && include.hasParentWhere)) && self.quoteIdentifier(tableRight + '.' + attrRight) ||
+                (subQuery && !include.subQuery && include.parent.subQuery && (include.hasParentRequired || include.hasParentWhere)) && self.quoteIdentifier(tableRight + '.' + attrRight) ||
                self.quoteTable(tableRight) + '.' + self.quoteIdentifier(attrRight)
              );