mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-27 02:05:26 +08:00
89f26da39d
Ruby's compact module syntax (`module Migrations::Database::Schema::DSL`) breaks lexical constant lookup — `Module.nesting` only includes the innermost constant, so every cross-module reference must be fully qualified. In practice this means writing `Migrations::Database::Schema::Helpers` even when you're already inside `Migrations::Database::Schema`. Nested module definitions restore the full nesting chain, which brings several practical benefits: - **Less verbose code**: references like `Schema::Helpers`, `Database::IntermediateDB`, or `Converters::Base::ProgressStep` work without repeating the full path from root - **Easier to write new code**: contributors don't need to remember which prefixes are required — if you're inside the namespace, short names just work - **Fewer aliasing workarounds**: removes the need for constants like `MappingType = Migrations::Importer::MappingType` that existed solely to shorten references - **Standard Ruby style**: consistent with how most Ruby projects and gems structure their namespaces The diff is large but mechanical — no logic changes, just module wrapping and shortening references that the nesting now resolves. Generated code (intermediate_db models/enums) keeps fully qualified references like `Migrations::Database.format_*` since it must work regardless of the configured output namespace. - Convert 138 lib files from compact to nested module definitions - Remove now-redundant fully qualified prefixes and aliases - Update model and enum writers to generate nested modules with correct indentation - Regenerate all intermediate_db models and enums
41 lines
1.1 KiB
Ruby
Vendored
41 lines
1.1 KiB
Ruby
Vendored
# frozen_string_literal: true
|
|
|
|
module Migrations
|
|
module Importer
|
|
module Steps
|
|
class PermalinkNormalizations < Step
|
|
def execute
|
|
super
|
|
|
|
normalizations_changed = false
|
|
normalizations = SiteSetting.permalink_normalizations
|
|
normalizations = normalizations.blank? ? [] : normalizations.split("|")
|
|
|
|
rows = @intermediate_db.query <<~SQL
|
|
SELECT normalization
|
|
FROM permalink_normalizations
|
|
ORDER BY ROWID
|
|
SQL
|
|
|
|
rows.each do |row|
|
|
normalization = row[:normalization]
|
|
|
|
if normalizations.exclude?(normalization)
|
|
normalizations << normalization
|
|
normalizations_changed = true
|
|
end
|
|
end
|
|
|
|
if normalizations_changed
|
|
SiteSetting.set_and_log(
|
|
:permalink_normalizations,
|
|
normalizations.join("|"),
|
|
Discourse.system_user,
|
|
I18n.t("importer.site_setting_log_message"),
|
|
)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
