Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
public
/
sequelize
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
不要怂,就是干,撸起袖子干!
Commit d8389862
authored
May 07, 2014
by
José Moreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove variables used on tests
1 parent
2b706b61
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
3 deletions
lib/dialects/abstract/query-generator.js
lib/dialects/abstract/query-generator.js
View file @
d838986
...
...
@@ -766,7 +766,6 @@ module.exports = (function() {
,
tableRight
=
association
.
associationType
===
'BelongsTo'
?
parentTable
:
as
,
attrRight
=
association
.
identifier
,
joinOn
,
where
// Filter statement
// Used by both join and subquery where
...
...
@@ -789,7 +788,7 @@ module.exports = (function() {
joinQueryItem
+=
joinType
+
self
.
quoteTable
(
table
,
as
)
+
" ON "
+
joinOn
if
(
include
.
where
)
{
join
QueryItem
+=
" AND "
+
(
where
=
self
.
getWhereConditions
(
include
.
where
,
self
.
sequelize
.
literal
(
self
.
quoteIdentifier
(
as
)),
include
.
model
,
whereOptions
)
)
join
On
+=
" 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
(
subQuery
&&
association
.
isMultiAssociation
&&
include
.
required
)
{
...
...
@@ -801,7 +800,6 @@ module.exports = (function() {
"SELECT "
+
self
.
quoteIdentifier
(
attrRight
),
"FROM "
+
self
.
quoteTable
(
table
,
as
),
"WHERE "
+
joinOn
,
"AND "
+
where
,
"LIMIT 1"
,
')'
,
'IS NOT NULL'
].
join
(
' '
))
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment