mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-14 16:02:23 +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.
26 lines
806 B
Ruby
26 lines
806 B
Ruby
# frozen_string_literal: true
|
|
|
|
class UserApiKeyClientScope < ActiveRecord::Base
|
|
belongs_to :client, class_name: "UserApiKeyClient", foreign_key: "user_api_key_client_id"
|
|
|
|
validates :name,
|
|
inclusion: {
|
|
in: -> { UserApiKeyScope.all_scopes.keys.map(&:to_s) },
|
|
message: "%{value} is not a valid scope",
|
|
}
|
|
|
|
def self.allowed
|
|
Set.new(SiteSetting.allow_user_api_key_client_scopes.split("|"))
|
|
end
|
|
end
|
|
|
|
# == Schema Information
|
|
#
|
|
# Table name: user_api_key_client_scopes
|
|
#
|
|
# id :bigint not null, primary key
|
|
# name :string(100) not null
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# user_api_key_client_id :bigint not null
|
|
#
|
