mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-02 19:44:59 +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
109 lines
2.2 KiB
Ruby
109 lines
2.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Migrations
|
|
module Database
|
|
module IntermediateDB
|
|
module Upload
|
|
SQL = <<~SQL
|
|
INSERT OR IGNORE INTO uploads (
|
|
id,
|
|
filename,
|
|
path,
|
|
data,
|
|
url,
|
|
type,
|
|
description,
|
|
origin,
|
|
user_id
|
|
)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
SQL
|
|
private_constant :SQL
|
|
|
|
def self.create_for_file(
|
|
path:,
|
|
filename: nil,
|
|
type: nil,
|
|
description: nil,
|
|
origin: nil,
|
|
user_id: nil
|
|
)
|
|
create(
|
|
id: Migrations::ID.hash(path),
|
|
filename: filename || File.basename(path),
|
|
path:,
|
|
type:,
|
|
description:,
|
|
origin:,
|
|
user_id:,
|
|
)
|
|
end
|
|
|
|
def self.create_for_url(
|
|
url:,
|
|
filename:,
|
|
type: nil,
|
|
description: nil,
|
|
origin: nil,
|
|
user_id: nil
|
|
)
|
|
create(
|
|
id: Migrations::ID.hash(url),
|
|
filename:,
|
|
url:,
|
|
type:,
|
|
description:,
|
|
origin:,
|
|
user_id:,
|
|
)
|
|
end
|
|
|
|
def self.create_for_data(
|
|
data:,
|
|
filename:,
|
|
type: nil,
|
|
description: nil,
|
|
origin: nil,
|
|
user_id: nil
|
|
)
|
|
create(
|
|
id: Migrations::ID.hash(data),
|
|
filename:,
|
|
data: Migrations::Database.to_blob(data),
|
|
type:,
|
|
description:,
|
|
origin:,
|
|
user_id:,
|
|
)
|
|
end
|
|
|
|
def self.create(
|
|
id:,
|
|
filename:,
|
|
path: nil,
|
|
data: nil,
|
|
url: nil,
|
|
type: nil,
|
|
description: nil,
|
|
origin: nil,
|
|
user_id: nil
|
|
)
|
|
Migrations::Database::IntermediateDB.insert(
|
|
SQL,
|
|
id,
|
|
filename,
|
|
path,
|
|
data,
|
|
url,
|
|
type,
|
|
description,
|
|
origin,
|
|
user_id,
|
|
)
|
|
|
|
id
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
