Skip to content

Commit

Permalink
Fix document formatting of Database configuration classes [ci skip]
Browse files Browse the repository at this point in the history
* Show options as list.
* Fix incorrect quoting.
  • Loading branch information
y-yagi committed Mar 21, 2019
1 parent d2f9b8e commit 382a956
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 35 deletions.
24 changes: 12 additions & 12 deletions activerecord/lib/active_record/database_configurations.rb
Expand Up @@ -17,22 +17,22 @@ def initialize(configurations = {})
end

# Collects the configs for the environment and optionally the specification
# name passed in. To include replica configurations pass `include_replicas: true`.
# name passed in. To include replica configurations pass <tt>include_replicas: true</tt>.
#
# If a spec name is provided a single DatabaseConfig object will be
# returned, otherwise an array of DatabaseConfig objects will be
# returned that corresponds with the environment and type requested.
#
# Options:
# ==== Options
#
# <tt>env_name:</tt> The environment name. Defaults to +nil+ which will collect
# configs for all environments.
# <tt>spec_name:</tt> The specification name (i.e. primary, animals, etc.). Defaults
# to +nil+.
# <tt>include_replicas:</tt> Determines whether to include replicas in
# the returned list. Most of the time we're only iterating over the write
# connection (i.e. migrations don't need to run for the write and read connection).
# Defaults to +false+.
# * <tt>env_name:</tt> The environment name. Defaults to +nil+ which will collect
# configs for all environments.
# * <tt>spec_name:</tt> The specification name (i.e. primary, animals, etc.). Defaults
# to +nil+.
# * <tt>include_replicas:</tt> Determines whether to include replicas in
# the returned list. Most of the time we're only iterating over the write
# connection (i.e. migrations don't need to run for the write and read connection).
# Defaults to +false+.
def configs_for(env_name: nil, spec_name: nil, include_replicas: false)
configs = env_with_configs(env_name)

Expand All @@ -53,7 +53,7 @@ def configs_for(env_name: nil, spec_name: nil, include_replicas: false)

# Returns the config hash that corresponds with the environment
#
# If the application has multiple databases `default_hash` will
# If the application has multiple databases +default_hash+ will
# return the first config hash for the environment.
#
# { database: "my_db", adapter: "mysql2" }
Expand All @@ -65,7 +65,7 @@ def default_hash(env = ActiveRecord::ConnectionHandling::DEFAULT_ENV.call.to_s)

# Returns a single DatabaseConfig object based on the requested environment.
#
# If the application has multiple databases `find_db_config` will return
# If the application has multiple databases +find_db_config+ will return
# the first DatabaseConfig for the environment.
def find_db_config(env)
configurations.find do |db_config|
Expand Down
Expand Up @@ -14,16 +14,16 @@ class DatabaseConfigurations
# #<ActiveRecord::DatabaseConfigurations::HashConfig:0x00007fd1acbded10
# @env_name="development", @spec_name="primary", @config={"database"=>"db_name"}>
#
# Options are:
# ==== Options
#
# <tt>:env_name</tt> - The Rails environment, i.e. "development"
# <tt>:spec_name</tt> - The specification name. In a standard two-tier
# database configuration this will default to "primary". In a multiple
# database three-tier database configuration this corresponds to the name
# used in the second tier, for example "primary_readonly".
# <tt>:config</tt> - The config hash. This is the hash that contains the
# database adapter, name, and other important information for database
# connections.
# * <tt>:env_name</tt> - The Rails environment, i.e. "development".
# * <tt>:spec_name</tt> - The specification name. In a standard two-tier
# database configuration this will default to "primary". In a multiple
# database three-tier database configuration this corresponds to the name
# used in the second tier, for example "primary_readonly".
# * <tt>:config</tt> - The config hash. This is the hash that contains the
# database adapter, name, and other important information for database
# connections.
class HashConfig < DatabaseConfig
attr_reader :config

Expand All @@ -33,14 +33,14 @@ def initialize(env_name, spec_name, config)
end

# Determines whether a database configuration is for a replica / readonly
# connection. If the `replica` key is present in the config, `replica?` will
# connection. If the +replica+ key is present in the config, +replica?+ will
# return +true+.
def replica?
config["replica"]
end

# The migrations paths for a database configuration. If the
# `migrations_paths` key is present in the config, `migrations_paths`
# +migrations_paths+ key is present in the config, +migrations_paths+
# will return its value.
def migrations_paths
config["migrations_paths"]
Expand Down
Expand Up @@ -17,17 +17,17 @@ class DatabaseConfigurations
# @config={"adapter"=>"postgresql", "database"=>"foo", "host"=>"localhost"},
# @url="postgres://localhost/foo">
#
# Options are:
# ==== Options
#
# <tt>:env_name</tt> - The Rails environment, ie "development"
# <tt>:spec_name</tt> - The specification name. In a standard two-tier
# database configuration this will default to "primary". In a multiple
# database three-tier database configuration this corresponds to the name
# used in the second tier, for example "primary_readonly".
# <tt>:url</tt> - The database URL.
# <tt>:config</tt> - The config hash. This is the hash that contains the
# database adapter, name, and other important information for database
# connections.
# * <tt>:env_name</tt> - The Rails environment, ie "development".
# * <tt>:spec_name</tt> - The specification name. In a standard two-tier
# database configuration this will default to "primary". In a multiple
# database three-tier database configuration this corresponds to the name
# used in the second tier, for example "primary_readonly".
# * <tt>:url</tt> - The database URL.
# * <tt>:config</tt> - The config hash. This is the hash that contains the
# database adapter, name, and other important information for database
# connections.
class UrlConfig < DatabaseConfig
attr_reader :url, :config

Expand All @@ -42,14 +42,14 @@ def url_config? # :nodoc:
end

# Determines whether a database configuration is for a replica / readonly
# connection. If the `replica` key is present in the config, `replica?` will
# connection. If the +replica+ key is present in the config, +replica?+ will
# return +true+.
def replica?
config["replica"]
end

# The migrations paths for a database configuration. If the
# `migrations_paths` key is present in the config, `migrations_paths`
# +migrations_paths+ key is present in the config, +migrations_paths+
# will return its value.
def migrations_paths
config["migrations_paths"]
Expand Down

0 comments on commit 382a956

Please sign in to comment.