activerecord 4.2.11.1 → 5.2.4.5
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 +594 -1620
- data/MIT-LICENSE +2 -2
- data/README.rdoc +10 -11
- data/examples/performance.rb +32 -31
- data/examples/simple.rb +5 -4
- data/lib/active_record/aggregations.rb +263 -249
- data/lib/active_record/association_relation.rb +11 -6
- data/lib/active_record/associations/alias_tracker.rb +29 -35
- data/lib/active_record/associations/association.rb +77 -43
- data/lib/active_record/associations/association_scope.rb +106 -133
- data/lib/active_record/associations/belongs_to_association.rb +52 -41
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +8 -8
- data/lib/active_record/associations/builder/association.rb +29 -38
- data/lib/active_record/associations/builder/belongs_to.rb +77 -30
- data/lib/active_record/associations/builder/collection_association.rb +9 -22
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +42 -35
- data/lib/active_record/associations/builder/has_many.rb +6 -4
- data/lib/active_record/associations/builder/has_one.rb +13 -6
- data/lib/active_record/associations/builder/singular_association.rb +15 -11
- data/lib/active_record/associations/collection_association.rb +139 -280
- data/lib/active_record/associations/collection_proxy.rb +231 -133
- data/lib/active_record/associations/foreign_association.rb +3 -1
- data/lib/active_record/associations/has_many_association.rb +34 -89
- data/lib/active_record/associations/has_many_through_association.rb +49 -76
- data/lib/active_record/associations/has_one_association.rb +38 -24
- data/lib/active_record/associations/has_one_through_association.rb +18 -9
- data/lib/active_record/associations/join_dependency/join_association.rb +40 -87
- data/lib/active_record/associations/join_dependency/join_base.rb +10 -9
- data/lib/active_record/associations/join_dependency/join_part.rb +12 -12
- data/lib/active_record/associations/join_dependency.rb +133 -159
- data/lib/active_record/associations/preloader/association.rb +85 -120
- data/lib/active_record/associations/preloader/through_association.rb +85 -74
- data/lib/active_record/associations/preloader.rb +81 -91
- data/lib/active_record/associations/singular_association.rb +27 -34
- data/lib/active_record/associations/through_association.rb +38 -18
- data/lib/active_record/associations.rb +1732 -1597
- data/lib/active_record/attribute_assignment.rb +58 -182
- data/lib/active_record/attribute_decorators.rb +39 -15
- data/lib/active_record/attribute_methods/before_type_cast.rb +10 -8
- data/lib/active_record/attribute_methods/dirty.rb +94 -135
- data/lib/active_record/attribute_methods/primary_key.rb +86 -71
- data/lib/active_record/attribute_methods/query.rb +4 -2
- data/lib/active_record/attribute_methods/read.rb +45 -63
- data/lib/active_record/attribute_methods/serialization.rb +40 -20
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +58 -36
- data/lib/active_record/attribute_methods/write.rb +30 -45
- data/lib/active_record/attribute_methods.rb +166 -109
- data/lib/active_record/attributes.rb +201 -82
- data/lib/active_record/autosave_association.rb +94 -36
- data/lib/active_record/base.rb +57 -44
- data/lib/active_record/callbacks.rb +97 -57
- data/lib/active_record/coders/json.rb +3 -1
- data/lib/active_record/coders/yaml_column.rb +24 -12
- data/lib/active_record/collection_cache_key.rb +53 -0
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +712 -290
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +10 -5
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +237 -90
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +71 -21
- data/lib/active_record/connection_adapters/abstract/quoting.rb +118 -52
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +5 -3
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +67 -46
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +318 -217
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +81 -36
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +570 -228
- data/lib/active_record/connection_adapters/abstract/transaction.rb +138 -70
- data/lib/active_record/connection_adapters/abstract_adapter.rb +325 -202
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +542 -601
- data/lib/active_record/connection_adapters/column.rb +50 -41
- data/lib/active_record/connection_adapters/connection_specification.rb +147 -135
- data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +33 -0
- data/lib/active_record/connection_adapters/mysql/column.rb +27 -0
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +140 -0
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +72 -0
- data/lib/active_record/connection_adapters/mysql/quoting.rb +44 -0
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +73 -0
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +87 -0
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +80 -0
- data/lib/active_record/connection_adapters/mysql/schema_statements.rb +148 -0
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +35 -0
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +41 -180
- data/lib/active_record/connection_adapters/postgresql/column.rb +35 -11
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +45 -114
- data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb +44 -0
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +50 -58
- data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +10 -6
- 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 +5 -1
- data/lib/active_record/connection_adapters/postgresql/oid/date.rb +13 -1
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +9 -22
- data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +3 -1
- data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +5 -3
- data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +31 -19
- data/lib/active_record/connection_adapters/postgresql/oid/inet.rb +2 -0
- data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +3 -11
- data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +45 -0
- data/lib/active_record/connection_adapters/postgresql/oid/money.rb +7 -9
- data/lib/active_record/connection_adapters/postgresql/oid/{integer.rb → oid.rb} +6 -2
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +33 -11
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +52 -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 +55 -53
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +5 -3
- 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 +23 -25
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +107 -47
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +27 -14
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +65 -0
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +144 -90
- data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +50 -0
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +462 -284
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +39 -0
- data/lib/active_record/connection_adapters/postgresql/utils.rb +12 -8
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +432 -323
- data/lib/active_record/connection_adapters/schema_cache.rb +48 -24
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +34 -0
- data/lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb +21 -0
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +67 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +17 -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 +106 -0
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +269 -308
- data/lib/active_record/connection_adapters/statement_pool.rb +34 -13
- data/lib/active_record/connection_handling.rb +40 -27
- data/lib/active_record/core.rb +178 -198
- data/lib/active_record/counter_cache.rb +79 -36
- data/lib/active_record/define_callbacks.rb +22 -0
- data/lib/active_record/dynamic_matchers.rb +87 -105
- data/lib/active_record/enum.rb +135 -88
- data/lib/active_record/errors.rb +179 -52
- data/lib/active_record/explain.rb +23 -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 +35 -9
- data/lib/active_record/fixtures.rb +188 -132
- data/lib/active_record/gem_version.rb +5 -3
- data/lib/active_record/inheritance.rb +148 -112
- data/lib/active_record/integration.rb +70 -28
- data/lib/active_record/internal_metadata.rb +45 -0
- data/lib/active_record/legacy_yaml_adapter.rb +21 -3
- data/lib/active_record/locale/en.yml +3 -2
- data/lib/active_record/locking/optimistic.rb +88 -96
- data/lib/active_record/locking/pessimistic.rb +15 -3
- data/lib/active_record/log_subscriber.rb +95 -33
- data/lib/active_record/migration/command_recorder.rb +133 -90
- data/lib/active_record/migration/compatibility.rb +217 -0
- data/lib/active_record/migration/join_table.rb +8 -6
- data/lib/active_record/migration.rb +581 -282
- data/lib/active_record/model_schema.rb +290 -111
- data/lib/active_record/nested_attributes.rb +264 -222
- data/lib/active_record/no_touching.rb +7 -1
- data/lib/active_record/null_relation.rb +24 -37
- data/lib/active_record/persistence.rb +347 -119
- data/lib/active_record/query_cache.rb +13 -24
- data/lib/active_record/querying.rb +19 -17
- data/lib/active_record/railtie.rb +94 -32
- data/lib/active_record/railties/console_sandbox.rb +2 -0
- data/lib/active_record/railties/controller_runtime.rb +9 -3
- data/lib/active_record/railties/databases.rake +149 -156
- data/lib/active_record/readonly_attributes.rb +5 -4
- data/lib/active_record/reflection.rb +414 -267
- data/lib/active_record/relation/batches/batch_enumerator.rb +69 -0
- data/lib/active_record/relation/batches.rb +204 -55
- data/lib/active_record/relation/calculations.rb +256 -248
- data/lib/active_record/relation/delegation.rb +67 -60
- data/lib/active_record/relation/finder_methods.rb +288 -239
- data/lib/active_record/relation/from_clause.rb +26 -0
- data/lib/active_record/relation/merger.rb +86 -86
- data/lib/active_record/relation/predicate_builder/array_handler.rb +24 -24
- data/lib/active_record/relation/predicate_builder/association_query_value.rb +46 -0
- data/lib/active_record/relation/predicate_builder/base_handler.rb +19 -0
- data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +20 -0
- data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +56 -0
- data/lib/active_record/relation/predicate_builder/range_handler.rb +42 -0
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +7 -1
- data/lib/active_record/relation/predicate_builder.rb +116 -119
- data/lib/active_record/relation/query_attribute.rb +45 -0
- data/lib/active_record/relation/query_methods.rb +448 -393
- data/lib/active_record/relation/record_fetch_warning.rb +51 -0
- data/lib/active_record/relation/spawn_methods.rb +11 -13
- data/lib/active_record/relation/where_clause.rb +186 -0
- data/lib/active_record/relation/where_clause_factory.rb +34 -0
- data/lib/active_record/relation.rb +287 -340
- data/lib/active_record/result.rb +54 -36
- data/lib/active_record/runtime_registry.rb +6 -4
- data/lib/active_record/sanitization.rb +155 -124
- data/lib/active_record/schema.rb +30 -24
- data/lib/active_record/schema_dumper.rb +91 -87
- data/lib/active_record/schema_migration.rb +19 -16
- data/lib/active_record/scoping/default.rb +102 -85
- data/lib/active_record/scoping/named.rb +81 -32
- data/lib/active_record/scoping.rb +45 -26
- data/lib/active_record/secure_token.rb +40 -0
- data/lib/active_record/serialization.rb +5 -5
- data/lib/active_record/statement_cache.rb +45 -35
- data/lib/active_record/store.rb +42 -36
- data/lib/active_record/suppressor.rb +61 -0
- data/lib/active_record/table_metadata.rb +82 -0
- data/lib/active_record/tasks/database_tasks.rb +134 -96
- data/lib/active_record/tasks/mysql_database_tasks.rb +56 -100
- data/lib/active_record/tasks/postgresql_database_tasks.rb +83 -41
- data/lib/active_record/tasks/sqlite_database_tasks.rb +44 -16
- data/lib/active_record/timestamp.rb +70 -38
- data/lib/active_record/touch_later.rb +64 -0
- data/lib/active_record/transactions.rb +199 -124
- data/lib/active_record/translation.rb +2 -0
- data/lib/active_record/type/adapter_specific_registry.rb +136 -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 -3
- 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 +24 -15
- data/lib/active_record/type/text.rb +2 -2
- data/lib/active_record/type/time.rb +11 -16
- data/lib/active_record/type/type_map.rb +15 -17
- data/lib/active_record/type/unsigned_integer.rb +9 -7
- data/lib/active_record/type.rb +79 -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 +13 -4
- data/lib/active_record/validations/length.rb +26 -0
- data/lib/active_record/validations/presence.rb +14 -13
- data/lib/active_record/validations/uniqueness.rb +40 -41
- data/lib/active_record/validations.rb +38 -35
- data/lib/active_record/version.rb +3 -1
- data/lib/active_record.rb +34 -22
- data/lib/rails/generators/active_record/application_record/application_record_generator.rb +27 -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 -35
- data/lib/rails/generators/active_record/migration/templates/{create_table_migration.rb → create_table_migration.rb.tt} +8 -3
- data/lib/rails/generators/active_record/migration/templates/{migration.rb → migration.rb.tt} +8 -1
- data/lib/rails/generators/active_record/migration.rb +18 -1
- data/lib/rails/generators/active_record/model/model_generator.rb +18 -22
- data/lib/rails/generators/active_record/model/templates/{model.rb → model.rb.tt} +3 -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 +72 -49
- 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_set/builder.rb +0 -106
- data/lib/active_record/attribute_set.rb +0 -81
- data/lib/active_record/connection_adapters/mysql_adapter.rb +0 -498
- 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/infinity.rb +0 -13
- 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
@@ -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,21 @@ module ActiveRecord
|
|
23
25
|
end
|
24
26
|
end
|
25
27
|
|
26
|
-
def
|
27
|
-
|
28
|
+
def self.run
|
29
|
+
ActiveRecord::Base.connection_handler.connection_pool_list.
|
30
|
+
reject { |p| p.query_cache_enabled }.each { |p| p.enable_query_cache! }
|
28
31
|
end
|
29
32
|
|
30
|
-
def
|
31
|
-
|
32
|
-
enabled = connection.query_cache_enabled
|
33
|
-
connection_id = ActiveRecord::Base.connection_id
|
34
|
-
connection.enable_query_cache!
|
33
|
+
def self.complete(pools)
|
34
|
+
pools.each { |pool| pool.disable_query_cache! }
|
35
35
|
|
36
|
-
|
37
|
-
|
38
|
-
restore_query_cache_settings(connection_id, enabled)
|
36
|
+
ActiveRecord::Base.connection_handler.connection_pool_list.each do |pool|
|
37
|
+
pool.release_connection if pool.active_connection? && !pool.connection.transaction_open?
|
39
38
|
end
|
40
|
-
|
41
|
-
response
|
42
|
-
rescue Exception => e
|
43
|
-
restore_query_cache_settings(connection_id, enabled)
|
44
|
-
raise e
|
45
39
|
end
|
46
40
|
|
47
|
-
|
48
|
-
|
49
|
-
def restore_query_cache_settings(connection_id, enabled)
|
50
|
-
ActiveRecord::Base.connection_id = connection_id
|
51
|
-
ActiveRecord::Base.connection.clear_query_cache
|
52
|
-
ActiveRecord::Base.connection.disable_query_cache! unless enabled
|
41
|
+
def self.install_executor_hooks(executor = ActiveSupport::Executor)
|
42
|
+
executor.register_hook(self)
|
53
43
|
end
|
54
|
-
|
55
44
|
end
|
56
45
|
end
|
@@ -1,15 +1,17 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module ActiveRecord
|
2
4
|
module Querying
|
3
|
-
delegate :find, :take, :take!, :first, :first!, :last, :last!, :exists?, :any?, :many?, to: :all
|
4
|
-
delegate :second, :second!, :third, :third!, :fourth, :fourth!, :fifth, :fifth!, :forty_two, :forty_two!, to: :all
|
5
|
+
delegate :find, :take, :take!, :first, :first!, :last, :last!, :exists?, :any?, :many?, :none?, :one?, to: :all
|
6
|
+
delegate :second, :second!, :third, :third!, :fourth, :fourth!, :fifth, :fifth!, :forty_two, :forty_two!, :third_to_last, :third_to_last!, :second_to_last, :second_to_last!, to: :all
|
5
7
|
delegate :first_or_create, :first_or_create!, :first_or_initialize, to: :all
|
6
8
|
delegate :find_or_create_by, :find_or_create_by!, :find_or_initialize_by, to: :all
|
7
9
|
delegate :find_by, :find_by!, to: :all
|
8
|
-
delegate :
|
9
|
-
delegate :find_each, :find_in_batches, to: :all
|
10
|
-
delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins,
|
11
|
-
:where, :rewhere, :preload, :eager_load, :includes, :from, :lock, :readonly,
|
12
|
-
:having, :create_with, :
|
10
|
+
delegate :destroy_all, :delete_all, :update_all, to: :all
|
11
|
+
delegate :find_each, :find_in_batches, :in_batches, to: :all
|
12
|
+
delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins, :left_joins, :left_outer_joins, :or,
|
13
|
+
:where, :rewhere, :preload, :eager_load, :includes, :from, :lock, :readonly, :extending,
|
14
|
+
:having, :create_with, :distinct, :references, :none, :unscope, :merge, to: :all
|
13
15
|
delegate :count, :average, :minimum, :maximum, :sum, :calculate, to: :all
|
14
16
|
delegate :pluck, :ids, to: :all
|
15
17
|
|
@@ -35,10 +37,10 @@ module ActiveRecord
|
|
35
37
|
#
|
36
38
|
# Post.find_by_sql ["SELECT title FROM posts WHERE author = ? AND created > ?", author_id, start_date]
|
37
39
|
# 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
|
+
def find_by_sql(sql, binds = [], preparable: nil, &block)
|
41
|
+
result_set = connection.select_all(sanitize_sql(sql), "#{name} Load", binds, preparable: preparable)
|
40
42
|
column_types = result_set.column_types.dup
|
41
|
-
|
43
|
+
attribute_types.each_key { |k| column_types.delete k }
|
42
44
|
message_bus = ActiveSupport::Notifications.instrumenter
|
43
45
|
|
44
46
|
payload = {
|
@@ -46,8 +48,8 @@ module ActiveRecord
|
|
46
48
|
class_name: name
|
47
49
|
}
|
48
50
|
|
49
|
-
message_bus.instrument(
|
50
|
-
result_set.map { |record| instantiate(record, column_types) }
|
51
|
+
message_bus.instrument("instantiation.active_record", payload) do
|
52
|
+
result_set.map { |record| instantiate(record, column_types, &block) }
|
51
53
|
end
|
52
54
|
end
|
53
55
|
|
@@ -55,14 +57,14 @@ module ActiveRecord
|
|
55
57
|
# The use of this method should be restricted to complicated SQL queries that can't be executed
|
56
58
|
# using the ActiveRecord::Calculations class methods. Look into those before using this.
|
57
59
|
#
|
58
|
-
#
|
60
|
+
# Product.count_by_sql "SELECT COUNT(*) FROM sales s, customers c WHERE s.customer_id = c.id"
|
61
|
+
# # => 12
|
59
62
|
#
|
60
|
-
#
|
63
|
+
# ==== Parameters
|
61
64
|
#
|
62
|
-
#
|
65
|
+
# * +sql+ - An SQL statement which should return a count query from the database, see the example above.
|
63
66
|
def count_by_sql(sql)
|
64
|
-
sql
|
65
|
-
connection.select_value(sql, "#{name} Count").to_i
|
67
|
+
connection.select_value(sanitize_sql(sql), "#{name} Count").to_i
|
66
68
|
end
|
67
69
|
end
|
68
70
|
end
|
@@ -1,9 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "active_record"
|
2
4
|
require "rails"
|
3
5
|
require "active_model/railtie"
|
4
6
|
|
5
7
|
# For now, action_controller must always be present with
|
6
|
-
#
|
8
|
+
# Rails, so let's make sure that it gets required before
|
7
9
|
# here. This is needed for correctly setting up the middleware.
|
8
10
|
# In the future, this might become an optional require.
|
9
11
|
require "action_controller/railtie"
|
@@ -13,26 +15,22 @@ module ActiveRecord
|
|
13
15
|
class Railtie < Rails::Railtie # :nodoc:
|
14
16
|
config.active_record = ActiveSupport::OrderedOptions.new
|
15
17
|
|
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"
|
18
|
+
config.app_generators.orm :active_record, migration: true,
|
19
|
+
timestamps: true
|
24
20
|
|
25
21
|
config.action_dispatch.rescue_responses.merge!(
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
22
|
+
"ActiveRecord::RecordNotFound" => :not_found,
|
23
|
+
"ActiveRecord::StaleObjectError" => :conflict,
|
24
|
+
"ActiveRecord::RecordInvalid" => :unprocessable_entity,
|
25
|
+
"ActiveRecord::RecordNotSaved" => :unprocessable_entity
|
30
26
|
)
|
31
27
|
|
32
|
-
|
33
28
|
config.active_record.use_schema_cache_dump = true
|
34
29
|
config.active_record.maintain_test_schema = true
|
35
30
|
|
31
|
+
config.active_record.sqlite3 = ActiveSupport::OrderedOptions.new
|
32
|
+
config.active_record.sqlite3.represent_boolean_as_integer = nil
|
33
|
+
|
36
34
|
config.eager_load_namespaces << ActiveRecord
|
37
35
|
|
38
36
|
rake_tasks do
|
@@ -40,9 +38,9 @@ module ActiveRecord
|
|
40
38
|
task :load_config do
|
41
39
|
ActiveRecord::Tasks::DatabaseTasks.database_configuration = Rails.application.config.database_configuration
|
42
40
|
|
43
|
-
if defined?(
|
44
|
-
if engine.paths[
|
45
|
-
ActiveRecord::Tasks::DatabaseTasks.migrations_paths += engine.paths[
|
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
|
@@ -61,6 +59,7 @@ module ActiveRecord
|
|
61
59
|
console = ActiveSupport::Logger.new(STDERR)
|
62
60
|
Rails.logger.extend ActiveSupport::Logger.broadcast console
|
63
61
|
end
|
62
|
+
ActiveRecord::Base.verbose_query_logs = false
|
64
63
|
end
|
65
64
|
|
66
65
|
runner do
|
@@ -80,8 +79,8 @@ module ActiveRecord
|
|
80
79
|
|
81
80
|
initializer "active_record.migration_error" do
|
82
81
|
if config.active_record.delete(:migration_error) == :page_load
|
83
|
-
config.app_middleware.insert_after
|
84
|
-
|
82
|
+
config.app_middleware.insert_after ::ActionDispatch::Callbacks,
|
83
|
+
ActiveRecord::Migration::CheckPending
|
85
84
|
end
|
86
85
|
end
|
87
86
|
|
@@ -89,14 +88,19 @@ module ActiveRecord
|
|
89
88
|
if config.active_record.delete(:use_schema_cache_dump)
|
90
89
|
config.after_initialize do |app|
|
91
90
|
ActiveSupport.on_load(:active_record) do
|
92
|
-
filename = File.join(app.config.paths["db"].first, "schema_cache.
|
91
|
+
filename = File.join(app.config.paths["db"].first, "schema_cache.yml")
|
93
92
|
|
94
93
|
if File.file?(filename)
|
95
|
-
|
96
|
-
|
97
|
-
|
94
|
+
current_version = ActiveRecord::Migrator.current_version
|
95
|
+
|
96
|
+
next if current_version.nil?
|
97
|
+
|
98
|
+
cache = YAML.load(File.read(filename))
|
99
|
+
if cache.version == current_version
|
100
|
+
connection.schema_cache = cache
|
101
|
+
connection_pool.schema_cache = cache.dup
|
98
102
|
else
|
99
|
-
warn "Ignoring db/schema_cache.
|
103
|
+
warn "Ignoring db/schema_cache.yml because it has expired. The current schema version is #{current_version}, but the one in the cache is #{cache.version}."
|
100
104
|
end
|
101
105
|
end
|
102
106
|
end
|
@@ -104,9 +108,19 @@ module ActiveRecord
|
|
104
108
|
end
|
105
109
|
end
|
106
110
|
|
111
|
+
initializer "active_record.warn_on_records_fetched_greater_than" do
|
112
|
+
if config.active_record.warn_on_records_fetched_greater_than
|
113
|
+
ActiveSupport.on_load(:active_record) do
|
114
|
+
require "active_record/relation/record_fetch_warning"
|
115
|
+
end
|
116
|
+
end
|
117
|
+
end
|
118
|
+
|
107
119
|
initializer "active_record.set_configs" do |app|
|
108
120
|
ActiveSupport.on_load(:active_record) do
|
109
|
-
app.config.active_record.
|
121
|
+
configs = app.config.active_record.dup
|
122
|
+
configs.delete(:sqlite3)
|
123
|
+
configs.each do |k, v|
|
110
124
|
send "#{k}=", v
|
111
125
|
end
|
112
126
|
end
|
@@ -114,7 +128,7 @@ module ActiveRecord
|
|
114
128
|
|
115
129
|
# This sets the database configuration from Configuration#database_configuration
|
116
130
|
# and then establishes the connection.
|
117
|
-
initializer "active_record.initialize_database" do
|
131
|
+
initializer "active_record.initialize_database" do
|
118
132
|
ActiveSupport.on_load(:active_record) do
|
119
133
|
self.configurations = Rails.application.config.database_configuration
|
120
134
|
|
@@ -127,8 +141,8 @@ Oops - You have a database configured, but it doesn't exist yet!
|
|
127
141
|
Here's how to get started:
|
128
142
|
|
129
143
|
1. Configure your database in config/database.yml.
|
130
|
-
2. Run `bin/
|
131
|
-
3. Run `bin/
|
144
|
+
2. Run `bin/rails db:create` to create the database.
|
145
|
+
3. Run `bin/rails db:setup` to load your database schema.
|
132
146
|
end_warning
|
133
147
|
raise
|
134
148
|
end
|
@@ -143,11 +157,9 @@ end_warning
|
|
143
157
|
end
|
144
158
|
end
|
145
159
|
|
146
|
-
initializer "active_record.set_reloader_hooks" do
|
147
|
-
hook = app.config.reload_classes_only_on_change ? :to_prepare : :to_cleanup
|
148
|
-
|
160
|
+
initializer "active_record.set_reloader_hooks" do
|
149
161
|
ActiveSupport.on_load(:active_record) do
|
150
|
-
|
162
|
+
ActiveSupport::Reloader.before_class_unload do
|
151
163
|
if ActiveRecord::Base.connected?
|
152
164
|
ActiveRecord::Base.clear_cache!
|
153
165
|
ActiveRecord::Base.clear_reloadable_connections!
|
@@ -156,9 +168,59 @@ end_warning
|
|
156
168
|
end
|
157
169
|
end
|
158
170
|
|
171
|
+
initializer "active_record.set_executor_hooks" do
|
172
|
+
ActiveRecord::QueryCache.install_executor_hooks
|
173
|
+
end
|
174
|
+
|
159
175
|
initializer "active_record.add_watchable_files" do |app|
|
160
176
|
path = app.paths["db"].first
|
161
177
|
config.watchable_files.concat ["#{path}/schema.rb", "#{path}/structure.sql"]
|
162
178
|
end
|
179
|
+
|
180
|
+
initializer "active_record.clear_active_connections" do
|
181
|
+
config.after_initialize do
|
182
|
+
ActiveSupport.on_load(:active_record) do
|
183
|
+
# Ideally the application doesn't connect to the database during boot,
|
184
|
+
# but sometimes it does. In case it did, we want to empty out the
|
185
|
+
# connection pools so that a non-database-using process (e.g. a master
|
186
|
+
# process in a forking server model) doesn't retain a needless
|
187
|
+
# connection. If it was needed, the incremental cost of reestablishing
|
188
|
+
# this connection is trivial: the rest of the pool would need to be
|
189
|
+
# populated anyway.
|
190
|
+
|
191
|
+
clear_active_connections!
|
192
|
+
flush_idle_connections!
|
193
|
+
end
|
194
|
+
end
|
195
|
+
end
|
196
|
+
|
197
|
+
initializer "active_record.check_represent_sqlite3_boolean_as_integer" do
|
198
|
+
config.after_initialize do
|
199
|
+
ActiveSupport.on_load(:active_record_sqlite3adapter) do
|
200
|
+
represent_boolean_as_integer = Rails.application.config.active_record.sqlite3.delete(:represent_boolean_as_integer)
|
201
|
+
unless represent_boolean_as_integer.nil?
|
202
|
+
ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer = represent_boolean_as_integer
|
203
|
+
end
|
204
|
+
|
205
|
+
unless ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
|
206
|
+
ActiveSupport::Deprecation.warn <<-MSG
|
207
|
+
Leaving `ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer`
|
208
|
+
set to false is deprecated. SQLite databases have used 't' and 'f' to serialize
|
209
|
+
boolean values and must have old data converted to 1 and 0 (its native boolean
|
210
|
+
serialization) before setting this flag to true. Conversion can be accomplished
|
211
|
+
by setting up a rake task which runs
|
212
|
+
|
213
|
+
ExampleModel.where("boolean_column = 't'").update_all(boolean_column: 1)
|
214
|
+
ExampleModel.where("boolean_column = 'f'").update_all(boolean_column: 0)
|
215
|
+
|
216
|
+
for all models and all boolean columns, after which the flag must be set to
|
217
|
+
true by adding the following to your application.rb file:
|
218
|
+
|
219
|
+
Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
|
220
|
+
MSG
|
221
|
+
end
|
222
|
+
end
|
223
|
+
end
|
224
|
+
end
|
163
225
|
end
|
164
226
|
end
|
@@ -1,15 +1,21 @@
|
|
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
|
|
11
|
+
# TODO Change this to private once we've dropped Ruby 2.2 support.
|
12
|
+
# Workaround for Ruby 2.2 "private attribute?" warning.
|
9
13
|
protected
|
10
14
|
|
11
15
|
attr_internal :db_runtime
|
12
16
|
|
17
|
+
private
|
18
|
+
|
13
19
|
def process_action(action, *args)
|
14
20
|
# We also need to reset the runtime before each action
|
15
21
|
# because of queries in middleware or in cases we are streaming
|
@@ -19,7 +25,7 @@ module ActiveRecord
|
|
19
25
|
end
|
20
26
|
|
21
27
|
def cleanup_view_runtime
|
22
|
-
if ActiveRecord::Base.connected?
|
28
|
+
if logger && logger.info? && ActiveRecord::Base.connected?
|
23
29
|
db_rt_before_render = ActiveRecord::LogSubscriber.reset_runtime
|
24
30
|
self.db_runtime = (db_runtime || 0) + db_rt_before_render
|
25
31
|
runtime = super
|