Implement fourth round of comments from @DouweM.

- Pluralize summary titles
- Remove the `run_query` method - always return sql strings from the
  `date_time_sql` methods

3 files changed, 14 insertions, 18 deletions

diff --git a/app/controllers/projects/cycle_analytics_controller.rb b/app/controllers/projects/cycle_analytics_controller.rb
index 7f0689306be..16a7b1fc6e2 100644
--- a/app/controllers/projects/cycle_analytics_controller.rb
+++ b/app/controllers/projects/cycle_analytics_controller.rb
@@ -1,5 +1,6 @@
 class Projects::CycleAnalyticsController < Projects::ApplicationController
   include ActionView::Helpers::DateHelper
+  include ActionView::Helpers::TextHelper
 
   before_action :authorize_read_cycle_analytics!
 
@@ -48,10 +49,14 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
       stats
     end
 
+    issues = @cycle_analytics.summary.new_issues
+    commits = @cycle_analytics.summary.commits
+    deploys = @cycle_analytics.summary.deploys
+
     summary = [
-      { title: "New Issues", value: @cycle_analytics.summary.new_issues },
-      { title: "Commits", value: @cycle_analytics.summary.commits },
-      { title: "Deploys", value: @cycle_analytics.summary.deploys }
+      { title: "New Issue".pluralize(issues), value: issues },
+      { title: "Commit".pluralize(commits), value: commits },
+      { title: "Deploy".pluralize(deploys), value: deploys }
     ]
 
     {
diff --git a/lib/gitlab/database/median.rb b/lib/gitlab/database/median.rb
index 5db05b98d5a..1444d25ebc7 100644
--- a/lib/gitlab/database/median.rb
+++ b/lib/gitlab/database/median.rb
@@ -10,7 +10,9 @@ module Gitlab
             mysql_median_datetime_sql(arel_table, query_so_far, column_sym)
           end
 
-        results = Array.wrap(median_queries).map { |query| Util.run_query(query) }
+        results = Array.wrap(median_queries).map do |query|
+          ActiveRecord::Base.connection.execute(query)
+        end
         extract_median(results).presence
       end
 
@@ -46,7 +48,7 @@ module Gitlab
           Arel.sql("CREATE TEMPORARY TABLE IF NOT EXISTS #{query_so_far.to_sql}"),
           Arel.sql("set @ct := (select count(1) from #{arel_table.table_name});"),
           Arel.sql("set @row_id := 0;"),
-          query,
+          query.to_sql,
           Arel.sql("DROP TEMPORARY TABLE IF EXISTS #{arel_table.table_name};")
         ]
       end
@@ -87,7 +89,8 @@ module Gitlab
               )
             )
           ).
-          with(query_so_far, cte)
+          with(query_so_far, cte).
+          to_sql
       end
 
       private
diff --git a/lib/gitlab/database/util.rb b/lib/gitlab/database/util.rb
deleted file mode 100644
index 12b68deae89..00000000000
--- a/lib/gitlab/database/util.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Gitlab
-  module Database
-    module Util
-      class << self
-        def run_query(query)
-          query = query.to_sql unless query.is_a?(String)
-          ActiveRecord::Base.connection.execute(query)
-        end
-      end
-    end
-  end
-end