diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-09-26 08:19:28 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-09-26 08:19:28 +0000 |
| commit | ab760054ee8f80d06e8552114d51bfd7103d21ee (patch) | |
| tree | a5883afd9eb564c8eddb54a71693149ade395fd2 | |
| parent | 758c85978d25ba2cb77061de9046cd3120898604 (diff) | |
| parent | 6823e7defb45dfd86d5258b40d6f82482d1ef451 (diff) | |
| download | gitlab-ce-ab760054ee8f80d06e8552114d51bfd7103d21ee.tar.gz | |
Merge branch 'tc-fix-rails5-subquery-selfjoin' into 'master'
Work around a bug in Rails 5, where LIMIT causes trouble
Closes #51729
See merge request gitlab-org/gitlab-ce!21879
| -rw-r--r-- | lib/gitlab/database/subquery.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/gitlab/database/subquery.rb b/lib/gitlab/database/subquery.rb index 2a6f39c6a27..36e4559b554 100644 --- a/lib/gitlab/database/subquery.rb +++ b/lib/gitlab/database/subquery.rb @@ -6,7 +6,15 @@ module Gitlab class << self def self_join(relation) t = relation.arel_table - t2 = relation.arel.as('t2') + t2 = if !Gitlab.rails5? + relation.arel.as('t2') + else + # Work around a bug in Rails 5, where LIMIT causes trouble + # See https://gitlab.com/gitlab-org/gitlab-ce/issues/51729 + r = relation.limit(nil).arel + r.take(relation.limit_value) if relation.limit_value + r.as('t2') + end relation.unscoped.joins(t.join(t2).on(t[:id].eq(t2[:id])).join_sources.first) end |