Added_null_placement_at_order_statement_v2.patch - Redmine

           arg = arg.keys.sort.collect {|k| arg[k]}
         end
         if arg
           c = arg.select {|k,o| !k.to_s.blank?}.slice(0,3).collect {|k,o| [k.to_s, (o == 'desc' || o == false) ? 'desc' : 'asc']}
           c = arg.select { |k, o| !k.to_s.blank? }.slice(0, 3).collect { |k, o| [k.to_s, o.to_s.empty? ? 'asc' : o.to_s] }
         end
         write_attribute(:sort_criteria, c)
       end
-...
           "  SELECT customized_id FROM #{CustomValue.table_name}" +
           "  WHERE customized_type='#{target_class}' AND custom_field_id=#{chained_custom_field_id}" +
           "  AND #{sql_for_field(field, operator, value, CustomValue.table_name, 'value')}))"
       end
       def sql_for_custom_field_attribute(field, operator, value, custom_field_id, attribute)

config/locales/ar.yml (date 1487680385000)
1229	1229	field_updated_by: Updated by
1230	1230	field_last_updated_by: Last updated by
1231	1231	field_full_width_layout: Full width layout
	1232	label_ascending_nulls_last: Ascending with null values at the end
	1233	label_descending_nulls_first: Descending with null values at the top

config/locales/az.yml (date 1487680385000)
1324	1324	field_updated_by: Updated by
1325	1325	field_last_updated_by: Last updated by
1326	1326	field_full_width_layout: Full width layout
	1327	label_ascending_nulls_last: Ascending with null values at the end
	1328	label_descending_nulls_first: Descending with null values at the top

config/locales/bg.yml (date 1487680385000)
1213	1213	description_date_from: Въведете начална дата
1214	1214	description_date_to: Въведете крайна дата
1215	1215	text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
	1216	label_ascending_nulls_last: Ascending with null values at the end
	1217	label_descending_nulls_first: Descending with null values at the top

config/locales/bs.yml (date 1487680385000)
1242	1242	field_updated_by: Updated by
1243	1243	field_last_updated_by: Last updated by
1244	1244	field_full_width_layout: Full width layout
	1245	label_ascending_nulls_last: Ascending with null values at the end
	1246	label_descending_nulls_first: Descending with null values at the top

config/locales/ca.yml (date 1487680385000)
1219	1219	field_updated_by: Updated by
1220	1220	field_last_updated_by: Last updated by
1221	1221	field_full_width_layout: Full width layout
	1222	label_ascending_nulls_last: Ascending with null values at the end
	1223	label_descending_nulls_first: Descending with null values at the top

config/locales/cs.yml (date 1487680385000)
1228	1228	field_updated_by: Updated by
1229	1229	field_last_updated_by: Last updated by
1230	1230	field_full_width_layout: Full width layout
	1231	label_ascending_nulls_last: Ascending with null values at the end
	1232	label_descending_nulls_first: Descending with null values at the top

config/locales/da.yml (date 1487680385000)
1246	1246	field_updated_by: Updated by
1247	1247	field_last_updated_by: Last updated by
1248	1248	field_full_width_layout: Full width layout
	1249	label_ascending_nulls_last: Ascending with null values at the end
	1250	label_descending_nulls_first: Descending with null values at the top

config/locales/de.yml (date 1487680385000)
1231	1231	field_updated_by: Updated by
1232	1232	field_last_updated_by: Last updated by
1233	1233	field_full_width_layout: Full width layout
	1234	label_ascending_nulls_last: Ascending with null values at the end
	1235	label_descending_nulls_first: Descending with null values at the top

