Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit cc281bc7 by José Moreira
Options

Remove spacings to follow syntax 

I know that can mess up PR but is needed.
1 parent 18225123
Inline Side-by-side
Showing with 5 additions and 5 deletions
lib/dialects/abstract/query-generator.js
...@@ -737,11 +737,11 @@ module.exports = (function() { ...@@ -737,11 +737,11 @@ module.exports = (function() {
joinQueryItem += sourceJoinOn joinQueryItem += sourceJoinOn
// Generate join SQL for right side of through // Generate join SQL for right side of through
joinQueryItem += joinType + self.quoteTable( table, as ) + " ON " joinQueryItem += joinType + self.quoteTable(table, as) + " ON "
joinQueryItem += targetJoinOn joinQueryItem += targetJoinOn
if ( include.where ) { if (include.where) {
targetWhere = self.getWhereConditions(include.where, self.sequelize.literal(self.quoteIdentifier(as)), include.daoFactory, whereOptions) targetWhere = self.getWhereConditions(include.where, self.sequelize.literal(self.quoteIdentifier(as)), include.daoFactory, whereOptions)
joinQueryItem += " AND "+ targetWhere joinQueryItem += " AND "+ targetWhere
if (subQuery) { if (subQuery) {
...@@ -750,9 +750,9 @@ module.exports = (function() { ...@@ -750,9 +750,9 @@ module.exports = (function() {
// Creating the as-is where for the subQuery, checks that the required association exists // Creating the as-is where for the subQuery, checks that the required association exists
options.where["__"+throughAs] = self.sequelize.asIs([ '(', options.where["__"+throughAs] = self.sequelize.asIs([ '(',
"SELECT " + self.quoteIdentifier( throughAs ) + "." + self.quoteIdentifier( identSource ) + " FROM " + self.quoteTable(throughTable, throughAs), "SELECT " + self.quoteIdentifier(throughAs) + "." + self.quoteIdentifier(identSource) + " FROM " + self.quoteTable(throughTable, throughAs),
! include.required && joinType + self.quoteTable( association.source.tableName, tableSource ) + " ON " + sourceJoinOn || '', ! include.required && joinType + self.quoteTable(association.source.tableName, tableSource) + " ON " + sourceJoinOn || '',
joinType + self.quoteTable( table, as ) + " ON " + targetJoinOn, joinType + self.quoteTable(table, as) + " ON " + targetJoinOn,
"WHERE " + ( ! include.required && targetWhere || sourceJoinOn + " AND " + targetWhere ), "WHERE " + ( ! include.required && targetWhere || sourceJoinOn + " AND " + targetWhere ),
"LIMIT 1", "LIMIT 1",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!