From b2df11856144e91c84f51e8934e10e21f4f3fa70 Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Wed, 15 Jun 2016 12:10:41 +0200 Subject: [PATCH] Random selection now also works for MySQL --- db/fixtures/development/15_award_emoji.rb | 6 +++--- lib/gitlab/database.rb | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/db/fixtures/development/15_award_emoji.rb b/db/fixtures/development/15_award_emoji.rb index 1db10f5f0b..baac32f2d1 100644 --- a/db/fixtures/development/15_award_emoji.rb +++ b/db/fixtures/development/15_award_emoji.rb @@ -1,7 +1,7 @@ Gitlab::Seeder.quiet do emoji = Gitlab::AwardEmoji.emojis.keys - issue_count = Issue.count / 2 - Issue.order("RANDOM()").limit(Issue.count / 2).each do |issue| + + Issue.order(Gitlab::Database.random).limit(Issue.count / 2).each do |issue| project = issue.project project.team.users.sample(2).each do |user| @@ -16,7 +16,7 @@ Gitlab::Seeder.quiet do end end - MergeRequest.order("RANDOM()").limit(MergeRequest.count / 2).each do |mr| + MergeRequest.order(Gitlab::Database.random).limit(MergeRequest.count / 2).each do |mr| project = mr.project project.team.users.sample(2).each do |user| diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index 04fa6a3a5d..d76ecb5401 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -30,6 +30,10 @@ module Gitlab order end + def self.random + Gitlab::Database.postgresql? ? "RANDOM()" : "RAND()" + end + def true_value if Gitlab::Database.postgresql? "'t'"