Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
bba46623
Commit
bba46623
authored
9 years ago
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed UNION syntax for MySQL
MySQL doesn't support the previous syntax.
parent
24c8f422
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/models/user.rb
app/models/user.rb
+2
-2
No files found.
app/models/user.rb
View file @
bba46623
...
@@ -238,9 +238,9 @@ class User < ActiveRecord::Base
...
@@ -238,9 +238,9 @@ class User < ActiveRecord::Base
# Arel doesn't allow for chaining operations on union nodes, thus we have
# Arel doesn't allow for chaining operations on union nodes, thus we have
# to write this query by hand. See the following issue for more info:
# to write this query by hand. See the following issue for more info:
# https://github.com/rails/arel/issues/98.
# https://github.com/rails/arel/issues/98.
sql
=
'(SELECT * FROM users WHERE email = :email
sql
=
'(SELECT * FROM users WHERE email = :email
)
UNION
UNION
SELECT users.*
(
SELECT users.*
FROM emails
FROM emails
INNER JOIN users ON users.id = emails.user_id
INNER JOIN users ON users.id = emails.user_id
WHERE emails.email = :email)
WHERE emails.email = :email)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment