mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-27 03:26:21 +08:00
3332e9f4c3
`.annotaterb.yml` has carried `classified_sort: true` since the project
switched from `annotate` to `annotaterb` (commit 0eab7daea4, July 2025),
but annotaterb's default behaviour is to compare the existing schema
block against what it would generate and skip the rewrite when the
column list matches — even when the *ordering* of those columns differs.
The result is that models which haven't had a schema change since the
config landed never get reordered, and `classified_sort` drift
accumulates indefinitely.
`--force` makes annotaterb always rewrite, so a single `bin/rake
annotate:clean` run brings every model into the canonical format and
keeps them there. Every schema block is now grouped primary-key →
regular columns → timestamps → foreign keys (alphabetical within each
group). Pure annotation comment change — no code modifications.
Also cleans up the rake task to avoid string interpolation for `system`
calls.
63 lines
1.7 KiB
Ruby
Vendored
63 lines
1.7 KiB
Ruby
Vendored
# frozen_string_literal: true
|
|
class GroupAssociatedGroup < ActiveRecord::Base
|
|
belongs_to :group
|
|
belongs_to :associated_group
|
|
|
|
before_destroy :remove_associated_users
|
|
after_commit :add_associated_users, on: %i[create update]
|
|
|
|
def add_associated_users
|
|
with_mutex do
|
|
associated_group.users.in_batches do |users|
|
|
users.each { |user| group.add_automatically(user, subject: associated_group.label) }
|
|
end
|
|
end
|
|
end
|
|
|
|
def remove_associated_users
|
|
with_mutex do
|
|
User
|
|
.where(
|
|
"NOT EXISTS(
|
|
SELECT 1
|
|
FROM user_associated_groups uag
|
|
JOIN group_associated_groups gag
|
|
ON gag.associated_group_id = uag.associated_group_id
|
|
WHERE uag.user_id = users.id
|
|
AND gag.id != :gag_id
|
|
AND gag.group_id = :group_id
|
|
)",
|
|
gag_id: id,
|
|
group_id: group_id,
|
|
)
|
|
.in_batches do |users|
|
|
users.each { |user| group.remove_automatically(user, subject: associated_group.label) }
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def with_mutex
|
|
DistributedMutex.synchronize("group_associated_group_#{group_id}_#{associated_group_id}") do
|
|
yield
|
|
end
|
|
end
|
|
end
|
|
|
|
# == Schema Information
|
|
#
|
|
# Table name: group_associated_groups
|
|
#
|
|
# id :bigint not null, primary key
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# associated_group_id :bigint not null
|
|
# group_id :bigint not null
|
|
#
|
|
# Indexes
|
|
#
|
|
# index_group_associated_groups (group_id,associated_group_id) UNIQUE
|
|
# index_group_associated_groups_on_associated_group_id (associated_group_id)
|
|
# index_group_associated_groups_on_group_id (group_id)
|
|
#
|
