From be48d6fd7f398a82558fa6e6d95f2508fd5cd1a2 Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Sat, 9 Nov 2024 02:03:34 +0100 Subject: [PATCH] Use Arel::FactoryMehods for coalesce() --- app/models/unit.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/models/unit.rb b/app/models/unit.rb index 6324fcb..4e88fa2 100644 --- a/app/models/unit.rb +++ b/app/models/unit.rb @@ -15,12 +15,9 @@ class Unit < ApplicationRecord scope :defaults, ->{ where(user: nil) } scope :ordered, ->{ - parent_symbol = Arel::Nodes::NamedFunction.new( - 'COALESCE', - [Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]] - ) left_outer_joins(:base) - .order(parent_symbol, arel_table[:base_id].asc.nulls_first, :multiplier, :symbol) + .order(arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]), + arel_table[:base_id].asc.nulls_first, :multiplier, :symbol) } before_destroy do