Rails5 Fix arel from

a91999e4 · Jasper Maes · f8bd8f4f · a91999e4 · a91999e4
Commit a91999e4 authored Jun 02, 2018 by Jasper Maes
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

changelogs/unreleased/rails5-fix-46281.yml changelogs/unreleased/rails5-fix-46281.yml +5 -0

lib/gitlab/database/median.rb lib/gitlab/database/median.rb +7 -2

No files found.
--- a/changelogs/unreleased/rails5-fix-46281.yml
+++ b/changelogs/unreleased/rails5-fix-46281.yml
+---
+title: Rails5 fix arel from
+merge_request: 19340
+author: Jasper Maes
+type: fixed
--- a/lib/gitlab/database/median.rb
+++ b/lib/gitlab/database/median.rb
@@ -143,8 +143,13 @@ module Gitlab
                .order(arel_table[column_sym])
            ).as('row_id')

-          count = arel_table.from(arel_table.alias)
-                    .project('COUNT(*)')
+          arel_from = if Gitlab.rails5?
+                        arel_table.from.from(arel_table.alias)
+                      else
+                        arel_table.from(arel_table.alias)
+                      end
+
+          count = arel_from.project('COUNT(*)')
                    .where(arel_table[partition_column].eq(arel_table.alias[partition_column]))
                    .as('ct')