Fix ArgumentError for text column length validations

`type_for_attribute(:description).limit` returns nil for text columns,
which newer Rails rejects with ArgumentError: :maximum must be a
non-negative Integer. Guard with `if type_for_attribute(...).limit`
to skip the validation when the column has no limit.

Affects Unit and Quantity models.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app/models/quantity.rb

@@ -61,22 +61,18 @@ class Quantity < ApplicationRecord
 
   # Return: ordered [sub]hierarchy
   scope :ordered, ->(root: nil, include_root: true) {
-    q_ordered = Arel::Table.new('q_ordered')
+    numbered = Arel::Table.new('numbered')
-    cast_type = connection.adapter_name == 'Mysql2' ? 'BINARY' : 'BLOB'
 
-    self.model.with(numbered: numbered(:parent_id, :name)).with_recursive(q_ordered: [
+    self.model.with(numbered: numbered(:parent_id, :name)).with_recursive(arel_table.name => [
-      Quantity.from(Arel::Table.new('numbered').as(arel_table.name))
+      numbered.project(
-        .select(
+        numbered[Arel.star],
-          arel_table[Arel.star],
+        numbered.cast(numbered[:child_number], 'BINARY').as('path')
-          arel_table.cast(arel_table[:child_number], cast_type).as('path')
+      ).where(numbered[root && include_root ? :id : :parent_id].eq(root)),
-        ).where(arel_table[root && include_root ? :id : :parent_id].eq(root)),
+      numbered.project(
-      Quantity.from(Arel::Table.new('numbered').as(arel_table.name))
+        numbered[Arel.star],
-        .joins("INNER JOIN q_ordered ON quantities.parent_id = q_ordered.id")
+        arel_table[:path].concat(numbered[:child_number])
-        .select(
+      ).join(arel_table).on(numbered[:parent_id].eq(arel_table[:id]))
-          arel_table[Arel.star],
+    ]).order(arel_table[:path])
-          q_ordered[:path].concat(arel_table[:child_number])
-        )
-    ]).from(q_ordered.as(arel_table.name)).order(arel_table[:path])
   }
 
   # TODO: extract named functions to custom Arel extension
@@ -84,24 +80,20 @@ class Quantity < ApplicationRecord
   # be merged with :ordered
   # https://gist.github.com/ProGM/c6df08da14708dcc28b5ca325df37ceb#extending-arel
   scope :numbered, ->(parent_column, order_column) {
-    row_number = Arel::Nodes::NamedFunction.new('ROW_NUMBER', [])
+    select(
-      .over(Arel::Nodes::Window.new.partition(parent_column).order(order_column))
+      arel_table[Arel.star],
-    width = Arel::SelectManager.new.project(
+      Arel::Nodes::NamedFunction.new(
-      Arel::Nodes::NamedFunction.new('LENGTH', [Arel.star.count])
+        'LPAD',
-    ).from(arel_table)
+        [
-
+          Arel::Nodes::NamedFunction.new('ROW_NUMBER', [])
-    pad_expr = if connection.adapter_name == 'Mysql2'
+            .over(Arel::Nodes::Window.new.partition(parent_column).order(order_column)),
-      Arel::Nodes::NamedFunction.new('LPAD', [row_number, width, Arel::Nodes.build_quoted('0')])
+          Arel::SelectManager.new.project(
-    else
+            Arel::Nodes::NamedFunction.new('LENGTH', [Arel.star.count])
-      # SQLite: printf('%0' || width || 'd', row_number)
+          ).from(arel_table),
-      fmt = Arel::Nodes::InfixOperation.new('||',
+          Arel::Nodes.build_quoted('0')
-        Arel::Nodes::InfixOperation.new('||', Arel::Nodes.build_quoted('%0'), width),
+        ],
-        Arel::Nodes.build_quoted('d')
+      ).as('child_number')
-      )
+    )
-      Arel::Nodes::NamedFunction.new('printf', [fmt, row_number])
-    end
-
-    select(arel_table[Arel.star], pad_expr.as('child_number'))
   }
 
   def to_s
@@ -110,7 +102,7 @@ class Quantity < ApplicationRecord
 
   def to_s_with_depth
     # em space, U+2003
-    ' ' * depth + name
+    ' ' * depth + name
   end
 
   def destroyable?