config/locales/el.yml (date 1487680385000)
1229	1229	field_updated_by: Updated by
1230	1230	field_last_updated_by: Last updated by
1231	1231	field_full_width_layout: Full width layout
	1232	label_ascending_nulls_last: Ascending with null values at the end
	1233	label_descending_nulls_first: Descending with null values at the top

       label_sort: Sort
       label_ascending: Ascending
       label_descending: Descending
       label_ascending_nulls_last: Ascending with null values at the end
       label_descending_nulls_first: Descending with null values at the top
       label_date_from_to: From %{start} to %{end}
       label_wiki_content_added: Wiki page added
       label_wiki_content_updated: Wiki page updated

config/locales/es.yml (date 1487680385000)
1257	1257	field_updated_by: Updated by
1258	1258	field_last_updated_by: Last updated by
1259	1259	field_full_width_layout: Full width layout
	1260	label_ascending_nulls_last: Ascending with null values at the end
	1261	label_descending_nulls_first: Descending with null values at the top

config/locales/et.yml (date 1487680385000)
1234	1234	field_updated_by: Updated by
1235	1235	field_last_updated_by: Last updated by
1236	1236	field_full_width_layout: Full width layout
	1237	label_ascending_nulls_last: Ascending with null values at the end
	1238	label_descending_nulls_first: Descending with null values at the top

config/locales/eu.yml (date 1487680385000)
1230	1230	field_updated_by: Updated by
1231	1231	field_last_updated_by: Last updated by
1232	1232	field_full_width_layout: Full width layout
	1233	label_ascending_nulls_last: Ascending with null values at the end
	1234	label_descending_nulls_first: Descending with null values at the top

config/locales/fa.yml (date 1487680385000)
1230	1230	field_updated_by: Updated by
1231	1231	field_last_updated_by: Last updated by
1232	1232	field_full_width_layout: Full width layout
	1233	label_ascending_nulls_last: Ascending with null values at the end
	1234	label_descending_nulls_first: Descending with null values at the top\

config/locales/fi.yml (date 1487680385000)
1250	1250	field_updated_by: Updated by
1251	1251	field_last_updated_by: Last updated by
1252	1252	field_full_width_layout: Full width layout
	1253	label_ascending_nulls_last: Ascending with null values at the end
	1254	label_descending_nulls_first: Descending with null values at the top

config/locales/fr.yml (date 1487680385000)
1230	1230	label_no_preview: No preview available
1231	1231	label_user_mail_option_only_assigned: Only for things I watch or I am assigned to
1232	1232	label_user_mail_option_only_owner: Only for things I watch or I am the owner of
	1233	label_ascending_nulls_last: Ascending with null values at the end
	1234	label_descending_nulls_first: Descending with null values at the top

config/locales/gl.yml (date 1487680385000)
1237	1237	field_updated_by: Updated by
1238	1238	field_last_updated_by: Last updated by
1239	1239	field_full_width_layout: Full width layout
	1240	label_ascending_nulls_last: Ascending with null values at the end
	1241	label_descending_nulls_first: Descending with null values at the top

config/locales/he.yml (date 1487680385000)
1234	1234	field_updated_by: Updated by
1235	1235	field_last_updated_by: Last updated by
1236	1236	field_full_width_layout: Full width layout
	1237	label_ascending_nulls_last: Ascending with null values at the end
	1238	label_descending_nulls_first: Descending with null values at the top

config/locales/hr.yml (date 1487680385000)
1228	1228	field_updated_by: Updated by
1229	1229	field_last_updated_by: Last updated by
1230	1230	field_full_width_layout: Full width layout
	1231	label_ascending_nulls_last: Ascending with null values at the end
	1232	label_descending_nulls_first: Descending with null values at the top

config/locales/hu.yml (date 1487680385000)
1248	1248	field_updated_by: Updated by
1249	1249	field_last_updated_by: Last updated by
1250	1250	field_full_width_layout: Full width layout
	1251	label_ascending_nulls_last: Ascending with null values at the end
	1252	label_descending_nulls_first: Descending with null values at the top

