jro_apps/redmine Commit - r10885:a8083fb9a81d

Pass the order option as an array to satisfy sqlserver adapter (#12713)....

Jean-Philippe Lang -

r10885:a8083fb9a81d

parent child

Context file:

r10885:a8083fb9a81d

Collapse all files

app/helpers/sort_helper.rb +3 -2

                   @criteria.collect {|k,o| k + (o ? '' : ':desc')}.join(',')
                 end
+                # Returns an array of SQL fragments used to sort the list
                 def to_sql
                   sql = @criteria.collect do |k,o|
                     if s = @available_criteria[k]
-                      (o ? s.to_a : s.to_a.collect {|c| append_desc(c)}).join(', ')
+                      (o ? s.to_a : s.to_a.collect {|c| append_desc(c)})
                     end
-                  end.compact.join(', ')
+                  end.flatten.compact
                   sql.blank? ? nil : sql
                 end

app/models/issue_query.rb +4 -6

               # Returns the issues
               # Valid options are :order, :offset, :limit, :include, :conditions
               def issues(options={})
-                order_option = [group_by_sort_order, options[:order]].reject {|s| s.blank?}.join(',')
+                order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
-                order_option = nil if order_option.blank?
                 issues = Issue.visible.where(options[:conditions]).all(
                   :include => ([:status, :project] + (options[:include] || [])).uniq,
                   :conditions => statement,
                   :order => order_option,
-                  :joins => joins_for_order_statement(order_option),
+                  :joins => joins_for_order_statement(order_option.join(',')),
                   :limit  => options[:limit],
                   :offset => options[:offset]
                 )
               # Returns the issues ids
               def issue_ids(options={})
-                order_option = [group_by_sort_order, options[:order]].reject {|s| s.blank?}.join(',')
+                order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
-                order_option = nil if order_option.blank?
                 Issue.visible.scoped(:conditions => options[:conditions]).scoped(:include => ([:status, :project] + (options[:include] || [])).uniq,
                                  :conditions => statement,
                                  :order => order_option,
-                                 :joins => joins_for_order_statement(order_option),
+                                 :joins => joins_for_order_statement(order_option.join(',')),
                                  :limit  => options[:limit],
                                  :offset => options[:offset]).find_ids
               rescue ::ActiveRecord::StatementInvalid => e

test/unit/helpers/sort_helper_test.rb +6 -6

                 sort_init 'attr1', 'desc'
                 sort_update(['attr1', 'attr2'])
-                assert_equal 'attr1 DESC', sort_clause
+                assert_equal ['attr1 DESC'], sort_clause
               end
               def test_default_sort_clause_with_hash
                 sort_init 'attr1', 'desc'
                 sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
-                assert_equal 'table1.attr1 DESC', sort_clause
+                assert_equal ['table1.attr1 DESC'], sort_clause
               end
               def test_default_sort_clause_with_multiple_columns
                 sort_init 'attr1', 'desc'
                 sort_update({'attr1' => ['table1.attr1', 'table1.attr2'], 'attr2' => 'table2.attr2'})
-                assert_equal 'table1.attr1 DESC, table1.attr2 DESC', sort_clause
+                assert_equal ['table1.attr1 DESC', 'table1.attr2 DESC'], sort_clause
               end
               def test_params_sort
                 sort_init 'attr1', 'desc'
                 sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
-                assert_equal 'table1.attr1, table2.attr2 DESC', sort_clause
+                assert_equal ['table1.attr1', 'table2.attr2 DESC'], sort_clause
                 assert_equal 'attr1,attr2:desc', @session['foo_bar_sort']
               end
                 sort_init 'attr1', 'desc'
                 sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
-                assert_equal 'table1.attr1 DESC', sort_clause
+                assert_equal ['table1.attr1 DESC'], sort_clause
                 assert_equal 'attr1:desc', @session['foo_bar_sort']
               end
                 sort_init 'attr1', 'desc'
                 sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
-                assert_equal 'table1.attr1, table2.attr2', sort_clause
+                assert_equal ['table1.attr1', 'table2.attr2'], sort_clause
                 assert_equal 'attr1,attr2', @session['foo_bar_sort']
               end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages