add test for mysql flag

config/database.yml.example

@@ -35,6 +35,11 @@ production:
   username: root
   password:
   encoding: utf8
+  variables:
+    # These are the default MySql Modes for rails 5.0 only excluding
+    # ONLY_FULL_GROUP_BY which would interfere with the current implementation
+    # of the query grouping by custom fields.
+    sql_mode: "no_auto_value_on_zero,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,error_for_division_by_zero,no_auto_create_user,no_engine_substitution"
 
 development:
   adapter: mysql2
@@ -60,6 +65,11 @@ test:
   password:
   encoding: utf8
   pool: 20
+  variables:
+    # These are the default MySql Modes for rails 5.0 only excluding
+    # ONLY_FULL_GROUP_BY which would interfere with the current implementation
+    # of the query grouping by custom fields.
+    sql_mode: "no_auto_value_on_zero,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,error_for_division_by_zero,no_auto_create_user,no_engine_substitution"
 
 #test_pgsql:
   #adapter: postgresql

lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb

@@ -60,7 +60,7 @@ module Redmine
         end
 
         def available_custom_fields
-          CustomField.where("type = '#{self.class.name}CustomField'").order(:position)
+          CustomField.where(type: "#{self.class.name}CustomField").order(:position)
         end
 
         # Sets the values of the object's custom fields

script/templates/database.travis.mysql.yml

@@ -32,3 +32,5 @@ test:
   username: travis
   encoding: utf8
   pool: 20
+  variables:
+    sql_mode: "no_auto_value_on_zero,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,error_for_division_by_zero,no_auto_create_user,no_engine_substitution"

spec/models/query/results_spec.rb

@@ -38,6 +38,34 @@ describe ::Query::Results, type: :model do
                                           :fixed_version],
                                 order: 'work_packages.root_id DESC, work_packages.lft ASC'
   end
+  let(:project_1) { FactoryGirl.create :project }
+  let(:role_pm) do
+    FactoryGirl.create(:role,
+                       permissions: [
+                         :view_work_packages,
+                         :edit_work_packages,
+                         :create_work_packages,
+                         :delete_work_packages
+                       ])
+  end
+  let(:role_dev) do
+    FactoryGirl.create(:role,
+                       permissions: [:view_work_packages])
+  end
+  let(:user_1) do
+    FactoryGirl.create(:user,
+                       firstname: 'user',
+                       lastname: '1',
+                       member_in_project: project_1,
+                       member_through_role: [role_dev, role_pm])
+  end
+  let(:wp_p1) do
+    (1..3).map do
+      FactoryGirl.create(:work_package,
+                         project: project_1,
+                         assigned_to_id: user_1.id)
+    end
+  end
 
   describe '#work_package_count_by_group' do
     context 'when grouping by responsible' do
@@ -52,26 +80,6 @@ describe ::Query::Results, type: :model do
   describe '#work_packages' do
     let!(:project_1) { FactoryGirl.create :project }
     let!(:project_2) { FactoryGirl.create :project }
-    let!(:role_pm) {
-      FactoryGirl.create(:role,
-                         name: 'Manager',
-                         permissions: [
-                           :view_work_packages,
-                           :edit_work_packages,
-                           :create_work_packages,
-                           :delete_work_packages
-                         ])
-    }
-    let!(:role_dev) {
-      FactoryGirl.create(:role,
-                         name: 'Developer',
-                         permissions: [:view_work_packages])
-    }
-    let!(:user_1) {
-      FactoryGirl.create(:user,
-                         member_in_project: project_1,
-                         member_through_role: [role_dev, role_pm])
-    }
     let!(:member) {
       FactoryGirl.create(:member,
                          project: project_2,
@@ -80,17 +88,12 @@ describe ::Query::Results, type: :model do
     }
     let!(:user_2) {
       FactoryGirl.create(:user,
+                         firstname: 'user',
+                         lastname: '2',
                          member_in_project: project_2,
                          member_through_role: role_dev)
     }
 
-    let!(:wp_p1) {
-      (1..3).map {
-        FactoryGirl.create(:work_package,
-                           project: project_1,
-                           assigned_to_id: user_1.id)
-      }
-    }
     let!(:wp_p2) {
       FactoryGirl.create(:work_package,
                          project: project_2,
@@ -102,6 +105,10 @@ describe ::Query::Results, type: :model do
                          assigned_to_id: user_1.id)
     }
 
+    before do
+      wp_p1
+    end
+
     context 'when filtering for assigned_to_role' do
       before do
         allow(User).to receive(:current).and_return(user_2)
@@ -195,4 +202,39 @@ describe ::Query::Results, type: :model do
       end
     end
   end
+
+  # Introduced to ensure being able to group by custom fields
+  # when running on a MySQL server.
+  # When upgrading to rails 5, the sql_mode passed on with the connection
+  # does include the "only_full_group_by" flag by default which causes our queries to become
+  # invalid because (mysql error):
+  # "SELECT list is not in GROUP BY clause and contains nonaggregated column
+  # 'config_myproject_test.work_packages.id' which is not functionally
+  # dependent on columns in GROUP BY clause"
+  context 'when grouping by custom field' do
+    let!(:custom_field) do
+      FactoryGirl.create(:int_wp_custom_field, is_for_all: true, is_filter: true)
+    end
+
+    before do
+      allow(User).to receive(:current).and_return(user_1)
+
+      wp_p1[0].type.custom_fields << custom_field
+      project_1.work_package_custom_fields << custom_field
+
+      wp_p1[0].update_attribute(:"custom_field_#{custom_field.id}", 42)
+      wp_p1[0].save
+      wp_p1[1].update_attribute(:"custom_field_#{custom_field.id}", 42)
+      wp_p1[1].save
+
+      query.project = project_1
+      query.group_by = "cf_#{custom_field.id}"
+    end
+
+    describe '#work_package_count_by_group' do
+      it 'returns a hash of counts by value' do
+        expect(query.results.work_package_count_by_group).to eql(42 => 2, nil => 1)
+      end
+    end
+  end
 end

spec/models/query_spec.rb

@@ -80,7 +80,6 @@ describe Query, type: :model do
       let(:custom_field) do
         FactoryGirl.create :text_issue_custom_field, is_filter: true, is_for_all: true
       end
-      let(:query) { FactoryGirl.build(:query) }
 
       before do
         query.add_filter('cf_' + custom_field.id.to_s, '=', [''])