config/locales/id.yml (date 1487680385000)
1233	1233	field_updated_by: Updated by
1234	1234	field_last_updated_by: Last updated by
1235	1235	field_full_width_layout: Full width layout
	1236	label_ascending_nulls_last: Ascending with null values at the end
	1237	label_descending_nulls_first: Descending with null values at the top

config/locales/it.yml (date 1487680385000)
1224	1224	field_updated_by: Updated by
1225	1225	field_last_updated_by: Last updated by
1226	1226	field_full_width_layout: Full width layout
	1227	label_ascending_nulls_last: Ascending with null values at the end
	1228	label_descending_nulls_first: Descending with null values at the top

config/locales/ja.yml (date 1487680385000)
1236	1236	field_updated_by: 更新者
1237	1237	field_last_updated_by: 最終更新者
1238	1238	field_full_width_layout: ワイド表示
	1239	label_ascending_nulls_last: Ascending with null values at the end
	1240	label_descending_nulls_first: Descending with null values at the top

config/locales/ko.yml (date 1487680385000)
1268	1268	field_updated_by: Updated by
1269	1269	field_last_updated_by: Last updated by
1270	1270	field_full_width_layout: Full width layout
	1271	label_ascending_nulls_last: Ascending with null values at the end
	1272	label_descending_nulls_first: Descending with null values at the top

config/locales/lt.yml (date 1487680385000)
1218	1218	field_updated_by: Updated by
1219	1219	field_last_updated_by: Last updated by
1220	1220	field_full_width_layout: Full width layout
	1221	label_ascending_nulls_last: Ascending with null values at the end
	1222	label_descending_nulls_first: Descending with null values at the top

config/locales/lv.yml (date 1487680385000)
1223	1223	field_updated_by: Updated by
1224	1224	field_last_updated_by: Last updated by
1225	1225	field_full_width_layout: Full width layout
	1226	label_ascending_nulls_last: Ascending with null values at the end
	1227	label_descending_nulls_first: Descending with null values at the top

config/locales/mk.yml (date 1487680385000)
1229	1229	field_updated_by: Updated by
1230	1230	field_last_updated_by: Last updated by
1231	1231	field_full_width_layout: Full width layout
	1232	label_ascending_nulls_last: Ascending with null values at the end
	1233	label_descending_nulls_first: Descending with null values at the top

config/locales/mn.yml (date 1487680385000)
1230	1230	field_updated_by: Updated by
1231	1231	field_last_updated_by: Last updated by
1232	1232	field_full_width_layout: Full width layout
	1233	label_ascending_nulls_last: Ascending with null values at the end
	1234	label_descending_nulls_first: Descending with null values at the top

config/locales/nl.yml (date 1487680385000)
1204	1204	field_updated_by: Updated by
1205	1205	field_last_updated_by: Last updated by
1206	1206	field_full_width_layout: Full width layout
	1207	label_ascending_nulls_last: Ascending with null values at the end
	1208	label_descending_nulls_first: Descending with null values at the top

config/locales/no.yml (date 1487680385000)
1219	1219	field_updated_by: Updated by
1220	1220	field_last_updated_by: Last updated by
1221	1221	field_full_width_layout: Full width layout
	1222	label_ascending_nulls_last: Ascending with null values at the end
	1223	label_descending_nulls_first: Descending with null values at the top

config/locales/pl.yml (date 1487680385000)
1244	1244	field_updated_by: Updated by
1245	1245	field_last_updated_by: Last updated by
1246	1246	field_full_width_layout: Full width layout
	1247	label_ascending_nulls_last: Ascending with null values at the end
	1248	label_descending_nulls_first: Descending with null values at the top

