activerecord 4.2.9 → 6.1.4.1
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 +5 -5
- data/CHANGELOG.md +964 -1382
- data/MIT-LICENSE +4 -2
- data/README.rdoc +15 -14
- data/examples/performance.rb +33 -32
- data/examples/simple.rb +5 -4
- data/lib/active_record/aggregations.rb +266 -251
- data/lib/active_record/association_relation.rb +40 -15
- data/lib/active_record/associations/alias_tracker.rb +40 -43
- data/lib/active_record/associations/association.rb +162 -69
- data/lib/active_record/associations/association_scope.rb +105 -130
- data/lib/active_record/associations/belongs_to_association.rb +83 -65
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +13 -12
- data/lib/active_record/associations/builder/association.rb +57 -43
- data/lib/active_record/associations/builder/belongs_to.rb +74 -57
- data/lib/active_record/associations/builder/collection_association.rb +15 -37
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +49 -66
- data/lib/active_record/associations/builder/has_many.rb +13 -5
- data/lib/active_record/associations/builder/has_one.rb +44 -6
- data/lib/active_record/associations/builder/singular_association.rb +16 -10
- data/lib/active_record/associations/collection_association.rb +148 -287
- data/lib/active_record/associations/collection_proxy.rb +252 -150
- data/lib/active_record/associations/foreign_association.rb +23 -1
- data/lib/active_record/associations/has_many_association.rb +56 -98
- data/lib/active_record/associations/has_many_through_association.rb +68 -89
- data/lib/active_record/associations/has_one_association.rb +73 -47
- data/lib/active_record/associations/has_one_through_association.rb +20 -11
- data/lib/active_record/associations/join_dependency/join_association.rb +54 -81
- data/lib/active_record/associations/join_dependency/join_base.rb +10 -9
- data/lib/active_record/associations/join_dependency/join_part.rb +14 -14
- data/lib/active_record/associations/join_dependency.rb +174 -169
- data/lib/active_record/associations/preloader/association.rb +108 -115
- data/lib/active_record/associations/preloader/through_association.rb +85 -65
- data/lib/active_record/associations/preloader.rb +97 -94
- data/lib/active_record/associations/singular_association.rb +18 -39
- data/lib/active_record/associations/through_association.rb +39 -19
- data/lib/active_record/associations.rb +1845 -1598
- data/lib/active_record/attribute_assignment.rb +59 -185
- data/lib/active_record/attribute_methods/before_type_cast.rb +18 -10
- data/lib/active_record/attribute_methods/dirty.rb +168 -148
- data/lib/active_record/attribute_methods/primary_key.rb +93 -83
- data/lib/active_record/attribute_methods/query.rb +8 -10
- data/lib/active_record/attribute_methods/read.rb +19 -79
- data/lib/active_record/attribute_methods/serialization.rb +49 -24
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +55 -36
- data/lib/active_record/attribute_methods/write.rb +24 -55
- data/lib/active_record/attribute_methods.rb +149 -154
- data/lib/active_record/attributes.rb +234 -78
- data/lib/active_record/autosave_association.rb +133 -60
- data/lib/active_record/base.rb +46 -46
- data/lib/active_record/callbacks.rb +234 -79
- data/lib/active_record/coders/json.rb +3 -1
- data/lib/active_record/coders/yaml_column.rb +34 -13
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +887 -323
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +17 -41
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +292 -124
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +78 -24
- data/lib/active_record/connection_adapters/abstract/quoting.rb +177 -60
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +8 -6
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +157 -93
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +473 -255
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +79 -36
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +869 -286
- data/lib/active_record/connection_adapters/abstract/transaction.rb +257 -91
- data/lib/active_record/connection_adapters/abstract_adapter.rb +483 -230
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +557 -640
- data/lib/active_record/connection_adapters/column.rb +67 -40
- data/lib/active_record/connection_adapters/deduplicable.rb +29 -0
- data/lib/active_record/connection_adapters/legacy_pool_manager.rb +35 -0
- data/lib/active_record/connection_adapters/mysql/column.rb +27 -0
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +194 -0
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +71 -0
- data/lib/active_record/connection_adapters/mysql/quoting.rb +96 -0
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +97 -0
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +103 -0
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +91 -0
- data/lib/active_record/connection_adapters/mysql/schema_statements.rb +268 -0
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +40 -0
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +80 -192
- data/lib/active_record/connection_adapters/pool_config.rb +73 -0
- data/lib/active_record/connection_adapters/pool_manager.rb +47 -0
- data/lib/active_record/connection_adapters/postgresql/column.rb +44 -11
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +75 -160
- data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb +44 -0
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +49 -58
- data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +9 -8
- data/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb +2 -0
- data/lib/active_record/connection_adapters/postgresql/oid/bytea.rb +4 -2
- data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +8 -6
- data/lib/active_record/connection_adapters/postgresql/oid/date.rb +13 -1
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +14 -19
- data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +3 -1
- data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +5 -4
- data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +31 -20
- data/lib/active_record/connection_adapters/postgresql/oid/inet.rb +2 -0
- data/lib/active_record/connection_adapters/postgresql/oid/interval.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +3 -11
- data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +44 -0
- data/lib/active_record/connection_adapters/postgresql/oid/macaddr.rb +25 -0
- data/lib/active_record/connection_adapters/postgresql/oid/money.rb +7 -9
- data/lib/active_record/connection_adapters/postgresql/oid/{infinity.rb → oid.rb} +5 -3
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +32 -11
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +70 -34
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +4 -5
- data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +58 -54
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +18 -4
- data/lib/active_record/connection_adapters/postgresql/oid/vector.rb +3 -1
- data/lib/active_record/connection_adapters/postgresql/oid/xml.rb +3 -1
- data/lib/active_record/connection_adapters/postgresql/oid.rb +25 -25
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +145 -48
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +27 -14
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +80 -0
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +178 -108
- data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +496 -298
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +44 -0
- data/lib/active_record/connection_adapters/postgresql/utils.rb +11 -8
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +588 -375
- data/lib/active_record/connection_adapters/schema_cache.rb +167 -29
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +45 -0
- data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +144 -0
- data/lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb +21 -0
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +102 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +21 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_definitions.rb +19 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb +18 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +170 -0
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +322 -373
- data/lib/active_record/connection_adapters/statement_pool.rb +33 -13
- data/lib/active_record/connection_adapters.rb +52 -0
- data/lib/active_record/connection_handling.rb +314 -41
- data/lib/active_record/core.rb +458 -241
- data/lib/active_record/counter_cache.rb +70 -49
- data/lib/active_record/database_configurations/connection_url_resolver.rb +98 -0
- data/lib/active_record/database_configurations/database_config.rb +80 -0
- data/lib/active_record/database_configurations/hash_config.rb +96 -0
- data/lib/active_record/database_configurations/url_config.rb +53 -0
- data/lib/active_record/database_configurations.rb +272 -0
- 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 +87 -106
- data/lib/active_record/enum.rb +211 -92
- data/lib/active_record/errors.rb +224 -54
- data/lib/active_record/explain.rb +27 -11
- data/lib/active_record/explain_registry.rb +4 -2
- data/lib/active_record/explain_subscriber.rb +10 -5
- data/lib/active_record/fixture_set/file.rb +33 -14
- data/lib/active_record/fixture_set/model_metadata.rb +32 -0
- data/lib/active_record/fixture_set/render_context.rb +17 -0
- data/lib/active_record/fixture_set/table_row.rb +152 -0
- data/lib/active_record/fixture_set/table_rows.rb +46 -0
- data/lib/active_record/fixtures.rb +275 -500
- data/lib/active_record/gem_version.rb +6 -4
- data/lib/active_record/inheritance.rb +175 -110
- data/lib/active_record/insert_all.rb +212 -0
- data/lib/active_record/integration.rb +121 -29
- data/lib/active_record/internal_metadata.rb +62 -0
- data/lib/active_record/legacy_yaml_adapter.rb +27 -5
- data/lib/active_record/locale/en.yml +3 -2
- data/lib/active_record/locking/optimistic.rb +98 -92
- data/lib/active_record/locking/pessimistic.rb +22 -6
- data/lib/active_record/log_subscriber.rb +93 -31
- data/lib/active_record/middleware/database_selector/resolver/session.rb +48 -0
- data/lib/active_record/middleware/database_selector/resolver.rb +92 -0
- data/lib/active_record/middleware/database_selector.rb +77 -0
- data/lib/active_record/migration/command_recorder.rb +185 -90
- data/lib/active_record/migration/compatibility.rb +295 -0
- data/lib/active_record/migration/join_table.rb +8 -7
- data/lib/active_record/migration.rb +673 -325
- data/lib/active_record/model_schema.rb +418 -113
- data/lib/active_record/nested_attributes.rb +263 -224
- data/lib/active_record/no_touching.rb +15 -2
- data/lib/active_record/null_relation.rb +24 -38
- data/lib/active_record/persistence.rb +572 -136
- data/lib/active_record/query_cache.rb +29 -23
- data/lib/active_record/querying.rb +50 -31
- data/lib/active_record/railtie.rb +170 -51
- data/lib/active_record/railties/console_sandbox.rb +3 -3
- data/lib/active_record/railties/controller_runtime.rb +34 -33
- data/lib/active_record/railties/databases.rake +523 -199
- data/lib/active_record/readonly_attributes.rb +9 -4
- data/lib/active_record/reflection.rb +454 -291
- data/lib/active_record/relation/batches/batch_enumerator.rb +85 -0
- data/lib/active_record/relation/batches.rb +217 -59
- data/lib/active_record/relation/calculations.rb +324 -249
- data/lib/active_record/relation/delegation.rb +76 -84
- data/lib/active_record/relation/finder_methods.rb +316 -242
- data/lib/active_record/relation/from_clause.rb +30 -0
- data/lib/active_record/relation/merger.rb +95 -103
- data/lib/active_record/relation/predicate_builder/array_handler.rb +26 -26
- data/lib/active_record/relation/predicate_builder/association_query_value.rb +42 -0
- data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +19 -0
- data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +57 -0
- data/lib/active_record/relation/predicate_builder/range_handler.rb +22 -0
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +7 -1
- data/lib/active_record/relation/predicate_builder.rb +136 -122
- data/lib/active_record/relation/query_attribute.rb +50 -0
- data/lib/active_record/relation/query_methods.rb +757 -413
- data/lib/active_record/relation/record_fetch_warning.rb +51 -0
- data/lib/active_record/relation/spawn_methods.rb +18 -20
- data/lib/active_record/relation/where_clause.rb +239 -0
- data/lib/active_record/relation.rb +554 -343
- data/lib/active_record/result.rb +91 -47
- data/lib/active_record/runtime_registry.rb +6 -4
- data/lib/active_record/sanitization.rb +134 -122
- data/lib/active_record/schema.rb +21 -24
- data/lib/active_record/schema_dumper.rb +141 -92
- data/lib/active_record/schema_migration.rb +24 -23
- data/lib/active_record/scoping/default.rb +96 -83
- data/lib/active_record/scoping/named.rb +78 -36
- data/lib/active_record/scoping.rb +45 -27
- data/lib/active_record/secure_token.rb +48 -0
- data/lib/active_record/serialization.rb +8 -6
- data/lib/active_record/signed_id.rb +116 -0
- data/lib/active_record/statement_cache.rb +89 -36
- data/lib/active_record/store.rb +128 -43
- data/lib/active_record/suppressor.rb +61 -0
- data/lib/active_record/table_metadata.rb +81 -0
- data/lib/active_record/tasks/database_tasks.rb +364 -130
- data/lib/active_record/tasks/mysql_database_tasks.rb +67 -113
- data/lib/active_record/tasks/postgresql_database_tasks.rb +86 -49
- data/lib/active_record/tasks/sqlite_database_tasks.rb +44 -19
- data/lib/active_record/test_databases.rb +24 -0
- data/lib/active_record/test_fixtures.rb +287 -0
- data/lib/active_record/timestamp.rb +86 -43
- data/lib/active_record/touch_later.rb +65 -0
- data/lib/active_record/transactions.rb +182 -163
- data/lib/active_record/translation.rb +3 -1
- data/lib/active_record/type/adapter_specific_registry.rb +126 -0
- data/lib/active_record/type/date.rb +4 -45
- data/lib/active_record/type/date_time.rb +4 -49
- data/lib/active_record/type/decimal_without_scale.rb +6 -2
- data/lib/active_record/type/hash_lookup_type_map.rb +5 -4
- data/lib/active_record/type/internal/timezone.rb +17 -0
- data/lib/active_record/type/json.rb +30 -0
- data/lib/active_record/type/serialized.rb +27 -15
- data/lib/active_record/type/text.rb +2 -2
- data/lib/active_record/type/time.rb +21 -16
- data/lib/active_record/type/type_map.rb +16 -19
- data/lib/active_record/type/unsigned_integer.rb +9 -8
- data/lib/active_record/type.rb +84 -23
- data/lib/active_record/type_caster/connection.rb +33 -0
- data/lib/active_record/type_caster/map.rb +23 -0
- data/lib/active_record/type_caster.rb +9 -0
- data/lib/active_record/validations/absence.rb +25 -0
- data/lib/active_record/validations/associated.rb +12 -4
- data/lib/active_record/validations/length.rb +26 -0
- data/lib/active_record/validations/numericality.rb +35 -0
- data/lib/active_record/validations/presence.rb +14 -13
- data/lib/active_record/validations/uniqueness.rb +63 -56
- data/lib/active_record/validations.rb +39 -35
- data/lib/active_record/version.rb +3 -1
- data/lib/active_record.rb +42 -29
- data/lib/arel/alias_predication.rb +9 -0
- data/lib/arel/attributes/attribute.rb +41 -0
- data/lib/arel/collectors/bind.rb +29 -0
- data/lib/arel/collectors/composite.rb +39 -0
- data/lib/arel/collectors/plain_string.rb +20 -0
- data/lib/arel/collectors/sql_string.rb +27 -0
- data/lib/arel/collectors/substitute_binds.rb +35 -0
- data/lib/arel/crud.rb +42 -0
- data/lib/arel/delete_manager.rb +18 -0
- data/lib/arel/errors.rb +9 -0
- data/lib/arel/expressions.rb +29 -0
- data/lib/arel/factory_methods.rb +49 -0
- data/lib/arel/insert_manager.rb +49 -0
- data/lib/arel/math.rb +45 -0
- data/lib/arel/nodes/and.rb +32 -0
- data/lib/arel/nodes/ascending.rb +23 -0
- data/lib/arel/nodes/binary.rb +126 -0
- data/lib/arel/nodes/bind_param.rb +44 -0
- data/lib/arel/nodes/case.rb +55 -0
- data/lib/arel/nodes/casted.rb +62 -0
- data/lib/arel/nodes/comment.rb +29 -0
- data/lib/arel/nodes/count.rb +12 -0
- data/lib/arel/nodes/delete_statement.rb +45 -0
- data/lib/arel/nodes/descending.rb +23 -0
- data/lib/arel/nodes/equality.rb +15 -0
- data/lib/arel/nodes/extract.rb +24 -0
- data/lib/arel/nodes/false.rb +16 -0
- data/lib/arel/nodes/full_outer_join.rb +8 -0
- data/lib/arel/nodes/function.rb +44 -0
- data/lib/arel/nodes/grouping.rb +11 -0
- data/lib/arel/nodes/homogeneous_in.rb +76 -0
- data/lib/arel/nodes/in.rb +15 -0
- data/lib/arel/nodes/infix_operation.rb +92 -0
- data/lib/arel/nodes/inner_join.rb +8 -0
- data/lib/arel/nodes/insert_statement.rb +37 -0
- data/lib/arel/nodes/join_source.rb +20 -0
- data/lib/arel/nodes/matches.rb +18 -0
- data/lib/arel/nodes/named_function.rb +23 -0
- data/lib/arel/nodes/node.rb +51 -0
- data/lib/arel/nodes/node_expression.rb +13 -0
- data/lib/arel/nodes/ordering.rb +27 -0
- data/lib/arel/nodes/outer_join.rb +8 -0
- data/lib/arel/nodes/over.rb +15 -0
- data/lib/arel/nodes/regexp.rb +16 -0
- data/lib/arel/nodes/right_outer_join.rb +8 -0
- data/lib/arel/nodes/select_core.rb +67 -0
- data/lib/arel/nodes/select_statement.rb +41 -0
- data/lib/arel/nodes/sql_literal.rb +19 -0
- data/lib/arel/nodes/string_join.rb +11 -0
- data/lib/arel/nodes/table_alias.rb +31 -0
- data/lib/arel/nodes/terminal.rb +16 -0
- data/lib/arel/nodes/true.rb +16 -0
- data/lib/arel/nodes/unary.rb +44 -0
- data/lib/arel/nodes/unary_operation.rb +20 -0
- data/lib/arel/nodes/unqualified_column.rb +22 -0
- data/lib/arel/nodes/update_statement.rb +41 -0
- data/lib/arel/nodes/values_list.rb +9 -0
- data/lib/arel/nodes/window.rb +126 -0
- data/lib/arel/nodes/with.rb +11 -0
- data/lib/arel/nodes.rb +70 -0
- data/lib/arel/order_predications.rb +13 -0
- data/lib/arel/predications.rb +250 -0
- data/lib/arel/select_manager.rb +270 -0
- data/lib/arel/table.rb +118 -0
- data/lib/arel/tree_manager.rb +72 -0
- data/lib/arel/update_manager.rb +34 -0
- data/lib/arel/visitors/dot.rb +308 -0
- data/lib/arel/visitors/mysql.rb +93 -0
- data/lib/arel/visitors/postgresql.rb +120 -0
- data/lib/arel/visitors/sqlite.rb +38 -0
- data/lib/arel/visitors/to_sql.rb +899 -0
- data/lib/arel/visitors/visitor.rb +45 -0
- data/lib/arel/visitors.rb +13 -0
- data/lib/arel/window_predications.rb +9 -0
- data/lib/arel.rb +54 -0
- data/lib/rails/generators/active_record/application_record/application_record_generator.rb +26 -0
- data/lib/rails/generators/active_record/application_record/templates/application_record.rb.tt +5 -0
- data/lib/rails/generators/active_record/migration/migration_generator.rb +43 -37
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +26 -0
- data/lib/rails/generators/active_record/migration/templates/{migration.rb → migration.rb.tt} +13 -4
- data/lib/rails/generators/active_record/migration.rb +35 -1
- data/lib/rails/generators/active_record/model/model_generator.rb +55 -22
- data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +7 -0
- data/lib/rails/generators/active_record/model/templates/model.rb.tt +22 -0
- data/lib/rails/generators/active_record/model/templates/{module.rb → module.rb.tt} +0 -0
- data/lib/rails/generators/active_record.rb +7 -5
- metadata +172 -65
- data/lib/active_record/associations/preloader/belongs_to.rb +0 -17
- data/lib/active_record/associations/preloader/collection_association.rb +0 -24
- data/lib/active_record/associations/preloader/has_many.rb +0 -17
- data/lib/active_record/associations/preloader/has_many_through.rb +0 -19
- data/lib/active_record/associations/preloader/has_one.rb +0 -23
- data/lib/active_record/associations/preloader/has_one_through.rb +0 -9
- data/lib/active_record/associations/preloader/singular_association.rb +0 -21
- data/lib/active_record/attribute.rb +0 -163
- data/lib/active_record/attribute_decorators.rb +0 -66
- data/lib/active_record/attribute_set/builder.rb +0 -106
- data/lib/active_record/attribute_set.rb +0 -81
- data/lib/active_record/connection_adapters/connection_specification.rb +0 -275
- data/lib/active_record/connection_adapters/mysql_adapter.rb +0 -491
- data/lib/active_record/connection_adapters/postgresql/array_parser.rb +0 -93
- data/lib/active_record/connection_adapters/postgresql/oid/float.rb +0 -21
- data/lib/active_record/connection_adapters/postgresql/oid/integer.rb +0 -11
- data/lib/active_record/connection_adapters/postgresql/oid/json.rb +0 -35
- data/lib/active_record/connection_adapters/postgresql/oid/time.rb +0 -11
- data/lib/active_record/railties/jdbcmysql_error.rb +0 -16
- data/lib/active_record/serializers/xml_serializer.rb +0 -193
- data/lib/active_record/type/big_integer.rb +0 -13
- data/lib/active_record/type/binary.rb +0 -50
- data/lib/active_record/type/boolean.rb +0 -31
- data/lib/active_record/type/decimal.rb +0 -64
- data/lib/active_record/type/decorator.rb +0 -14
- data/lib/active_record/type/float.rb +0 -19
- data/lib/active_record/type/integer.rb +0 -59
- data/lib/active_record/type/mutable.rb +0 -16
- data/lib/active_record/type/numeric.rb +0 -36
- data/lib/active_record/type/string.rb +0 -40
- data/lib/active_record/type/time_value.rb +0 -38
- data/lib/active_record/type/value.rb +0 -110
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb +0 -19
- data/lib/rails/generators/active_record/model/templates/model.rb +0 -10
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module ActiveRecord
|
2
4
|
# = Active Record Query Cache
|
3
5
|
class QueryCache
|
@@ -5,7 +7,7 @@ module ActiveRecord
|
|
5
7
|
# Enable the query cache within the block if Active Record is configured.
|
6
8
|
# If it's not, it will execute the given block.
|
7
9
|
def cache(&block)
|
8
|
-
if
|
10
|
+
if connected? || !configurations.empty?
|
9
11
|
connection.cache(&block)
|
10
12
|
else
|
11
13
|
yield
|
@@ -15,7 +17,7 @@ module ActiveRecord
|
|
15
17
|
# Disable the query cache within the block if Active Record is configured.
|
16
18
|
# If it's not, it will execute the given block.
|
17
19
|
def uncached(&block)
|
18
|
-
if
|
20
|
+
if connected? || !configurations.empty?
|
19
21
|
connection.uncached(&block)
|
20
22
|
else
|
21
23
|
yield
|
@@ -23,34 +25,38 @@ module ActiveRecord
|
|
23
25
|
end
|
24
26
|
end
|
25
27
|
|
26
|
-
def
|
27
|
-
|
28
|
-
end
|
29
|
-
|
30
|
-
def call(env)
|
31
|
-
connection = ActiveRecord::Base.connection
|
32
|
-
enabled = connection.query_cache_enabled
|
33
|
-
connection_id = ActiveRecord::Base.connection_id
|
34
|
-
connection.enable_query_cache!
|
28
|
+
def self.run
|
29
|
+
pools = []
|
35
30
|
|
36
|
-
|
37
|
-
|
38
|
-
|
31
|
+
if ActiveRecord::Base.legacy_connection_handling
|
32
|
+
ActiveRecord::Base.connection_handlers.each do |key, handler|
|
33
|
+
pools.concat(handler.connection_pool_list.reject { |p| p.query_cache_enabled }.each { |p| p.enable_query_cache! })
|
34
|
+
end
|
35
|
+
else
|
36
|
+
pools.concat(ActiveRecord::Base.connection_handler.all_connection_pools.reject { |p| p.query_cache_enabled }.each { |p| p.enable_query_cache! })
|
39
37
|
end
|
40
38
|
|
41
|
-
|
42
|
-
rescue Exception => e
|
43
|
-
restore_query_cache_settings(connection_id, enabled)
|
44
|
-
raise e
|
39
|
+
pools
|
45
40
|
end
|
46
41
|
|
47
|
-
|
42
|
+
def self.complete(pools)
|
43
|
+
pools.each { |pool| pool.disable_query_cache! }
|
48
44
|
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
45
|
+
if ActiveRecord::Base.legacy_connection_handling
|
46
|
+
ActiveRecord::Base.connection_handlers.each do |_, handler|
|
47
|
+
handler.connection_pool_list.each do |pool|
|
48
|
+
pool.release_connection if pool.active_connection? && !pool.connection.transaction_open?
|
49
|
+
end
|
50
|
+
end
|
51
|
+
else
|
52
|
+
ActiveRecord::Base.connection_handler.all_connection_pools.each do |pool|
|
53
|
+
pool.release_connection if pool.active_connection? && !pool.connection.transaction_open?
|
54
|
+
end
|
55
|
+
end
|
53
56
|
end
|
54
57
|
|
58
|
+
def self.install_executor_hooks(executor = ActiveSupport::Executor)
|
59
|
+
executor.register_hook(self)
|
60
|
+
end
|
55
61
|
end
|
56
62
|
end
|
@@ -1,44 +1,56 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module ActiveRecord
|
2
4
|
module Querying
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
5
|
+
QUERYING_METHODS = [
|
6
|
+
:find, :find_by, :find_by!, :take, :take!, :first, :first!, :last, :last!,
|
7
|
+
:second, :second!, :third, :third!, :fourth, :fourth!, :fifth, :fifth!,
|
8
|
+
:forty_two, :forty_two!, :third_to_last, :third_to_last!, :second_to_last, :second_to_last!,
|
9
|
+
:exists?, :any?, :many?, :none?, :one?,
|
10
|
+
:first_or_create, :first_or_create!, :first_or_initialize,
|
11
|
+
:find_or_create_by, :find_or_create_by!, :find_or_initialize_by,
|
12
|
+
:create_or_find_by, :create_or_find_by!,
|
13
|
+
:destroy_all, :delete_all, :update_all, :touch_all, :destroy_by, :delete_by,
|
14
|
+
:find_each, :find_in_batches, :in_batches,
|
15
|
+
:select, :reselect, :order, :reorder, :group, :limit, :offset, :joins, :left_joins, :left_outer_joins,
|
16
|
+
:where, :rewhere, :preload, :extract_associated, :eager_load, :includes, :from, :lock, :readonly,
|
17
|
+
:and, :or, :annotate, :optimizer_hints, :extending,
|
18
|
+
:having, :create_with, :distinct, :references, :none, :unscope, :merge, :except, :only,
|
19
|
+
:count, :average, :minimum, :maximum, :sum, :calculate,
|
20
|
+
:pluck, :pick, :ids, :strict_loading
|
21
|
+
].freeze # :nodoc:
|
22
|
+
delegate(*QUERYING_METHODS, to: :all)
|
15
23
|
|
16
24
|
# Executes a custom SQL query against your database and returns all the results. The results will
|
17
|
-
# be returned as an array with
|
18
|
-
# this method from.
|
25
|
+
# be returned as an array, with the requested columns encapsulated as attributes of the model you call
|
26
|
+
# this method from. For example, if you call <tt>Product.find_by_sql</tt>, then the results will be returned in
|
19
27
|
# a +Product+ object with the attributes you specified in the SQL query.
|
20
28
|
#
|
21
|
-
# If you call a complicated SQL query which spans multiple tables the columns specified by the
|
29
|
+
# If you call a complicated SQL query which spans multiple tables, the columns specified by the
|
22
30
|
# SELECT will be attributes of the model, whether or not they are columns of the corresponding
|
23
31
|
# table.
|
24
32
|
#
|
25
|
-
# The +sql+ parameter is a full SQL query as a string. It will be called as is
|
26
|
-
# no database agnostic conversions performed. This should be a last resort because using
|
27
|
-
#
|
33
|
+
# The +sql+ parameter is a full SQL query as a string. It will be called as is; there will be
|
34
|
+
# no database agnostic conversions performed. This should be a last resort because using
|
35
|
+
# database-specific terms will lock you into using that particular database engine, or require you to
|
28
36
|
# change your call if you switch engines.
|
29
37
|
#
|
30
38
|
# # A simple SQL query spanning multiple tables
|
31
39
|
# Post.find_by_sql "SELECT p.title, c.author FROM posts p, comments c WHERE p.id = c.post_id"
|
32
|
-
# # => [#<Post:0x36bff9c @attributes={"title"=>"Ruby Meetup", "
|
40
|
+
# # => [#<Post:0x36bff9c @attributes={"title"=>"Ruby Meetup", "author"=>"Quentin"}>, ...]
|
33
41
|
#
|
34
42
|
# You can use the same string replacement techniques as you can with <tt>ActiveRecord::QueryMethods#where</tt>:
|
35
43
|
#
|
36
44
|
# Post.find_by_sql ["SELECT title FROM posts WHERE author = ? AND created > ?", author_id, start_date]
|
37
45
|
# Post.find_by_sql ["SELECT body FROM comments WHERE author = :user_id OR approved_by = :user_id", { :user_id => user_id }]
|
38
|
-
def find_by_sql(sql, binds = [])
|
39
|
-
result_set = connection.select_all(sanitize_sql(sql), "#{name} Load", binds)
|
40
|
-
column_types = result_set.column_types
|
41
|
-
|
46
|
+
def find_by_sql(sql, binds = [], preparable: nil, &block)
|
47
|
+
result_set = connection.select_all(sanitize_sql(sql), "#{name} Load", binds, preparable: preparable)
|
48
|
+
column_types = result_set.column_types
|
49
|
+
|
50
|
+
unless column_types.empty?
|
51
|
+
column_types = column_types.reject { |k, _| attribute_types.key?(k) }
|
52
|
+
end
|
53
|
+
|
42
54
|
message_bus = ActiveSupport::Notifications.instrumenter
|
43
55
|
|
44
56
|
payload = {
|
@@ -46,23 +58,30 @@ module ActiveRecord
|
|
46
58
|
class_name: name
|
47
59
|
}
|
48
60
|
|
49
|
-
message_bus.instrument(
|
50
|
-
result_set.
|
61
|
+
message_bus.instrument("instantiation.active_record", payload) do
|
62
|
+
if result_set.includes_column?(inheritance_column)
|
63
|
+
result_set.map { |record| instantiate(record, column_types, &block) }
|
64
|
+
else
|
65
|
+
# Instantiate a homogeneous set
|
66
|
+
result_set.map { |record| instantiate_instance_of(self, record, column_types, &block) }
|
67
|
+
end
|
51
68
|
end
|
52
69
|
end
|
53
70
|
|
54
71
|
# Returns the result of an SQL statement that should only include a COUNT(*) in the SELECT part.
|
55
72
|
# The use of this method should be restricted to complicated SQL queries that can't be executed
|
56
|
-
# using the ActiveRecord::Calculations class methods. Look into those before using this
|
73
|
+
# using the ActiveRecord::Calculations class methods. Look into those before using this method,
|
74
|
+
# as it could lock you into a specific database engine or require a code change to switch
|
75
|
+
# database engines.
|
57
76
|
#
|
58
|
-
#
|
77
|
+
# Product.count_by_sql "SELECT COUNT(*) FROM sales s, customers c WHERE s.customer_id = c.id"
|
78
|
+
# # => 12
|
59
79
|
#
|
60
|
-
#
|
80
|
+
# ==== Parameters
|
61
81
|
#
|
62
|
-
#
|
82
|
+
# * +sql+ - An SQL statement which should return a count query from the database, see the example above.
|
63
83
|
def count_by_sql(sql)
|
64
|
-
sql
|
65
|
-
connection.select_value(sql, "#{name} Count").to_i
|
84
|
+
connection.select_value(sanitize_sql(sql), "#{name} Count").to_i
|
66
85
|
end
|
67
86
|
end
|
68
87
|
end
|
@@ -1,9 +1,12 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "active_record"
|
2
4
|
require "rails"
|
5
|
+
require "active_support/core_ext/object/try"
|
3
6
|
require "active_model/railtie"
|
4
7
|
|
5
8
|
# For now, action_controller must always be present with
|
6
|
-
#
|
9
|
+
# Rails, so let's make sure that it gets required before
|
7
10
|
# here. This is needed for correctly setting up the middleware.
|
8
11
|
# In the future, this might become an optional require.
|
9
12
|
require "action_controller/railtie"
|
@@ -13,36 +16,31 @@ module ActiveRecord
|
|
13
16
|
class Railtie < Rails::Railtie # :nodoc:
|
14
17
|
config.active_record = ActiveSupport::OrderedOptions.new
|
15
18
|
|
16
|
-
config.app_generators.orm :active_record, :
|
17
|
-
:
|
18
|
-
|
19
|
-
config.app_middleware.insert_after "::ActionDispatch::Callbacks",
|
20
|
-
"ActiveRecord::QueryCache"
|
21
|
-
|
22
|
-
config.app_middleware.insert_after "::ActionDispatch::Callbacks",
|
23
|
-
"ActiveRecord::ConnectionAdapters::ConnectionManagement"
|
19
|
+
config.app_generators.orm :active_record, migration: true,
|
20
|
+
timestamps: true
|
24
21
|
|
25
22
|
config.action_dispatch.rescue_responses.merge!(
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
23
|
+
"ActiveRecord::RecordNotFound" => :not_found,
|
24
|
+
"ActiveRecord::StaleObjectError" => :conflict,
|
25
|
+
"ActiveRecord::RecordInvalid" => :unprocessable_entity,
|
26
|
+
"ActiveRecord::RecordNotSaved" => :unprocessable_entity
|
30
27
|
)
|
31
28
|
|
32
|
-
|
33
29
|
config.active_record.use_schema_cache_dump = true
|
30
|
+
config.active_record.check_schema_cache_dump_version = true
|
34
31
|
config.active_record.maintain_test_schema = true
|
32
|
+
config.active_record.has_many_inversing = false
|
33
|
+
|
34
|
+
config.active_record.queues = ActiveSupport::InheritableOptions.new
|
35
35
|
|
36
36
|
config.eager_load_namespaces << ActiveRecord
|
37
37
|
|
38
38
|
rake_tasks do
|
39
39
|
namespace :db do
|
40
40
|
task :load_config do
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
if engine.paths['db/migrate'].existent
|
45
|
-
ActiveRecord::Tasks::DatabaseTasks.migrations_paths += engine.paths['db/migrate'].to_a
|
41
|
+
if defined?(ENGINE_ROOT) && engine = Rails::Engine.find(ENGINE_ROOT)
|
42
|
+
if engine.paths["db/migrate"].existent
|
43
|
+
ActiveRecord::Tasks::DatabaseTasks.migrations_paths += engine.paths["db/migrate"].to_a
|
46
44
|
end
|
47
45
|
end
|
48
46
|
end
|
@@ -59,8 +57,10 @@ module ActiveRecord
|
|
59
57
|
require "active_record/base"
|
60
58
|
unless ActiveSupport::Logger.logger_outputs_to?(Rails.logger, STDERR, STDOUT)
|
61
59
|
console = ActiveSupport::Logger.new(STDERR)
|
60
|
+
console.level = Rails.logger.level
|
62
61
|
Rails.logger.extend ActiveSupport::Logger.broadcast console
|
63
62
|
end
|
63
|
+
ActiveRecord::Base.verbose_query_logs = false
|
64
64
|
end
|
65
65
|
|
66
66
|
runner do
|
@@ -78,35 +78,134 @@ module ActiveRecord
|
|
78
78
|
ActiveSupport.on_load(:active_record) { self.logger ||= ::Rails.logger }
|
79
79
|
end
|
80
80
|
|
81
|
-
initializer "active_record.
|
81
|
+
initializer "active_record.backtrace_cleaner" do
|
82
|
+
ActiveSupport.on_load(:active_record) { LogSubscriber.backtrace_cleaner = ::Rails.backtrace_cleaner }
|
83
|
+
end
|
84
|
+
|
85
|
+
initializer "active_record.migration_error" do |app|
|
82
86
|
if config.active_record.delete(:migration_error) == :page_load
|
83
|
-
config.app_middleware.insert_after
|
84
|
-
|
87
|
+
config.app_middleware.insert_after ::ActionDispatch::Callbacks,
|
88
|
+
ActiveRecord::Migration::CheckPending,
|
89
|
+
file_watcher: app.config.file_watcher
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
initializer "active_record.database_selector" do
|
94
|
+
if options = config.active_record.delete(:database_selector)
|
95
|
+
resolver = config.active_record.delete(:database_resolver)
|
96
|
+
operations = config.active_record.delete(:database_resolver_context)
|
97
|
+
config.app_middleware.use ActiveRecord::Middleware::DatabaseSelector, resolver, operations, options
|
98
|
+
end
|
99
|
+
end
|
100
|
+
|
101
|
+
initializer "Check for cache versioning support" do
|
102
|
+
config.after_initialize do |app|
|
103
|
+
ActiveSupport.on_load(:active_record) do
|
104
|
+
if app.config.active_record.cache_versioning && Rails.cache
|
105
|
+
unless Rails.cache.class.try(:supports_cache_versioning?)
|
106
|
+
raise <<-end_error
|
107
|
+
|
108
|
+
You're using a cache store that doesn't support native cache versioning.
|
109
|
+
Your best option is to upgrade to a newer version of #{Rails.cache.class}
|
110
|
+
that supports cache versioning (#{Rails.cache.class}.supports_cache_versioning? #=> true).
|
111
|
+
|
112
|
+
Next best, switch to a different cache store that does support cache versioning:
|
113
|
+
https://guides.rubyonrails.org/caching_with_rails.html#cache-stores.
|
114
|
+
|
115
|
+
To keep using the current cache store, you can turn off cache versioning entirely:
|
116
|
+
|
117
|
+
config.active_record.cache_versioning = false
|
118
|
+
|
119
|
+
end_error
|
120
|
+
end
|
121
|
+
end
|
122
|
+
end
|
85
123
|
end
|
86
124
|
end
|
87
125
|
|
88
126
|
initializer "active_record.check_schema_cache_dump" do
|
127
|
+
check_schema_cache_dump_version = config.active_record.delete(:check_schema_cache_dump_version)
|
128
|
+
|
89
129
|
if config.active_record.delete(:use_schema_cache_dump)
|
90
130
|
config.after_initialize do |app|
|
91
131
|
ActiveSupport.on_load(:active_record) do
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
132
|
+
db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).first
|
133
|
+
|
134
|
+
filename = ActiveRecord::Tasks::DatabaseTasks.cache_dump_filename(
|
135
|
+
db_config.name,
|
136
|
+
schema_cache_path: db_config&.schema_cache_path
|
137
|
+
)
|
138
|
+
|
139
|
+
cache = ActiveRecord::ConnectionAdapters::SchemaCache.load_from(filename)
|
140
|
+
next if cache.nil?
|
141
|
+
|
142
|
+
if check_schema_cache_dump_version
|
143
|
+
current_version = begin
|
144
|
+
ActiveRecord::Migrator.current_version
|
145
|
+
rescue ActiveRecordError => error
|
146
|
+
warn "Failed to validate the schema cache because of #{error.class}: #{error.message}"
|
147
|
+
nil
|
148
|
+
end
|
149
|
+
next if current_version.nil?
|
150
|
+
|
151
|
+
if cache.version != current_version
|
152
|
+
warn "Ignoring #{filename} because it has expired. The current schema version is #{current_version}, but the one in the cache is #{cache.version}."
|
153
|
+
next
|
100
154
|
end
|
101
155
|
end
|
156
|
+
|
157
|
+
connection_pool.set_schema_cache(cache)
|
102
158
|
end
|
103
159
|
end
|
104
160
|
end
|
105
161
|
end
|
106
162
|
|
163
|
+
initializer "active_record.define_attribute_methods" do |app|
|
164
|
+
config.after_initialize do
|
165
|
+
ActiveSupport.on_load(:active_record) do
|
166
|
+
if app.config.eager_load
|
167
|
+
begin
|
168
|
+
descendants.each do |model|
|
169
|
+
# SchemaMigration and InternalMetadata both override `table_exists?`
|
170
|
+
# to bypass the schema cache, so skip them to avoid the extra queries.
|
171
|
+
next if model._internal?
|
172
|
+
|
173
|
+
# If the schema cache was loaded from a dump, we can use it without connecting
|
174
|
+
schema_cache = model.connection_pool.schema_cache
|
175
|
+
|
176
|
+
# If there's no connection yet, we avoid connecting.
|
177
|
+
schema_cache ||= model.connected? && model.connection.schema_cache
|
178
|
+
|
179
|
+
# If the schema cache doesn't have the columns
|
180
|
+
# hash for the model cached, `define_attribute_methods` would trigger a query.
|
181
|
+
if schema_cache && schema_cache.columns_hash?(model.table_name)
|
182
|
+
model.define_attribute_methods
|
183
|
+
end
|
184
|
+
end
|
185
|
+
rescue ActiveRecordError => error
|
186
|
+
# Regardless of whether there was already a connection or not, we rescue any database
|
187
|
+
# error because it is critical that the application can boot even if the database
|
188
|
+
# is unhealthy.
|
189
|
+
warn "Failed to define attribute methods because of #{error.class}: #{error.message}"
|
190
|
+
end
|
191
|
+
end
|
192
|
+
end
|
193
|
+
end
|
194
|
+
end
|
195
|
+
|
196
|
+
initializer "active_record.warn_on_records_fetched_greater_than" do
|
197
|
+
if config.active_record.warn_on_records_fetched_greater_than
|
198
|
+
ActiveSupport.on_load(:active_record) do
|
199
|
+
require "active_record/relation/record_fetch_warning"
|
200
|
+
end
|
201
|
+
end
|
202
|
+
end
|
203
|
+
|
107
204
|
initializer "active_record.set_configs" do |app|
|
108
205
|
ActiveSupport.on_load(:active_record) do
|
109
|
-
app.config.active_record
|
206
|
+
configs = app.config.active_record
|
207
|
+
|
208
|
+
configs.each do |k, v|
|
110
209
|
send "#{k}=", v
|
111
210
|
end
|
112
211
|
end
|
@@ -114,24 +213,13 @@ module ActiveRecord
|
|
114
213
|
|
115
214
|
# This sets the database configuration from Configuration#database_configuration
|
116
215
|
# and then establishes the connection.
|
117
|
-
initializer "active_record.initialize_database" do
|
216
|
+
initializer "active_record.initialize_database" do
|
118
217
|
ActiveSupport.on_load(:active_record) do
|
119
|
-
|
120
|
-
|
121
|
-
begin
|
122
|
-
establish_connection
|
123
|
-
rescue ActiveRecord::NoDatabaseError
|
124
|
-
warn <<-end_warning
|
125
|
-
Oops - You have a database configured, but it doesn't exist yet!
|
126
|
-
|
127
|
-
Here's how to get started:
|
128
|
-
|
129
|
-
1. Configure your database in config/database.yml.
|
130
|
-
2. Run `bin/rake db:create` to create the database.
|
131
|
-
3. Run `bin/rake db:setup` to load your database schema.
|
132
|
-
end_warning
|
133
|
-
raise
|
218
|
+
if ActiveRecord::Base.legacy_connection_handling
|
219
|
+
self.connection_handlers = { writing_role => ActiveRecord::Base.default_connection_handler }
|
134
220
|
end
|
221
|
+
self.configurations = Rails.application.config.database_configuration
|
222
|
+
establish_connection
|
135
223
|
end
|
136
224
|
end
|
137
225
|
|
@@ -143,11 +231,9 @@ end_warning
|
|
143
231
|
end
|
144
232
|
end
|
145
233
|
|
146
|
-
initializer "active_record.set_reloader_hooks" do
|
147
|
-
hook = app.config.reload_classes_only_on_change ? :to_prepare : :to_cleanup
|
148
|
-
|
234
|
+
initializer "active_record.set_reloader_hooks" do
|
149
235
|
ActiveSupport.on_load(:active_record) do
|
150
|
-
|
236
|
+
ActiveSupport::Reloader.before_class_unload do
|
151
237
|
if ActiveRecord::Base.connected?
|
152
238
|
ActiveRecord::Base.clear_cache!
|
153
239
|
ActiveRecord::Base.clear_reloadable_connections!
|
@@ -156,9 +242,42 @@ end_warning
|
|
156
242
|
end
|
157
243
|
end
|
158
244
|
|
245
|
+
initializer "active_record.set_executor_hooks" do
|
246
|
+
ActiveRecord::QueryCache.install_executor_hooks
|
247
|
+
end
|
248
|
+
|
159
249
|
initializer "active_record.add_watchable_files" do |app|
|
160
250
|
path = app.paths["db"].first
|
161
251
|
config.watchable_files.concat ["#{path}/schema.rb", "#{path}/structure.sql"]
|
162
252
|
end
|
253
|
+
|
254
|
+
initializer "active_record.clear_active_connections" do
|
255
|
+
config.after_initialize do
|
256
|
+
ActiveSupport.on_load(:active_record) do
|
257
|
+
# Ideally the application doesn't connect to the database during boot,
|
258
|
+
# but sometimes it does. In case it did, we want to empty out the
|
259
|
+
# connection pools so that a non-database-using process (e.g. a master
|
260
|
+
# process in a forking server model) doesn't retain a needless
|
261
|
+
# connection. If it was needed, the incremental cost of reestablishing
|
262
|
+
# this connection is trivial: the rest of the pool would need to be
|
263
|
+
# populated anyway.
|
264
|
+
|
265
|
+
clear_active_connections!
|
266
|
+
flush_idle_connections!
|
267
|
+
end
|
268
|
+
end
|
269
|
+
end
|
270
|
+
|
271
|
+
initializer "active_record.set_filter_attributes" do
|
272
|
+
ActiveSupport.on_load(:active_record) do
|
273
|
+
self.filter_attributes += Rails.application.config.filter_parameters
|
274
|
+
end
|
275
|
+
end
|
276
|
+
|
277
|
+
initializer "active_record.set_signed_id_verifier_secret" do
|
278
|
+
ActiveSupport.on_load(:active_record) do
|
279
|
+
self.signed_id_verifier_secret ||= -> { Rails.application.key_generator.generate_key("active_record/signed_id") }
|
280
|
+
end
|
281
|
+
end
|
163
282
|
end
|
164
283
|
end
|
@@ -1,5 +1,5 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
|
3
|
+
ActiveRecord::ConnectionAdapters::AbstractAdapter.set_callback(:checkout, :after) do
|
4
|
+
begin_transaction(joinable: false)
|
5
5
|
end
|
@@ -1,50 +1,51 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "active_support/core_ext/module/attr_internal"
|
4
|
+
require "active_record/log_subscriber"
|
3
5
|
|
4
6
|
module ActiveRecord
|
5
7
|
module Railties # :nodoc:
|
6
8
|
module ControllerRuntime #:nodoc:
|
7
9
|
extend ActiveSupport::Concern
|
8
10
|
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
# because of queries in middleware or in cases we are streaming
|
16
|
-
# and it won't be cleaned up by the method below.
|
17
|
-
ActiveRecord::LogSubscriber.reset_runtime
|
18
|
-
super
|
11
|
+
module ClassMethods # :nodoc:
|
12
|
+
def log_process_action(payload)
|
13
|
+
messages, db_runtime = super, payload[:db_runtime]
|
14
|
+
messages << ("ActiveRecord: %.1fms" % db_runtime.to_f) if db_runtime
|
15
|
+
messages
|
16
|
+
end
|
19
17
|
end
|
20
18
|
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
runtime
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
else
|
19
|
+
private
|
20
|
+
attr_internal :db_runtime
|
21
|
+
|
22
|
+
def process_action(action, *args)
|
23
|
+
# We also need to reset the runtime before each action
|
24
|
+
# because of queries in middleware or in cases we are streaming
|
25
|
+
# and it won't be cleaned up by the method below.
|
26
|
+
ActiveRecord::LogSubscriber.reset_runtime
|
30
27
|
super
|
31
28
|
end
|
32
|
-
end
|
33
29
|
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
30
|
+
def cleanup_view_runtime
|
31
|
+
if logger && logger.info? && ActiveRecord::Base.connected?
|
32
|
+
db_rt_before_render = ActiveRecord::LogSubscriber.reset_runtime
|
33
|
+
self.db_runtime = (db_runtime || 0) + db_rt_before_render
|
34
|
+
runtime = super
|
35
|
+
db_rt_after_render = ActiveRecord::LogSubscriber.reset_runtime
|
36
|
+
self.db_runtime += db_rt_after_render
|
37
|
+
runtime - db_rt_after_render
|
38
|
+
else
|
39
|
+
super
|
40
|
+
end
|
38
41
|
end
|
39
|
-
end
|
40
42
|
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
43
|
+
def append_info_to_payload(payload)
|
44
|
+
super
|
45
|
+
if ActiveRecord::Base.connected?
|
46
|
+
payload[:db_runtime] = (db_runtime || 0) + ActiveRecord::LogSubscriber.reset_runtime
|
47
|
+
end
|
46
48
|
end
|
47
|
-
end
|
48
49
|
end
|
49
50
|
end
|
50
51
|
end
|