activerecord 6.0.1 → 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 +843 -626
- data/MIT-LICENSE +1 -1
- data/README.rdoc +3 -3
- data/lib/active_record/aggregations.rb +1 -2
- data/lib/active_record/association_relation.rb +18 -17
- data/lib/active_record/associations/alias_tracker.rb +19 -16
- data/lib/active_record/associations/association.rb +49 -37
- data/lib/active_record/associations/association_scope.rb +17 -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 -3
- 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 +25 -8
- data/lib/active_record/associations/collection_proxy.rb +14 -7
- data/lib/active_record/associations/foreign_association.rb +13 -0
- data/lib/active_record/associations/has_many_association.rb +24 -3
- 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 +36 -14
- data/lib/active_record/associations/join_dependency/join_part.rb +3 -3
- data/lib/active_record/associations/join_dependency.rb +73 -42
- data/lib/active_record/associations/preloader/association.rb +51 -25
- data/lib/active_record/associations/preloader/through_association.rb +2 -2
- data/lib/active_record/associations/preloader.rb +12 -7
- data/lib/active_record/associations/singular_association.rb +1 -1
- data/lib/active_record/associations/through_association.rb +1 -1
- data/lib/active_record/associations.rb +115 -12
- data/lib/active_record/attribute_assignment.rb +10 -9
- data/lib/active_record/attribute_methods/before_type_cast.rb +13 -10
- data/lib/active_record/attribute_methods/dirty.rb +3 -13
- data/lib/active_record/attribute_methods/primary_key.rb +6 -4
- data/lib/active_record/attribute_methods/query.rb +3 -6
- data/lib/active_record/attribute_methods/read.rb +8 -12
- data/lib/active_record/attribute_methods/serialization.rb +11 -6
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +12 -15
- data/lib/active_record/attribute_methods/write.rb +12 -21
- data/lib/active_record/attribute_methods.rb +64 -54
- data/lib/active_record/attributes.rb +32 -8
- data/lib/active_record/autosave_association.rb +56 -41
- data/lib/active_record/base.rb +2 -14
- data/lib/active_record/callbacks.rb +153 -24
- data/lib/active_record/coders/yaml_column.rb +1 -2
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +190 -136
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +2 -44
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +82 -37
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +2 -8
- 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 +152 -116
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +137 -52
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +3 -3
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +263 -107
- data/lib/active_record/connection_adapters/abstract/transaction.rb +82 -35
- data/lib/active_record/connection_adapters/abstract_adapter.rb +60 -73
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +136 -111
- 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/column.rb +1 -1
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +28 -36
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +1 -2
- data/lib/active_record/connection_adapters/mysql/quoting.rb +1 -1
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +32 -7
- 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 +17 -13
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +10 -1
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +31 -13
- 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 +19 -56
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +0 -1
- 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 +10 -2
- data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql/oid/interval.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +2 -3
- data/lib/active_record/connection_adapters/postgresql/oid/macaddr.rb +25 -0
- data/lib/active_record/connection_adapters/postgresql/oid/oid.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +2 -3
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +24 -6
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +11 -2
- 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 +2 -2
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +7 -3
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +72 -54
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +8 -0
- data/lib/active_record/connection_adapters/postgresql/utils.rb +0 -1
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +77 -57
- 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 +36 -12
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +1 -2
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +5 -1
- data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +38 -5
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +57 -57
- data/lib/active_record/connection_adapters/statement_pool.rb +0 -1
- data/lib/active_record/connection_adapters.rb +50 -0
- data/lib/active_record/connection_handling.rb +210 -87
- data/lib/active_record/core.rb +229 -65
- data/lib/active_record/counter_cache.rb +4 -1
- 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 -41
- 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/dynamic_matchers.rb +2 -3
- data/lib/active_record/enum.rb +40 -16
- data/lib/active_record/errors.rb +47 -12
- data/lib/active_record/explain.rb +9 -5
- 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 -3
- data/lib/active_record/fixture_set/table_rows.rb +0 -1
- data/lib/active_record/fixtures.rb +54 -11
- data/lib/active_record/gem_version.rb +2 -2
- data/lib/active_record/inheritance.rb +40 -21
- data/lib/active_record/insert_all.rb +38 -9
- 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 +22 -17
- data/lib/active_record/locking/pessimistic.rb +6 -2
- data/lib/active_record/log_subscriber.rb +27 -9
- data/lib/active_record/middleware/database_selector/resolver/session.rb +3 -0
- data/lib/active_record/middleware/database_selector/resolver.rb +6 -2
- data/lib/active_record/middleware/database_selector.rb +4 -2
- data/lib/active_record/migration/command_recorder.rb +53 -45
- data/lib/active_record/migration/compatibility.rb +70 -20
- data/lib/active_record/migration/join_table.rb +0 -1
- data/lib/active_record/migration.rb +114 -84
- data/lib/active_record/model_schema.rb +117 -15
- data/lib/active_record/nested_attributes.rb +2 -5
- data/lib/active_record/no_touching.rb +1 -1
- data/lib/active_record/null_relation.rb +0 -1
- data/lib/active_record/persistence.rb +50 -46
- data/lib/active_record/query_cache.rb +15 -5
- data/lib/active_record/querying.rb +12 -7
- data/lib/active_record/railtie.rb +65 -45
- data/lib/active_record/railties/databases.rake +267 -93
- data/lib/active_record/readonly_attributes.rb +4 -0
- data/lib/active_record/reflection.rb +77 -63
- data/lib/active_record/relation/batches/batch_enumerator.rb +25 -9
- data/lib/active_record/relation/batches.rb +38 -32
- data/lib/active_record/relation/calculations.rb +102 -45
- data/lib/active_record/relation/delegation.rb +9 -7
- data/lib/active_record/relation/finder_methods.rb +45 -16
- data/lib/active_record/relation/from_clause.rb +5 -1
- data/lib/active_record/relation/merger.rb +27 -26
- 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 +55 -35
- data/lib/active_record/relation/query_methods.rb +335 -187
- data/lib/active_record/relation/record_fetch_warning.rb +3 -3
- data/lib/active_record/relation/spawn_methods.rb +8 -8
- data/lib/active_record/relation/where_clause.rb +104 -58
- data/lib/active_record/relation.rb +108 -68
- data/lib/active_record/result.rb +41 -34
- 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/default.rb +0 -1
- data/lib/active_record/scoping/named.rb +7 -18
- data/lib/active_record/scoping.rb +0 -1
- 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 +3 -3
- data/lib/active_record/suppressor.rb +2 -2
- data/lib/active_record/table_metadata.rb +39 -36
- data/lib/active_record/tasks/database_tasks.rb +139 -113
- data/lib/active_record/tasks/mysql_database_tasks.rb +34 -36
- data/lib/active_record/tasks/postgresql_database_tasks.rb +24 -27
- data/lib/active_record/tasks/sqlite_database_tasks.rb +13 -10
- data/lib/active_record/test_databases.rb +5 -4
- data/lib/active_record/test_fixtures.rb +38 -16
- data/lib/active_record/timestamp.rb +4 -7
- data/lib/active_record/touch_later.rb +20 -21
- data/lib/active_record/transactions.rb +21 -70
- data/lib/active_record/type/adapter_specific_registry.rb +2 -5
- data/lib/active_record/type/hash_lookup_type_map.rb +0 -1
- data/lib/active_record/type/serialized.rb +6 -3
- data/lib/active_record/type/time.rb +10 -0
- data/lib/active_record/type/type_map.rb +0 -1
- data/lib/active_record/type/unsigned_integer.rb +0 -1
- data/lib/active_record/type.rb +8 -2
- 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 -2
- data/lib/active_record/validations/numericality.rb +35 -0
- data/lib/active_record/validations/uniqueness.rb +24 -4
- data/lib/active_record/validations.rb +3 -3
- data/lib/active_record.rb +7 -13
- 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 +17 -24
- data/lib/arel/select_manager.rb +1 -2
- data/lib/arel/table.rb +13 -5
- data/lib/arel/visitors/dot.rb +14 -3
- data/lib/arel/visitors/mysql.rb +11 -1
- data/lib/arel/visitors/postgresql.rb +15 -5
- data/lib/arel/visitors/sqlite.rb +0 -1
- data/lib/arel/visitors/to_sql.rb +89 -79
- data/lib/arel/visitors/visitor.rb +0 -1
- data/lib/arel/visitors.rb +0 -7
- data/lib/arel.rb +5 -9
- data/lib/rails/generators/active_record/application_record/application_record_generator.rb +0 -1
- 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 +4 -4
- data/lib/rails/generators/active_record/migration.rb +6 -2
- data/lib/rails/generators/active_record/model/model_generator.rb +38 -2
- data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +7 -0
- metadata +26 -26
- data/lib/active_record/attribute_decorators.rb +0 -90
- data/lib/active_record/connection_adapters/connection_specification.rb +0 -297
- 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 -204
- data/lib/arel/visitors/ibm_db.rb +0 -34
- data/lib/arel/visitors/informix.rb +0 -62
- data/lib/arel/visitors/mssql.rb +0 -157
- data/lib/arel/visitors/oracle.rb +0 -159
- data/lib/arel/visitors/oracle12.rb +0 -66
- data/lib/arel/visitors/where_sql.rb +0 -23
@@ -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,110 +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.
|
98
128
|
#
|
99
|
-
#
|
100
|
-
#
|
101
|
-
# expects a symbol that corresponds to the database key in your config.
|
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.
|
102
131
|
#
|
103
|
-
# ActiveRecord::Base.connected_to(
|
104
|
-
# Dog.
|
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
|
105
134
|
# end
|
106
135
|
#
|
107
|
-
#
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
if database && role
|
120
|
-
raise ArgumentError, "connected_to
|
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."
|
121
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
|
+
|
122
153
|
if database.is_a?(Hash)
|
123
154
|
role, database = database.first
|
124
155
|
role = role.to_sym
|
125
156
|
end
|
126
157
|
|
127
|
-
|
158
|
+
db_config, owner_name = resolve_config_for_connection(database)
|
128
159
|
handler = lookup_connection_handler(role)
|
129
160
|
|
130
|
-
handler.establish_connection(
|
161
|
+
handler.establish_connection(db_config, owner_name: owner_name, role: role)
|
131
162
|
|
132
163
|
with_handler(role, &blk)
|
133
|
-
elsif role
|
134
|
-
|
135
|
-
|
136
|
-
connection_handler.while_preventing_writes(prevent_writes, &blk)
|
137
|
-
end
|
138
|
-
else
|
139
|
-
with_handler(role.to_sym, &blk)
|
164
|
+
elsif role || shard
|
165
|
+
unless role
|
166
|
+
raise ArgumentError, "`connected_to` cannot accept a `shard` argument without a `role`."
|
140
167
|
end
|
168
|
+
|
169
|
+
with_role_and_shard(role, shard, prevent_writes, &blk)
|
141
170
|
else
|
142
|
-
raise ArgumentError, "must provide a `
|
171
|
+
raise ArgumentError, "must provide a `shard` and/or `role`."
|
143
172
|
end
|
144
173
|
end
|
145
174
|
|
146
|
-
#
|
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.
|
147
178
|
#
|
148
|
-
#
|
149
|
-
#
|
150
|
-
#
|
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
|
151
187
|
# end
|
152
|
-
def
|
153
|
-
|
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
|
154
203
|
end
|
155
204
|
|
156
|
-
#
|
205
|
+
# Use a specified connection.
|
157
206
|
#
|
158
|
-
#
|
159
|
-
#
|
160
|
-
# 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.
|
161
209
|
#
|
162
|
-
#
|
163
|
-
#
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
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
|
168
216
|
|
169
|
-
|
170
|
-
handler_key ||= ActiveRecord::Base.writing_role
|
171
|
-
connection_handlers[handler_key] ||= ActiveRecord::ConnectionAdapters::ConnectionHandler.new
|
172
|
-
end
|
217
|
+
prevent_writes = true if role == reading_role
|
173
218
|
|
174
|
-
|
175
|
-
handler = lookup_connection_handler(handler_key)
|
176
|
-
swap_connection_handler(handler, &blk)
|
219
|
+
self.connected_to_stack << { role: role, shard: shard, prevent_writes: prevent_writes, klasses: [self] }
|
177
220
|
end
|
178
221
|
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
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
|
185
240
|
|
186
|
-
|
187
|
-
|
188
|
-
|
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
|
189
250
|
|
190
|
-
|
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
|
191
258
|
end
|
192
259
|
|
193
260
|
# Clears the query cache for all connections associated with the current thread.
|
194
261
|
def clear_query_caches_for_current_thread
|
195
|
-
ActiveRecord::Base.
|
196
|
-
|
197
|
-
|
262
|
+
if ActiveRecord::Base.legacy_connection_handling
|
263
|
+
ActiveRecord::Base.connection_handlers.each_value do |handler|
|
264
|
+
clear_on_handler(handler)
|
198
265
|
end
|
266
|
+
else
|
267
|
+
clear_on_handler(ActiveRecord::Base.connection_handler)
|
199
268
|
end
|
200
269
|
end
|
201
270
|
|
@@ -208,10 +277,10 @@ module ActiveRecord
|
|
208
277
|
|
209
278
|
attr_writer :connection_specification_name
|
210
279
|
|
211
|
-
# Return the specification name from the current class or its parent.
|
280
|
+
# Return the connection specification name from the current class or its parent.
|
212
281
|
def connection_specification_name
|
213
282
|
if !defined?(@connection_specification_name) || @connection_specification_name.nil?
|
214
|
-
return self == Base ?
|
283
|
+
return self == Base ? Base.name : superclass.connection_specification_name
|
215
284
|
end
|
216
285
|
@connection_specification_name
|
217
286
|
end
|
@@ -227,20 +296,32 @@ module ActiveRecord
|
|
227
296
|
#
|
228
297
|
# Please use only for reading.
|
229
298
|
def connection_config
|
230
|
-
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
|
231
312
|
end
|
232
313
|
|
233
314
|
def connection_pool
|
234
|
-
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)
|
235
316
|
end
|
236
317
|
|
237
318
|
def retrieve_connection
|
238
|
-
connection_handler.retrieve_connection(connection_specification_name)
|
319
|
+
connection_handler.retrieve_connection(connection_specification_name, role: current_role, shard: current_shard)
|
239
320
|
end
|
240
321
|
|
241
322
|
# Returns +true+ if Active Record is connected.
|
242
323
|
def connected?
|
243
|
-
connection_handler.connected?(connection_specification_name)
|
324
|
+
connection_handler.connected?(connection_specification_name, role: current_role, shard: current_shard)
|
244
325
|
end
|
245
326
|
|
246
327
|
def remove_connection(name = nil)
|
@@ -248,11 +329,11 @@ module ActiveRecord
|
|
248
329
|
# if removing a connection that has a pool, we reset the
|
249
330
|
# connection_specification_name so it will use the parent
|
250
331
|
# pool.
|
251
|
-
if connection_handler.retrieve_connection_pool(name)
|
332
|
+
if connection_handler.retrieve_connection_pool(name, role: current_role, shard: current_shard)
|
252
333
|
self.connection_specification_name = nil
|
253
334
|
end
|
254
335
|
|
255
|
-
connection_handler.
|
336
|
+
connection_handler.remove_connection_pool(name, role: current_role, shard: current_shard)
|
256
337
|
end
|
257
338
|
|
258
339
|
def clear_cache! # :nodoc:
|
@@ -263,10 +344,52 @@ module ActiveRecord
|
|
263
344
|
:clear_all_connections!, :flush_idle_connections!, to: :connection_handler
|
264
345
|
|
265
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
|
266
387
|
|
267
388
|
def swap_connection_handler(handler, &blk) # :nodoc:
|
268
389
|
old_handler, ActiveRecord::Base.connection_handler = ActiveRecord::Base.connection_handler, handler
|
269
|
-
yield
|
390
|
+
return_value = yield
|
391
|
+
return_value.load if return_value.is_a? ActiveRecord::Relation
|
392
|
+
return_value
|
270
393
|
ensure
|
271
394
|
ActiveRecord::Base.connection_handler = old_handler
|
272
395
|
end
|