config/locales/pt.yml (date 1487680385000)
1232	1232	field_updated_by: Updated by
1233	1233	field_last_updated_by: Last updated by
1234	1234	field_full_width_layout: Full width layout
	1235	label_ascending_nulls_last: Ascending with null values at the end
	1236	label_descending_nulls_first: Descending with null values at the top

         month_names: [~, Ianuarie, Februarie, Martie, Aprilie, Mai, Iunie, Iulie, August, Septembrie, Octombrie, Noiembrie, Decembrie]
         abbr_month_names: [~, Ian, Feb, Mar, Apr, Mai, Iun, Iul, Aug, Sep, Oct, Noi, Dec]
         order:
           - :day
           - :month
           - :day- :month
           - :year
       time:
-...
       field_updated_by: Updated by
       field_last_updated_by: Last updated by
       field_full_width_layout: Full width layout
       label_ascending_nulls_last: Ascending with null values at the end
       label_descending_nulls_first: Descending with null values at the top

config/locales/ru.yml (date 1487680385000)
1331	1331	field_updated_by: Updated by
1332	1332	field_last_updated_by: Last updated by
1333	1333	field_full_width_layout: Full width layout
	1334	label_ascending_nulls_last: По возрастанию с пустыми значениями в конце
	1335	label_descending_nulls_first: По убыванию с пустыми значениями в начале

config/locales/sk.yml (date 1487680385000)
1219	1219	field_updated_by: Updated by
1220	1220	field_last_updated_by: Last updated by
1221	1221	field_full_width_layout: Full width layout
	1222	label_ascending_nulls_last: Ascending with null values at the end
	1223	label_descending_nulls_first: Descending with null values at the top

config/locales/sl.yml (date 1487680385000)
1229	1229	field_updated_by: Updated by
1230	1230	field_last_updated_by: Last updated by
1231	1231	field_full_width_layout: Full width layout
	1232	label_ascending_nulls_last: Ascending with null values at the end
	1233	label_descending_nulls_first: Descending with null values at the top

config/locales/sq.yml (date 1487680385000)
1225	1225	field_updated_by: Updated by
1226	1226	field_last_updated_by: Last updated by
1227	1227	field_full_width_layout: Full width layout
	1228	label_ascending_nulls_last: Ascending with null values at the end
	1229	label_descending_nulls_first: Descending with null values at the top

config/locales/sr.yml (date 1487680385000)
1230	1230	field_updated_by: Updated by
1231	1231	field_last_updated_by: Last updated by
1232	1232	field_full_width_layout: Full width layout
	1233	label_ascending_nulls_last: Ascending with null values at the end
	1234	label_descending_nulls_first: Descending with null values at the top

config/locales/sv.yml (date 1487680385000)
1262	1262	field_updated_by: Updated by
1263	1263	field_last_updated_by: Last updated by
1264	1264	field_full_width_layout: Full width layout
	1265	label_ascending_nulls_last: Ascending with null values at the end
	1266	label_descending_nulls_first: Descending with null values at the top

config/locales/th.yml (date 1487680385000)
1226	1226	field_updated_by: Updated by
1227	1227	field_last_updated_by: Last updated by
1228	1228	field_full_width_layout: Full width layout
	1229	label_ascending_nulls_last: Ascending with null values at the end
	1230	label_descending_nulls_first: Descending with null values at the top

config/locales/tr.yml (date 1487680385000)
1237	1237	field_updated_by: Updated by
1238	1238	field_last_updated_by: Last updated by
1239	1239	field_full_width_layout: Full width layout
	1240	label_ascending_nulls_last: Ascending with null values at the end
	1241	label_descending_nulls_first: Descending with null values at the top

config/locales/uk.yml (date 1487680385000)
1224	1224	field_updated_by: Updated by
1225	1225	field_last_updated_by: Last updated by
1226	1226	field_full_width_layout: Full width layout
	1227	label_ascending_nulls_last: Ascending with null values at the end
	1228	label_descending_nulls_first: Descending with null values at the top

config/locales/vi.yml (date 1487680385000)
1282	1282	field_updated_by: Updated by
1283	1283	field_last_updated_by: Last updated by
1284	1284	field_full_width_layout: Full width layout
	1285	label_ascending_nulls_last: Ascending with null values at the end
	1286	label_descending_nulls_first: Descending with null values at the top

