diff --git a/app/models/queries/versions/orders/name_order.rb b/app/models/queries/versions/orders/name_order.rb index 0c6f0ddcfc62..362b9340cfb9 100644 --- a/app/models/queries/versions/orders/name_order.rb +++ b/app/models/queries/versions/orders/name_order.rb @@ -36,7 +36,7 @@ def self.key private def order - ordered = Version.order_by_name + ordered = Version.order(:name) if direction == :desc ordered = ordered.reverse_order diff --git a/app/models/version.rb b/app/models/version.rb index 2cbd5a046211..002869967a95 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -57,8 +57,6 @@ class Version < ApplicationRecord scope :systemwide, -> { where(sharing: "system") } - scope :order_by_name, -> { order(Arel.sql("LOWER(#{Version.table_name}.name) ASC")) } - def self.with_status_open where(status: "open") end diff --git a/db/migrate/20240920152544_set_versions_name_collation.rb b/db/migrate/20240920152544_set_versions_name_collation.rb index 3a2da158eb9c..1109bf9eec4f 100644 --- a/db/migrate/20240920152544_set_versions_name_collation.rb +++ b/db/migrate/20240920152544_set_versions_name_collation.rb @@ -1,7 +1,7 @@ class SetVersionsNameCollation < ActiveRecord::Migration[7.1] def up execute <<-SQL.squish - CREATE COLLATION IF NOT EXISTS versions_name (provider = icu, locale = 'en-u-kn-true'); + CREATE COLLATION IF NOT EXISTS versions_name (provider = icu, locale = 'und-u-kn-true'); SQL change_column :versions, :name, :string, collation: "versions_name" diff --git a/modules/backlogs/app/models/backlog.rb b/modules/backlogs/app/models/backlog.rb index 0d3b80b13862..9dd2cbbaa898 100644 --- a/modules/backlogs/app/models/backlog.rb +++ b/modules/backlogs/app/models/backlog.rb @@ -32,7 +32,7 @@ class Backlog def self.owner_backlogs(project, options = {}) options.reverse_merge!(limit: nil) - backlogs = Sprint.apply_to(project).with_status_open.displayed_right(project).order_by_name + backlogs = Sprint.apply_to(project).with_status_open.displayed_right(project).order(:name) stories_by_sprints = Story.backlogs(project.id, backlogs.map(&:id))