@@ -123,18 +115,16 @@ class Quantity < ApplicationRecord
 
   # Common ancestors, assuming node is a descendant of itself
   scope :common_ancestors, ->(of) {
-    q_common = Arel::Table.new('q_common')
+    selected = Arel::Table.new('selected')
 
     # Take unique IDs, so self can be called with parent nodes of collection to
     # get common ancestors of collection _excluding_ nodes in collection.
     uniq_of = of.uniq
-    model.with(selected: self).with_recursive(q_common: [
+    model.with(selected: self).with_recursive(arel_table.name => [
-      Quantity.from(Arel::Table.new('selected').as(arel_table.name))
+      selected.project(selected[Arel.star]).where(selected[:id].in(uniq_of)),
-        .where(arel_table[:id].in(uniq_of)),
+      selected.project(selected[Arel.star])
-      Quantity.from(Arel::Table.new('selected').as(arel_table.name))
+        .join(arel_table).on(selected[:id].eq(arel_table[:parent_id]))
-        .joins("INNER JOIN q_common ON selected.id = q_common.parent_id")
     ]).select(arel_table[Arel.star])
-      .from(q_common.as(arel_table.name))
       .group(column_names)
       .having(arel_table[:id].count.eq(uniq_of.size))
       .order(arel_table[:depth].desc)
@@ -142,9 +132,13 @@ class Quantity < ApplicationRecord
 
   # Return: successive record in order of appearance; used for partial view reload
   def successive
-    ordered = user.quantities.ordered.to_a
+    quantities = Quantity.arel_table
-    idx = ordered.index { |q| q.id == id }
+    Quantity.with(
-    ordered[idx + 1] if idx
+      quantities: user.quantities.ordered.select(
+        quantities[Arel.star],
+        Arel::Nodes::NamedFunction.new('LAG', [quantities[:id]]).over.as('lag_id')
+      )
+    ).where(quantities[:lag_id].eq(id)).first
   end
 
   def with_progenies
@@ -157,14 +151,13 @@ class Quantity < ApplicationRecord
 
   # Return: record with ID `of` with its ancestors, sorted by :depth
   scope :with_ancestors, ->(of) {
-    q_ancestors = Arel::Table.new('q_ancestors')
+    selected = Arel::Table.new('selected')
 
-    model.with(selected: self).with_recursive(q_ancestors: [
+    model.with(selected: self).with_recursive(arel_table.name => [
-      Quantity.from(Arel::Table.new('selected').as(arel_table.name))
+      selected.project(selected[Arel.star]).where(selected[:id].eq(of)),
-        .where(arel_table[:id].eq(of)),
+      selected.project(selected[Arel.star])
-      Quantity.from(Arel::Table.new('selected').as(arel_table.name))
+        .join(arel_table).on(selected[:id].eq(arel_table[:parent_id]))
-        .joins("INNER JOIN q_ancestors ON selected.id = q_ancestors.parent_id")
+    ])
-    ]).from(q_ancestors.as(arel_table.name))
   }
 
   # Return: ancestors of (possibly destroyed) self

app/models/unit.rb

@@ -22,72 +22,59 @@ class Unit < ApplicationRecord
     actionable_units = Arel::Table.new('actionable_units')
     units = actionable_units.alias('units')
     bases_units = arel_table.alias('bases_units')
-    # Use 'all_units' alias for correlated subqueries to reference the all_units CTE.
+    other_units = arel_table.alias('other_units')
-    # Cannot use arel_table.alias here because the CTE is named 'all_units', not 'units'.
+    other_bases_units = arel_table.alias('other_bases_units')
-    other_units = Arel::Table.new('all_units').alias('other_units')
-    other_bases_units = Arel::Table.new('all_units').alias('other_bases_units')
     sub_units = arel_table.alias('sub_units')
 
-    Unit.with_recursive(
+    # TODO: move inner 'with' CTE to outer 'with recursive' - it can have multiple
-      # Renamed from 'units' to 'all_units' to avoid SQLite circular reference:
+    # CTEs, even non recursive ones.
-      # SQLite treats any CTE in WITH RECURSIVE that references a table with the same
+    Unit.with_recursive(actionable_units: [
-      # name as the CTE itself as a circular reference, even for non-recursive CTEs.
+      Unit.with(units: self.or(Unit.defaults)).left_joins(:base)
-      all_units: self.or(Unit.defaults),
+        .where.not(
-      actionable_units: [
+          # Exclude Units that are/have default counterpart
-        # Read from all_units CTE (user+defaults) aliased as the units table name.
+          Arel::SelectManager.new.project(1).from(other_units)
-        # Using AR::Relation (not Arel::SelectManager) to avoid extra parentheses
+            .outer_join(other_bases_units)
-        # around the UNION part (visit_Arel_SelectManager always wraps in parens).
+            .on(other_units[:base_id].eq(other_bases_units[:id]))
-        Unit.from(Arel::Table.new('all_units').as(arel_table.name))
+            .where(
-          .joins("LEFT OUTER JOIN all_units bases_units ON bases_units.id = units.base_id")
+              other_bases_units[:symbol].is_not_distinct_from(bases_units[:symbol])
-          .where.not(
+                .and(other_units[:symbol].eq(arel_table[:symbol]))
-            # Exclude Units that are/have default counterpart
+                .and(other_units[:user_id].is_distinct_from(arel_table[:user_id]))
-            Arel::SelectManager.new.project(1).from(other_units)
+            ).exists
-              .outer_join(other_bases_units)
+        )
-              .on(other_units[:base_id].eq(other_bases_units[:id]))
+        .select(
-              .where(
+          arel_table[Arel.star],
-                other_bases_units[:symbol].is_not_distinct_from(bases_units[:symbol])
+          # Decide if Unit can be im-/exported based on existing hierarchy:
-                  .and(other_units[:symbol].eq(arel_table[:symbol]))
+          # * same base unit symbol has to exist
-                  .and(other_units[:user_id].is_distinct_from(arel_table[:user_id]))
+          # * unit with subunits can only be ported to root
-              ).exists
+          arel_table[:base_id].eq(nil).or(
-          )
+            (
-          .select(
+              Arel::SelectManager.new.project(1).from(other_units)
-            arel_table[Arel.star],
+                .join(sub_units).on(other_units[:id].eq(sub_units[:base_id]))
-            # Decide if Unit can be im-/exported based on existing hierarchy:
+                .where(
-            # * same base unit symbol has to exist
+                  other_units[:symbol].eq(arel_table[:symbol])
-            # * unit with subunits can only be ported to root
+                    .and(other_units[:user_id].is_distinct_from(arel_table[:user_id]))
-            arel_table[:base_id].eq(nil).or(
+                ).exists.not
-              (
+            ).and(
-                Arel::SelectManager.new.project(1).from(other_units)
+              Arel::SelectManager.new.project(1).from(other_bases_units)
-                  .join(sub_units).on(other_units[:id].eq(sub_units[:base_id]))
+                .where(
-                  .where(
+                  other_bases_units[:symbol].is_not_distinct_from(bases_units[:symbol])
-                    other_units[:symbol].eq(arel_table[:symbol])
+                    .and(other_bases_units[:user_id].is_distinct_from(bases_units[:user_id]))
-                      .and(other_units[:user_id].is_distinct_from(arel_table[:user_id]))
+                ).exists
-                  ).exists.not
+            )
-              ).and(
+          ).as('portable')
-                Arel::SelectManager.new.project(1).from(other_bases_units)
+        ),
-                  .where(
+      # Fill base Units to display proper hierarchy. Duplicates will be removed
-                    other_bases_units[:symbol].is_not_distinct_from(bases_units[:symbol])
+      # by final group() - can't be deduplicated with UNION due to 'portable' field.
-                      .and(other_bases_units[:user_id].is_distinct_from(bases_units[:user_id]))
+      arel_table.join(actionable_units).on(actionable_units[:base_id].eq(arel_table[:id]))
-                  ).exists
+        .project(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
-              )
+    ]).select(units: [:base_id, :symbol])
-            ).as('portable')
-          ),
-        # Fill base Units to display proper hierarchy. Duplicates will be removed
-        # by final group() - can't be deduplicated with UNION due to 'portable' field.
-        # Using AR::Relation instead of Arel::SelectManager to avoid extra parentheses
-        # around the UNION part (visit_Arel_SelectManager always wraps in parens).
-        Unit.from(Arel::Table.new('all_units').as(arel_table.name))
-          .joins("INNER JOIN actionable_units ON actionable_units.base_id = units.id")
-          .select(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
-      ]
-    ).select(units: [:base_id, :symbol])
       .select(
         units[:id].minimum.as('id'), # can be ANY_VALUE()
         units[:user_id].minimum.as('user_id'), # prefer non-default
         Arel::Nodes.build_quoted(1).as('multiplier'), # disregard multiplier when sorting
         units[:portable].minimum.as('portable')
       )
-      .from(units).group(units[:base_id], units[:symbol])
+      .from(units).group(:base_id, :symbol)
   }
   scope :ordered, ->{
     left_outer_joins(:base).order(ordering)
@@ -97,7 +84,7 @@ class Unit < ApplicationRecord
     [arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
      arel_table[:base_id].not_eq(nil),
      :multiplier,
-     arel_table[:symbol]]
+     :symbol]
   end
 
   before_destroy do