activerecord 6.0.6 → 6.1.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of activerecord might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +783 -910
- data/MIT-LICENSE +1 -1
- data/README.rdoc +3 -3
- data/lib/active_record/aggregations.rb +1 -1
- data/lib/active_record/association_relation.rb +22 -14
- data/lib/active_record/associations/alias_tracker.rb +19 -15
- data/lib/active_record/associations/association.rb +43 -26
- data/lib/active_record/associations/association_scope.rb +11 -15
- data/lib/active_record/associations/belongs_to_association.rb +15 -5
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +1 -1
- data/lib/active_record/associations/builder/association.rb +9 -3
- data/lib/active_record/associations/builder/belongs_to.rb +10 -7
- data/lib/active_record/associations/builder/collection_association.rb +5 -4
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +0 -1
- data/lib/active_record/associations/builder/has_many.rb +6 -2
- data/lib/active_record/associations/builder/has_one.rb +11 -14
- data/lib/active_record/associations/builder/singular_association.rb +1 -1
- data/lib/active_record/associations/collection_association.rb +19 -13
- data/lib/active_record/associations/collection_proxy.rb +12 -5
- data/lib/active_record/associations/foreign_association.rb +13 -0
- data/lib/active_record/associations/has_many_association.rb +24 -2
- data/lib/active_record/associations/has_many_through_association.rb +10 -4
- data/lib/active_record/associations/has_one_association.rb +15 -1
- data/lib/active_record/associations/join_dependency/join_association.rb +29 -14
- data/lib/active_record/associations/join_dependency/join_part.rb +1 -1
- data/lib/active_record/associations/join_dependency.rb +63 -49
- data/lib/active_record/associations/preloader/association.rb +13 -5
- data/lib/active_record/associations/preloader/through_association.rb +1 -1
- data/lib/active_record/associations/preloader.rb +5 -3
- data/lib/active_record/associations/singular_association.rb +1 -1
- data/lib/active_record/associations.rb +114 -11
- data/lib/active_record/attribute_assignment.rb +10 -8
- data/lib/active_record/attribute_methods/before_type_cast.rb +13 -9
- data/lib/active_record/attribute_methods/dirty.rb +1 -11
- data/lib/active_record/attribute_methods/primary_key.rb +6 -2
- data/lib/active_record/attribute_methods/query.rb +3 -6
- data/lib/active_record/attribute_methods/read.rb +8 -11
- data/lib/active_record/attribute_methods/serialization.rb +11 -5
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +12 -13
- data/lib/active_record/attribute_methods/write.rb +12 -20
- data/lib/active_record/attribute_methods.rb +64 -54
- data/lib/active_record/attributes.rb +32 -7
- data/lib/active_record/autosave_association.rb +47 -30
- data/lib/active_record/base.rb +2 -14
- data/lib/active_record/callbacks.rb +152 -22
- data/lib/active_record/coders/yaml_column.rb +2 -24
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +185 -134
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +2 -44
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +65 -22
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +2 -7
- data/lib/active_record/connection_adapters/abstract/quoting.rb +34 -34
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +3 -3
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +153 -116
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +110 -30
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +3 -3
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +224 -85
- data/lib/active_record/connection_adapters/abstract/transaction.rb +80 -32
- data/lib/active_record/connection_adapters/abstract_adapter.rb +49 -72
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +123 -87
- data/lib/active_record/connection_adapters/column.rb +15 -1
- data/lib/active_record/connection_adapters/deduplicable.rb +29 -0
- data/lib/active_record/connection_adapters/legacy_pool_manager.rb +31 -0
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +22 -24
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +1 -1
- data/lib/active_record/connection_adapters/mysql/quoting.rb +1 -1
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +32 -6
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +8 -0
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +1 -1
- data/lib/active_record/connection_adapters/mysql/schema_statements.rb +3 -3
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +10 -1
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +31 -12
- data/lib/active_record/connection_adapters/pool_config.rb +63 -0
- data/lib/active_record/connection_adapters/pool_manager.rb +43 -0
- data/lib/active_record/connection_adapters/postgresql/column.rb +24 -1
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +12 -53
- data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +3 -5
- data/lib/active_record/connection_adapters/postgresql/oid/date.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/interval.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/macaddr.rb +25 -0
- data/lib/active_record/connection_adapters/postgresql/oid/money.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +11 -1
- data/lib/active_record/connection_adapters/postgresql/oid.rb +2 -0
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +4 -4
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +5 -1
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +61 -29
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +8 -0
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +72 -55
- data/lib/active_record/connection_adapters/schema_cache.rb +98 -15
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +10 -0
- data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +30 -5
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +1 -1
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +5 -1
- data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +36 -3
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +48 -50
- data/lib/active_record/connection_adapters.rb +50 -0
- data/lib/active_record/connection_handling.rb +210 -71
- data/lib/active_record/core.rb +223 -66
- data/lib/active_record/database_configurations/connection_url_resolver.rb +98 -0
- data/lib/active_record/database_configurations/database_config.rb +52 -9
- data/lib/active_record/database_configurations/hash_config.rb +54 -8
- data/lib/active_record/database_configurations/url_config.rb +15 -40
- data/lib/active_record/database_configurations.rb +124 -85
- data/lib/active_record/delegated_type.rb +209 -0
- data/lib/active_record/destroy_association_async_job.rb +36 -0
- data/lib/active_record/enum.rb +27 -10
- data/lib/active_record/errors.rb +47 -12
- data/lib/active_record/explain.rb +9 -4
- data/lib/active_record/explain_subscriber.rb +1 -1
- data/lib/active_record/fixture_set/file.rb +10 -17
- data/lib/active_record/fixture_set/model_metadata.rb +1 -2
- data/lib/active_record/fixture_set/render_context.rb +1 -1
- data/lib/active_record/fixture_set/table_row.rb +2 -2
- data/lib/active_record/fixtures.rb +54 -8
- data/lib/active_record/gem_version.rb +2 -2
- data/lib/active_record/inheritance.rb +40 -18
- data/lib/active_record/insert_all.rb +34 -5
- data/lib/active_record/integration.rb +3 -5
- data/lib/active_record/internal_metadata.rb +16 -7
- data/lib/active_record/legacy_yaml_adapter.rb +7 -3
- data/lib/active_record/locking/optimistic.rb +13 -16
- data/lib/active_record/locking/pessimistic.rb +6 -2
- data/lib/active_record/log_subscriber.rb +26 -8
- data/lib/active_record/middleware/database_selector/resolver/session.rb +3 -0
- data/lib/active_record/middleware/database_selector/resolver.rb +5 -0
- data/lib/active_record/middleware/database_selector.rb +4 -1
- data/lib/active_record/migration/command_recorder.rb +47 -27
- data/lib/active_record/migration/compatibility.rb +67 -17
- data/lib/active_record/migration.rb +113 -83
- data/lib/active_record/model_schema.rb +88 -13
- data/lib/active_record/nested_attributes.rb +2 -3
- data/lib/active_record/no_touching.rb +1 -1
- data/lib/active_record/persistence.rb +50 -45
- data/lib/active_record/query_cache.rb +15 -5
- data/lib/active_record/querying.rb +11 -6
- data/lib/active_record/railtie.rb +64 -44
- data/lib/active_record/railties/databases.rake +266 -95
- data/lib/active_record/readonly_attributes.rb +4 -0
- data/lib/active_record/reflection.rb +60 -44
- data/lib/active_record/relation/batches/batch_enumerator.rb +25 -9
- data/lib/active_record/relation/batches.rb +38 -31
- data/lib/active_record/relation/calculations.rb +100 -43
- data/lib/active_record/relation/finder_methods.rb +44 -14
- data/lib/active_record/relation/from_clause.rb +1 -1
- data/lib/active_record/relation/merger.rb +20 -23
- data/lib/active_record/relation/predicate_builder/array_handler.rb +8 -9
- data/lib/active_record/relation/predicate_builder/association_query_value.rb +4 -5
- data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +3 -3
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +1 -1
- data/lib/active_record/relation/predicate_builder.rb +57 -33
- data/lib/active_record/relation/query_methods.rb +318 -195
- data/lib/active_record/relation/record_fetch_warning.rb +3 -3
- data/lib/active_record/relation/spawn_methods.rb +8 -7
- data/lib/active_record/relation/where_clause.rb +104 -57
- data/lib/active_record/relation.rb +90 -64
- data/lib/active_record/result.rb +41 -33
- data/lib/active_record/runtime_registry.rb +2 -2
- data/lib/active_record/sanitization.rb +6 -17
- data/lib/active_record/schema_dumper.rb +34 -4
- data/lib/active_record/schema_migration.rb +2 -8
- data/lib/active_record/scoping/named.rb +1 -17
- data/lib/active_record/secure_token.rb +16 -8
- data/lib/active_record/serialization.rb +5 -3
- data/lib/active_record/signed_id.rb +116 -0
- data/lib/active_record/statement_cache.rb +20 -4
- data/lib/active_record/store.rb +2 -2
- data/lib/active_record/suppressor.rb +2 -2
- data/lib/active_record/table_metadata.rb +39 -51
- data/lib/active_record/tasks/database_tasks.rb +139 -113
- data/lib/active_record/tasks/mysql_database_tasks.rb +34 -35
- data/lib/active_record/tasks/postgresql_database_tasks.rb +24 -26
- data/lib/active_record/tasks/sqlite_database_tasks.rb +13 -9
- data/lib/active_record/test_databases.rb +5 -4
- data/lib/active_record/test_fixtures.rb +36 -33
- data/lib/active_record/timestamp.rb +4 -6
- data/lib/active_record/touch_later.rb +21 -21
- data/lib/active_record/transactions.rb +15 -64
- data/lib/active_record/type/serialized.rb +6 -2
- data/lib/active_record/type.rb +8 -1
- data/lib/active_record/type_caster/connection.rb +0 -1
- data/lib/active_record/type_caster/map.rb +8 -5
- data/lib/active_record/validations/associated.rb +1 -1
- data/lib/active_record/validations/numericality.rb +35 -0
- data/lib/active_record/validations/uniqueness.rb +24 -4
- data/lib/active_record/validations.rb +1 -0
- data/lib/active_record.rb +7 -14
- data/lib/arel/attributes/attribute.rb +4 -0
- data/lib/arel/collectors/bind.rb +5 -0
- data/lib/arel/collectors/composite.rb +8 -0
- data/lib/arel/collectors/sql_string.rb +7 -0
- data/lib/arel/collectors/substitute_binds.rb +7 -0
- data/lib/arel/nodes/binary.rb +82 -8
- data/lib/arel/nodes/bind_param.rb +8 -0
- data/lib/arel/nodes/casted.rb +21 -9
- data/lib/arel/nodes/equality.rb +6 -9
- data/lib/arel/nodes/grouping.rb +3 -0
- data/lib/arel/nodes/homogeneous_in.rb +72 -0
- data/lib/arel/nodes/in.rb +8 -1
- data/lib/arel/nodes/infix_operation.rb +13 -1
- data/lib/arel/nodes/join_source.rb +1 -1
- data/lib/arel/nodes/node.rb +7 -6
- data/lib/arel/nodes/ordering.rb +27 -0
- data/lib/arel/nodes/sql_literal.rb +3 -0
- data/lib/arel/nodes/table_alias.rb +7 -3
- data/lib/arel/nodes/unary.rb +0 -1
- data/lib/arel/nodes.rb +3 -1
- data/lib/arel/predications.rb +12 -18
- data/lib/arel/select_manager.rb +1 -2
- data/lib/arel/table.rb +13 -5
- data/lib/arel/visitors/dot.rb +14 -2
- data/lib/arel/visitors/mysql.rb +11 -1
- data/lib/arel/visitors/postgresql.rb +15 -4
- data/lib/arel/visitors/to_sql.rb +89 -78
- data/lib/arel/visitors.rb +0 -7
- data/lib/arel.rb +5 -13
- data/lib/rails/generators/active_record/migration/migration_generator.rb +1 -0
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +2 -0
- data/lib/rails/generators/active_record/migration/templates/migration.rb.tt +3 -3
- data/lib/rails/generators/active_record/migration.rb +6 -1
- data/lib/rails/generators/active_record/model/model_generator.rb +39 -2
- data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +7 -0
- metadata +28 -30
- data/lib/active_record/advisory_lock_base.rb +0 -18
- data/lib/active_record/attribute_decorators.rb +0 -88
- data/lib/active_record/connection_adapters/connection_specification.rb +0 -296
- data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +0 -29
- data/lib/active_record/define_callbacks.rb +0 -22
- data/lib/active_record/railties/collection_cache_association_loading.rb +0 -34
- data/lib/active_record/relation/predicate_builder/base_handler.rb +0 -18
- data/lib/active_record/relation/where_clause_factory.rb +0 -33
- data/lib/arel/attributes.rb +0 -22
- data/lib/arel/visitors/depth_first.rb +0 -203
- data/lib/arel/visitors/ibm_db.rb +0 -34
- data/lib/arel/visitors/informix.rb +0 -62
- data/lib/arel/visitors/mssql.rb +0 -156
- data/lib/arel/visitors/oracle.rb +0 -158
- data/lib/arel/visitors/oracle12.rb +0 -65
- data/lib/arel/visitors/where_sql.rb +0 -22
@@ -47,8 +47,9 @@ module ActiveRecord
|
|
47
47
|
# The exceptions AdapterNotSpecified, AdapterNotFound and +ArgumentError+
|
48
48
|
# may be returned on an error.
|
49
49
|
def establish_connection(config_or_env = nil)
|
50
|
-
|
51
|
-
|
50
|
+
config_or_env ||= DEFAULT_ENV.call.to_sym
|
51
|
+
db_config, owner_name = resolve_config_for_connection(config_or_env)
|
52
|
+
connection_handler.establish_connection(db_config, owner_name: owner_name, role: current_role, shard: current_shard)
|
52
53
|
end
|
53
54
|
|
54
55
|
# Connects a model to the databases specified. The +database+ keyword
|
@@ -64,25 +65,54 @@ module ActiveRecord
|
|
64
65
|
# connects_to database: { writing: :primary, reading: :primary_replica }
|
65
66
|
# end
|
66
67
|
#
|
67
|
-
#
|
68
|
-
|
68
|
+
# +connects_to+ also supports horizontal sharding. The horizontal sharding API
|
69
|
+
# also supports read replicas. Connect a model to a list of shards like this:
|
70
|
+
#
|
71
|
+
# class AnimalsModel < ApplicationRecord
|
72
|
+
# self.abstract_class = true
|
73
|
+
#
|
74
|
+
# connects_to shards: {
|
75
|
+
# default: { writing: :primary, reading: :primary_replica },
|
76
|
+
# shard_two: { writing: :primary_shard_two, reading: :primary_shard_replica_two }
|
77
|
+
# }
|
78
|
+
# end
|
79
|
+
#
|
80
|
+
# Returns an array of database connections.
|
81
|
+
def connects_to(database: {}, shards: {})
|
82
|
+
raise NotImplementedError, "`connects_to` can only be called on ActiveRecord::Base or abstract classes" unless self == Base || abstract_class?
|
83
|
+
|
84
|
+
if database.present? && shards.present?
|
85
|
+
raise ArgumentError, "`connects_to` can only accept a `database` or `shards` argument, but not both arguments."
|
86
|
+
end
|
87
|
+
|
69
88
|
connections = []
|
70
89
|
|
71
90
|
database.each do |role, database_key|
|
72
|
-
|
91
|
+
db_config, owner_name = resolve_config_for_connection(database_key)
|
73
92
|
handler = lookup_connection_handler(role.to_sym)
|
74
93
|
|
75
|
-
connections << handler.establish_connection(
|
94
|
+
connections << handler.establish_connection(db_config, owner_name: owner_name, role: role)
|
95
|
+
end
|
96
|
+
|
97
|
+
shards.each do |shard, database_keys|
|
98
|
+
database_keys.each do |role, database_key|
|
99
|
+
db_config, owner_name = resolve_config_for_connection(database_key)
|
100
|
+
handler = lookup_connection_handler(role.to_sym)
|
101
|
+
|
102
|
+
connections << handler.establish_connection(db_config, owner_name: owner_name, role: role, shard: shard.to_sym)
|
103
|
+
end
|
76
104
|
end
|
77
105
|
|
78
106
|
connections
|
79
107
|
end
|
80
108
|
|
81
|
-
# Connects to a
|
82
|
-
#
|
109
|
+
# Connects to a role (ex writing, reading or a custom role) and/or
|
110
|
+
# shard for the duration of the block. At the end of the block the
|
111
|
+
# connection will be returned to the original role / shard.
|
83
112
|
#
|
84
|
-
# If a role is passed, Active Record will look up the connection
|
85
|
-
# based on the requested role
|
113
|
+
# If only a role is passed, Active Record will look up the connection
|
114
|
+
# based on the requested role. If a non-established role is requested
|
115
|
+
# an `ActiveRecord::ConnectionNotEstablished` error will be raised:
|
86
116
|
#
|
87
117
|
# ActiveRecord::Base.connected_to(role: :writing) do
|
88
118
|
# Dog.create! # creates dog using dog writing connection
|
@@ -92,93 +122,149 @@ module ActiveRecord
|
|
92
122
|
# Dog.create! # throws exception because we're on a replica
|
93
123
|
# end
|
94
124
|
#
|
95
|
-
#
|
96
|
-
#
|
97
|
-
#
|
125
|
+
# When swapping to a shard, the role must be passed as well. If a non-existent
|
126
|
+
# shard is passed, an `ActiveRecord::ConnectionNotEstablished` error will be
|
127
|
+
# raised.
|
128
|
+
#
|
129
|
+
# When a shard and role is passed, Active Record will first lookup the role,
|
130
|
+
# and then look up the connection by shard key.
|
98
131
|
#
|
99
|
-
#
|
132
|
+
# ActiveRecord::Base.connected_to(role: :reading, shard: :shard_one_replica) do
|
133
|
+
# Dog.first # finds first Dog record stored on the shard one replica
|
134
|
+
# end
|
100
135
|
#
|
101
|
-
#
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
136
|
+
# The database kwarg is deprecated and will be removed in 6.2.0 without replacement.
|
137
|
+
def connected_to(database: nil, role: nil, shard: nil, prevent_writes: false, &blk)
|
138
|
+
if legacy_connection_handling
|
139
|
+
if self != Base
|
140
|
+
raise NotImplementedError, "`connected_to` can only be called on ActiveRecord::Base with legacy connection handling."
|
141
|
+
end
|
142
|
+
else
|
143
|
+
if self != Base && !abstract_class
|
144
|
+
raise NotImplementedError, "calling `connected_to` is only allowed on ActiveRecord::Base or abstract classes."
|
145
|
+
end
|
146
|
+
end
|
147
|
+
|
148
|
+
if database && (role || shard)
|
149
|
+
raise ArgumentError, "`connected_to` cannot accept a `database` argument with any other arguments."
|
106
150
|
elsif database
|
151
|
+
ActiveSupport::Deprecation.warn("The database key in `connected_to` is deprecated. It will be removed in Rails 6.2.0 without replacement.")
|
152
|
+
|
107
153
|
if database.is_a?(Hash)
|
108
154
|
role, database = database.first
|
109
155
|
role = role.to_sym
|
110
156
|
end
|
111
157
|
|
112
|
-
|
158
|
+
db_config, owner_name = resolve_config_for_connection(database)
|
113
159
|
handler = lookup_connection_handler(role)
|
114
160
|
|
115
|
-
handler.establish_connection(
|
161
|
+
handler.establish_connection(db_config, owner_name: owner_name, role: role)
|
116
162
|
|
117
163
|
with_handler(role, &blk)
|
118
|
-
elsif role
|
119
|
-
|
120
|
-
|
121
|
-
with_handler(role.to_sym) do
|
122
|
-
connection_handler.while_preventing_writes(prevent_writes, &blk)
|
164
|
+
elsif role || shard
|
165
|
+
unless role
|
166
|
+
raise ArgumentError, "`connected_to` cannot accept a `shard` argument without a `role`."
|
123
167
|
end
|
168
|
+
|
169
|
+
with_role_and_shard(role, shard, prevent_writes, &blk)
|
124
170
|
else
|
125
|
-
raise ArgumentError, "must provide a `
|
171
|
+
raise ArgumentError, "must provide a `shard` and/or `role`."
|
126
172
|
end
|
127
173
|
end
|
128
174
|
|
129
|
-
#
|
175
|
+
# Connects a role and/or shard to the provided connection names. Optionally `prevent_writes`
|
176
|
+
# can be passed to block writes on a connection. `reading` will automatically set
|
177
|
+
# `prevent_writes` to true.
|
130
178
|
#
|
131
|
-
#
|
132
|
-
#
|
133
|
-
#
|
179
|
+
# `connected_to_many` is an alternative to deeply nested `connected_to` blocks.
|
180
|
+
#
|
181
|
+
# Usage:
|
182
|
+
#
|
183
|
+
# ActiveRecord::Base.connected_to(AnimalsRecord, MealsRecord], role: :reading) do
|
184
|
+
# Dog.first # Read from animals replica
|
185
|
+
# Dinner.first # Read from meals replica
|
186
|
+
# Person.first # Read from primary writer
|
134
187
|
# end
|
135
|
-
def
|
136
|
-
|
188
|
+
def connected_to_many(classes, role:, shard: nil, prevent_writes: false)
|
189
|
+
if legacy_connection_handling
|
190
|
+
raise NotImplementedError, "connected_to_many is not available with legacy connection handling"
|
191
|
+
end
|
192
|
+
|
193
|
+
if self != Base || classes.include?(Base)
|
194
|
+
raise NotImplementedError, "connected_to_many can only be called on ActiveRecord::Base."
|
195
|
+
end
|
196
|
+
|
197
|
+
prevent_writes = true if role == reading_role
|
198
|
+
|
199
|
+
connected_to_stack << { role: role, shard: shard, prevent_writes: prevent_writes, klasses: classes }
|
200
|
+
yield
|
201
|
+
ensure
|
202
|
+
connected_to_stack.pop
|
137
203
|
end
|
138
204
|
|
139
|
-
#
|
205
|
+
# Use a specified connection.
|
140
206
|
#
|
141
|
-
#
|
142
|
-
#
|
143
|
-
# end
|
207
|
+
# This method is useful for ensuring that a specific connection is
|
208
|
+
# being used. For example, when booting a console in readonly mode.
|
144
209
|
#
|
145
|
-
#
|
146
|
-
#
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
210
|
+
# It is not recommended to use this method in a request since it
|
211
|
+
# does not yield to a block like `connected_to`.
|
212
|
+
def connecting_to(role: default_role, shard: default_shard, prevent_writes: false)
|
213
|
+
if legacy_connection_handling
|
214
|
+
raise NotImplementedError, "`connecting_to` is not available with `legacy_connection_handling`."
|
215
|
+
end
|
151
216
|
|
152
|
-
|
153
|
-
handler_key ||= ActiveRecord::Base.writing_role
|
154
|
-
connection_handlers[handler_key] ||= ActiveRecord::ConnectionAdapters::ConnectionHandler.new
|
155
|
-
end
|
217
|
+
prevent_writes = true if role == reading_role
|
156
218
|
|
157
|
-
|
158
|
-
handler = lookup_connection_handler(handler_key)
|
159
|
-
swap_connection_handler(handler, &blk)
|
219
|
+
self.connected_to_stack << { role: role, shard: shard, prevent_writes: prevent_writes, klasses: [self] }
|
160
220
|
end
|
161
221
|
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
222
|
+
# Prevent writing to the database regardless of role.
|
223
|
+
#
|
224
|
+
# In some cases you may want to prevent writes to the database
|
225
|
+
# even if you are on a database that can write. `while_preventing_writes`
|
226
|
+
# will prevent writes to the database for the duration of the block.
|
227
|
+
#
|
228
|
+
# This method does not provide the same protection as a readonly
|
229
|
+
# user and is meant to be a safeguard against accidental writes.
|
230
|
+
#
|
231
|
+
# See `READ_QUERY` for the queries that are blocked by this
|
232
|
+
# method.
|
233
|
+
def while_preventing_writes(enabled = true, &block)
|
234
|
+
if legacy_connection_handling
|
235
|
+
connection_handler.while_preventing_writes(enabled, &block)
|
236
|
+
else
|
237
|
+
connected_to(role: current_role, prevent_writes: enabled, &block)
|
238
|
+
end
|
239
|
+
end
|
168
240
|
|
169
|
-
|
170
|
-
|
171
|
-
|
241
|
+
# Returns true if role is the current connected role.
|
242
|
+
#
|
243
|
+
# ActiveRecord::Base.connected_to(role: :writing) do
|
244
|
+
# ActiveRecord::Base.connected_to?(role: :writing) #=> true
|
245
|
+
# ActiveRecord::Base.connected_to?(role: :reading) #=> false
|
246
|
+
# end
|
247
|
+
def connected_to?(role:, shard: ActiveRecord::Base.default_shard)
|
248
|
+
current_role == role.to_sym && current_shard == shard.to_sym
|
249
|
+
end
|
172
250
|
|
173
|
-
|
251
|
+
def lookup_connection_handler(handler_key) # :nodoc:
|
252
|
+
if ActiveRecord::Base.legacy_connection_handling
|
253
|
+
handler_key ||= ActiveRecord::Base.writing_role
|
254
|
+
connection_handlers[handler_key] ||= ActiveRecord::ConnectionAdapters::ConnectionHandler.new
|
255
|
+
else
|
256
|
+
ActiveRecord::Base.connection_handler
|
257
|
+
end
|
174
258
|
end
|
175
259
|
|
176
260
|
# Clears the query cache for all connections associated with the current thread.
|
177
261
|
def clear_query_caches_for_current_thread
|
178
|
-
ActiveRecord::Base.
|
179
|
-
|
180
|
-
|
262
|
+
if ActiveRecord::Base.legacy_connection_handling
|
263
|
+
ActiveRecord::Base.connection_handlers.each_value do |handler|
|
264
|
+
clear_on_handler(handler)
|
181
265
|
end
|
266
|
+
else
|
267
|
+
clear_on_handler(ActiveRecord::Base.connection_handler)
|
182
268
|
end
|
183
269
|
end
|
184
270
|
|
@@ -191,10 +277,10 @@ module ActiveRecord
|
|
191
277
|
|
192
278
|
attr_writer :connection_specification_name
|
193
279
|
|
194
|
-
# Return the specification name from the current class or its parent.
|
280
|
+
# Return the connection specification name from the current class or its parent.
|
195
281
|
def connection_specification_name
|
196
282
|
if !defined?(@connection_specification_name) || @connection_specification_name.nil?
|
197
|
-
return self == Base ?
|
283
|
+
return self == Base ? Base.name : superclass.connection_specification_name
|
198
284
|
end
|
199
285
|
@connection_specification_name
|
200
286
|
end
|
@@ -210,20 +296,32 @@ module ActiveRecord
|
|
210
296
|
#
|
211
297
|
# Please use only for reading.
|
212
298
|
def connection_config
|
213
|
-
connection_pool.
|
299
|
+
connection_pool.db_config.configuration_hash
|
300
|
+
end
|
301
|
+
deprecate connection_config: "Use connection_db_config instead"
|
302
|
+
|
303
|
+
# Returns the db_config object from the associated connection:
|
304
|
+
#
|
305
|
+
# ActiveRecord::Base.connection_db_config
|
306
|
+
# #<ActiveRecord::DatabaseConfigurations::HashConfig:0x00007fd1acbded10 @env_name="development",
|
307
|
+
# @name="primary", @config={pool: 5, timeout: 5000, database: "db/development.sqlite3", adapter: "sqlite3"}>
|
308
|
+
#
|
309
|
+
# Use only for reading.
|
310
|
+
def connection_db_config
|
311
|
+
connection_pool.db_config
|
214
312
|
end
|
215
313
|
|
216
314
|
def connection_pool
|
217
|
-
connection_handler.retrieve_connection_pool(connection_specification_name) || raise(ConnectionNotEstablished)
|
315
|
+
connection_handler.retrieve_connection_pool(connection_specification_name, role: current_role, shard: current_shard) || raise(ConnectionNotEstablished)
|
218
316
|
end
|
219
317
|
|
220
318
|
def retrieve_connection
|
221
|
-
connection_handler.retrieve_connection(connection_specification_name)
|
319
|
+
connection_handler.retrieve_connection(connection_specification_name, role: current_role, shard: current_shard)
|
222
320
|
end
|
223
321
|
|
224
322
|
# Returns +true+ if Active Record is connected.
|
225
323
|
def connected?
|
226
|
-
connection_handler.connected?(connection_specification_name)
|
324
|
+
connection_handler.connected?(connection_specification_name, role: current_role, shard: current_shard)
|
227
325
|
end
|
228
326
|
|
229
327
|
def remove_connection(name = nil)
|
@@ -231,11 +329,11 @@ module ActiveRecord
|
|
231
329
|
# if removing a connection that has a pool, we reset the
|
232
330
|
# connection_specification_name so it will use the parent
|
233
331
|
# pool.
|
234
|
-
if connection_handler.retrieve_connection_pool(name)
|
332
|
+
if connection_handler.retrieve_connection_pool(name, role: current_role, shard: current_shard)
|
235
333
|
self.connection_specification_name = nil
|
236
334
|
end
|
237
335
|
|
238
|
-
connection_handler.
|
336
|
+
connection_handler.remove_connection_pool(name, role: current_role, shard: current_shard)
|
239
337
|
end
|
240
338
|
|
241
339
|
def clear_cache! # :nodoc:
|
@@ -246,6 +344,47 @@ module ActiveRecord
|
|
246
344
|
:clear_all_connections!, :flush_idle_connections!, to: :connection_handler
|
247
345
|
|
248
346
|
private
|
347
|
+
def clear_on_handler(handler)
|
348
|
+
handler.all_connection_pools.each do |pool|
|
349
|
+
pool.connection.clear_query_cache if pool.active_connection?
|
350
|
+
end
|
351
|
+
end
|
352
|
+
|
353
|
+
def resolve_config_for_connection(config_or_env)
|
354
|
+
raise "Anonymous class is not allowed." unless name
|
355
|
+
|
356
|
+
owner_name = primary_class? ? Base.name : name
|
357
|
+
self.connection_specification_name = owner_name
|
358
|
+
|
359
|
+
db_config = Base.configurations.resolve(config_or_env)
|
360
|
+
[db_config, owner_name]
|
361
|
+
end
|
362
|
+
|
363
|
+
def with_handler(handler_key, &blk)
|
364
|
+
handler = lookup_connection_handler(handler_key)
|
365
|
+
swap_connection_handler(handler, &blk)
|
366
|
+
end
|
367
|
+
|
368
|
+
def with_role_and_shard(role, shard, prevent_writes)
|
369
|
+
prevent_writes = true if role == reading_role
|
370
|
+
|
371
|
+
if ActiveRecord::Base.legacy_connection_handling
|
372
|
+
with_handler(role.to_sym) do
|
373
|
+
connection_handler.while_preventing_writes(prevent_writes) do
|
374
|
+
self.connected_to_stack << { shard: shard, klasses: [self] }
|
375
|
+
yield
|
376
|
+
end
|
377
|
+
end
|
378
|
+
else
|
379
|
+
self.connected_to_stack << { role: role, shard: shard, prevent_writes: prevent_writes, klasses: [self] }
|
380
|
+
return_value = yield
|
381
|
+
return_value.load if return_value.is_a? ActiveRecord::Relation
|
382
|
+
return_value
|
383
|
+
end
|
384
|
+
ensure
|
385
|
+
self.connected_to_stack.pop
|
386
|
+
end
|
387
|
+
|
249
388
|
def swap_connection_handler(handler, &blk) # :nodoc:
|
250
389
|
old_handler, ActiveRecord::Base.connection_handler = ActiveRecord::Base.connection_handler, handler
|
251
390
|
return_value = yield
|