mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-27 13:45:29 +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.
46 lines
1,016 B
Ruby
Vendored
46 lines
1,016 B
Ruby
Vendored
# frozen_string_literal: true
|
|
|
|
class IncomingDomain < ActiveRecord::Base
|
|
def self.add!(uri)
|
|
name = uri.host
|
|
return if name.blank?
|
|
|
|
https = uri.scheme == "https"
|
|
port = uri.port
|
|
|
|
current = find_by(name: name, https: https, port: port)
|
|
return current if current
|
|
|
|
# concurrency ...
|
|
|
|
begin
|
|
current = create!(name: name, https: https, port: port)
|
|
rescue ActiveRecord::RecordNotUnique
|
|
# duplicate key is just ignored
|
|
end
|
|
|
|
current || find_by(name: name, https: https, port: port)
|
|
end
|
|
|
|
def to_url
|
|
url = +"http#{https ? "s" : ""}://#{name}"
|
|
|
|
url << ":#{port}" if https && port != 443 || !https && port != 80
|
|
|
|
url
|
|
end
|
|
end
|
|
|
|
# == Schema Information
|
|
#
|
|
# Table name: incoming_domains
|
|
#
|
|
# id :integer not null, primary key
|
|
# https :boolean default(FALSE), not null
|
|
# name :string(100) not null
|
|
# port :integer not null
|
|
#
|
|
# Indexes
|
|
#
|
|
# index_incoming_domains_on_name_and_https_and_port (name,https,port) UNIQUE
|
|
#
|