config/locales/zh.yml (date 1487680385000)
1222	1222	field_updated_by: Updated by
1223	1223	field_last_updated_by: Last updated by
1224	1224	field_full_width_layout: Full width layout
	1225	label_ascending_nulls_last: Ascending with null values at the end
	1226	label_descending_nulls_first: Descending with null values at the top

             (ActiveRecord::Base.connection.adapter_name =~ /mysql/i).present?
           end
           def sqlite3?
             (ActiveRecord::Base.connection.adapter_name =~ /sqlite/i).present?
           end
           def sqlserver?
             (ActiveRecord::Base.connection.adapter_name =~ /sqlserver/i).present?
           end
           # Returns a SQL statement for case/accent (if possible) insensitive match
           def like(left, right, options={})
             neg = (options[:match] == false ? 'NOT ' : '')
-...
             end
           end
           def firebird?
             (ActiveRecord::Base.connection.adapter_name =~ /firebird/i).present?
           end
           # Resets database information
           def reset
             @postgresql_unaccent = nil

config/locales/en-GB.yml (date 1487680385000)
1231	1231	field_updated_by: Updated by
1232	1232	field_last_updated_by: Last updated by
1233	1233	field_full_width_layout: Full width layout
	1234	label_ascending_nulls_last: Ascending with null values at the end
	1235	label_descending_nulls_first: Descending with null values at the top

config/locales/es-PA.yml (date 1487680385000)
1259	1259	field_updated_by: Updated by
1260	1260	field_last_updated_by: Last updated by
1261	1261	field_full_width_layout: Full width layout
	1262	label_ascending_nulls_last: Ascending with null values at the end
	1263	label_descending_nulls_first: Descending with null values at the top

config/locales/pt-BR.yml (date 1487680385000)
1247	1247	field_updated_by: Updated by
1248	1248	field_last_updated_by: Last updated by
1249	1249	field_full_width_layout: Full width layout
	1250	label_ascending_nulls_last: Ascending with null values at the end
	1251	label_descending_nulls_first: Descending with null values at the top

config/locales/sr-YU.yml (date 1487680385000)
1231	1231	field_updated_by: Updated by
1232	1232	field_last_updated_by: Last updated by
1233	1233	field_full_width_layout: Full width layout
	1234	label_ascending_nulls_last: Ascending with null values at the end
	1235	label_descending_nulls_first: Descending with null values at the top

config/locales/zh-TW.yml (date 1487680385000)
1296	1296	description_date_from: 輸入起始日期
1297	1297	description_date_to: 輸入結束日期
1298	1298	text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
	1299	label_ascending_nulls_last: Ascending with null values at the end
	1300	label_descending_nulls_first: Descending with null values at the top

         def available_criteria=(criteria)
           unless criteria.is_a?(Hash)
             criteria = criteria.inject({}) {|h,k| h[k] = k; h}
             criteria = criteria.inject({}) { |h, k| h[k] = k; h }
           end
           @available_criteria = criteria
         end
         def from_param(param)
           @criteria = param.to_s.split(',').collect {|s| s.split(':')[0..1]}
           @criteria = param.to_s.split(',').collect { |s| s.split(':')[0..1] }
           normalize!
         end
-...
         end
         def to_param
           @criteria.collect {|k,o| k + (o ? '' : ':desc')}.join(',')
           @criteria.collect { |k, o| k + ":#{o.to_s}" }.join(',')
         end
         # Returns an array of SQL fragments used to sort the list
         def to_sql
           sql = @criteria.collect do |k,o|
           sql = @criteria.collect do |k, o|
             if s = @available_criteria[k]
               s = [s] unless s.is_a?(Array)
               s.collect {|c| append_order(c, o ? "ASC" : "DESC")}
               s.collect { |c| append_order(c, o.to_s.upcase) }
             end
           end.flatten.compact
           sql.blank? ? nil : sql
