不要怂,就是干,撸起袖子干!

Commit d8389862 by José Moreira

Remove variables used on tests

1 parent 2b706b61
Showing with 1 additions and 3 deletions
...@@ -766,7 +766,6 @@ module.exports = (function() { ...@@ -766,7 +766,6 @@ module.exports = (function() {
, tableRight = association.associationType === 'BelongsTo' ? parentTable : as , tableRight = association.associationType === 'BelongsTo' ? parentTable : as
, attrRight = association.identifier , attrRight = association.identifier
, joinOn , joinOn
, where
// Filter statement // Filter statement
// Used by both join and subquery where // Used by both join and subquery where
...@@ -789,7 +788,7 @@ module.exports = (function() { ...@@ -789,7 +788,7 @@ module.exports = (function() {
joinQueryItem += joinType + self.quoteTable(table, as) + " ON " + joinOn joinQueryItem += joinType + self.quoteTable(table, as) + " ON " + joinOn
if (include.where) { if (include.where) {
joinQueryItem += " AND " + ( where = self.getWhereConditions(include.where, self.sequelize.literal(self.quoteIdentifier(as)), include.model, whereOptions) ) joinOn += " AND " + self.getWhereConditions(include.where, self.sequelize.literal(self.quoteIdentifier(as)), include.model, whereOptions)
// If its a multi association we need to add a where query to the main where (executed in the subquery) // If its a multi association we need to add a where query to the main where (executed in the subquery)
if (subQuery && association.isMultiAssociation && include.required) { if (subQuery && association.isMultiAssociation && include.required) {
...@@ -801,7 +800,6 @@ module.exports = (function() { ...@@ -801,7 +800,6 @@ module.exports = (function() {
"SELECT " + self.quoteIdentifier(attrRight), "SELECT " + self.quoteIdentifier(attrRight),
"FROM " + self.quoteTable(table, as), "FROM " + self.quoteTable(table, as),
"WHERE " + joinOn, "WHERE " + joinOn,
"AND " + where,
"LIMIT 1", "LIMIT 1",
')', 'IS NOT NULL'].join(' ')) ')', 'IS NOT NULL'].join(' '))
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!