Merge branch 'forked-subquery-order' into 'master'

Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery See merge request !10334

Merge branch 'forked-subquery-order' into 'master'
53b21c1e · Yorick Peterse · adb1cf82 · dc15abaa · 53b21c1e · 53b21c1e
Commit 53b21c1e authored Mar 31, 2017 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

user.rb app/models/user.rb +4 -2

forked-subquery-order.yml changelogs/unreleased/forked-subquery-order.yml +4 -0

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -635,8 +635,10 @@ class User < ActiveRecord::Base
  end

  def fork_of(project)
-    links = ForkedProjectLink.where(forked_from_project_id: project, forked_to_project_id: personal_projects)
-
+    links = ForkedProjectLink.where(
+      forked_from_project_id: project,
+      forked_to_project_id: personal_projects.unscope(:order)
+    )
    if links.any?
      links.first.forked_to_project
    else

--- a/changelogs/unreleased/forked-subquery-order.yml
+++ b/changelogs/unreleased/forked-subquery-order.yml
+---
+title: Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery
+merge_request:
+author: mhasbini