-...
         end
         def add!(key, asc)
           @criteria.delete_if {|k,o| k == key}
           @criteria.delete_if { |k, o| k == key }
           @criteria = [[key, asc]] + @criteria
           normalize!
         end
-...
         end
         def first_asc?
           @criteria.first && @criteria.first.last
           @criteria.first && @criteria.first.last.to_s.downcase.start_with?("asc")
         end
         def empty?
-...
         def normalize!
           @criteria ||= []
           @criteria = @criteria.collect {|s| s = Array(s); [s.first, (s.last == false || s.last == 'desc') ? false : true]}
           @criteria = @criteria.select {|k,o| @available_criteria.has_key?(k)} if @available_criteria
           @criteria = @criteria.collect { |s| s = Array(s); [s.first, s[1].nil? ? 'asc' :
               (s.last.to_s.downcase.start_with?('desc', 'asc')? s.last.to_s : 'asc')] }
           @criteria = @criteria.select { |k, o| @available_criteria.has_key?(k) } if @available_criteria
           @criteria.slice!(3)
           self
         end
-...
           if criterion =~ / (asc|desc)$/i
             criterion
           else
             "#{criterion} #{order}"
             if (order =~ /nulls/i).present?
               t = order.to_s.split(' ')
               sort_order = t.first
               nulls_last = t.last.to_s.downcase.eql?("last")
               if Redmine::Database.mysql?
                 "ISNULL(#{criterion}) #{nulls_last ? "ASC" : "DESC"}, #{criterion} #{sort_order}"
               elsif Redmine::Database.sqlserver? || Redmine::Database.sqlite3?
                 "#{criterion} IS NULL #{nulls_last ? "ASC" : "DESC"}, #{criterion} #{sort_order}"
               else
                 "#{criterion} #{order}"
               end
             else
               "#{criterion} #{order}"
             end
           end
         end
-...
+      #
       def sort_init(*args)
         case args.size
         when 1
           @sort_default = args.first.is_a?(Array) ? args.first : [[args.first]]
         when 2
           @sort_default = [[args.first, args.last]]
         else
           raise ArgumentError
           when 1
             @sort_default = args.first.is_a?(Array) ? args.first : [[args.first]]
           when 2
             @sort_default = [[args.first, args.last]]
           else
             raise ArgumentError
         end
       end
-...
         end
         caption = column.to_s.humanize unless caption
         sort_options = { :sort => @sort_criteria.add(column.to_s, order).to_param }
         sort_options = {:sort => @sort_criteria.add(column.to_s, order).to_param}
         link_to(caption, {:params => request.query_parameters.merge(sort_options)}, :class => css)
       end

           # objects by their value of the custom field.
           # Returns nil if the custom field can not be used for sorting.
           def order_statement(custom_field)
             # COALESCE is here to make sure that blank and NULL values are sorted equally
             "COALESCE(#{join_alias custom_field}.value, '')"
             "#{join_alias custom_field}.value" #COALESCE removed to allow null placement on order
           end
           # Returns a GROUP BY clause that can used to group by custom value

     <%= label_tag "query_sort_criteria_direction_" + i.to_s,
                   l(:description_query_sort_criteria_direction), :class => "hidden-for-sighted" %>
     <%= select_tag("query[sort_criteria][#{i}][]",
                     options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc']], @query.sort_criteria_order(i)),
                     options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc'], [l(:label_ascending_nulls_last), 'asc nulls last'], [l(:label_descending_nulls_first), 'desc nulls first']], @query.sort_criteria_order(i)),
                     :id => "query_sort_criteria_direction_" + i.to_s) %>
     <br />
     <% end %>

Project

General

Profile

Redmine

Patch #25066 » Added_null_placement_at_order_statement_v2.patch