activerecord 6.0.6.1 → 6.1.7.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1152 -779
- data/MIT-LICENSE +1 -1
- data/README.rdoc +2 -2
- data/lib/active_record/aggregations.rb +5 -5
- data/lib/active_record/association_relation.rb +30 -12
- data/lib/active_record/associations/alias_tracker.rb +19 -15
- data/lib/active_record/associations/association.rb +49 -26
- data/lib/active_record/associations/association_scope.rb +18 -20
- data/lib/active_record/associations/belongs_to_association.rb +23 -10
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +8 -3
- data/lib/active_record/associations/builder/association.rb +32 -5
- data/lib/active_record/associations/builder/belongs_to.rb +10 -7
- data/lib/active_record/associations/builder/collection_association.rb +5 -4
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +0 -1
- data/lib/active_record/associations/builder/has_many.rb +6 -2
- data/lib/active_record/associations/builder/has_one.rb +11 -14
- data/lib/active_record/associations/builder/singular_association.rb +1 -1
- data/lib/active_record/associations/collection_association.rb +32 -18
- data/lib/active_record/associations/collection_proxy.rb +12 -5
- data/lib/active_record/associations/foreign_association.rb +13 -0
- data/lib/active_record/associations/has_many_association.rb +24 -2
- data/lib/active_record/associations/has_many_through_association.rb +10 -4
- data/lib/active_record/associations/has_one_association.rb +15 -1
- data/lib/active_record/associations/join_dependency/join_association.rb +37 -21
- data/lib/active_record/associations/join_dependency/join_part.rb +1 -1
- data/lib/active_record/associations/join_dependency.rb +63 -49
- data/lib/active_record/associations/preloader/association.rb +14 -8
- data/lib/active_record/associations/preloader/through_association.rb +1 -1
- data/lib/active_record/associations/preloader.rb +5 -3
- data/lib/active_record/associations/singular_association.rb +1 -1
- data/lib/active_record/associations.rb +118 -11
- data/lib/active_record/attribute_assignment.rb +10 -8
- data/lib/active_record/attribute_methods/before_type_cast.rb +13 -9
- data/lib/active_record/attribute_methods/dirty.rb +1 -11
- data/lib/active_record/attribute_methods/primary_key.rb +6 -2
- data/lib/active_record/attribute_methods/query.rb +3 -6
- data/lib/active_record/attribute_methods/read.rb +8 -11
- data/lib/active_record/attribute_methods/serialization.rb +11 -5
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +12 -13
- data/lib/active_record/attribute_methods/write.rb +12 -20
- data/lib/active_record/attribute_methods.rb +64 -54
- data/lib/active_record/attributes.rb +33 -8
- data/lib/active_record/autosave_association.rb +47 -30
- data/lib/active_record/base.rb +2 -14
- data/lib/active_record/callbacks.rb +152 -22
- data/lib/active_record/coders/yaml_column.rb +1 -1
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +185 -134
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +2 -44
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +66 -23
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +3 -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 +153 -116
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +114 -26
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +3 -3
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +228 -83
- data/lib/active_record/connection_adapters/abstract/transaction.rb +92 -33
- data/lib/active_record/connection_adapters/abstract_adapter.rb +52 -76
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +123 -87
- data/lib/active_record/connection_adapters/column.rb +15 -1
- data/lib/active_record/connection_adapters/deduplicable.rb +29 -0
- data/lib/active_record/connection_adapters/legacy_pool_manager.rb +35 -0
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +24 -24
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +1 -1
- data/lib/active_record/connection_adapters/mysql/quoting.rb +18 -3
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +32 -6
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +8 -0
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +5 -2
- data/lib/active_record/connection_adapters/mysql/schema_statements.rb +7 -4
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +10 -1
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +31 -12
- data/lib/active_record/connection_adapters/pool_config.rb +73 -0
- data/lib/active_record/connection_adapters/pool_manager.rb +47 -0
- data/lib/active_record/connection_adapters/postgresql/column.rb +24 -1
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +14 -53
- data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +3 -5
- data/lib/active_record/connection_adapters/postgresql/oid/date.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/interval.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/macaddr.rb +25 -0
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +11 -1
- data/lib/active_record/connection_adapters/postgresql/oid.rb +2 -0
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +30 -4
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +5 -1
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +61 -29
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +8 -0
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +75 -64
- data/lib/active_record/connection_adapters/schema_cache.rb +130 -15
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +8 -0
- data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +32 -5
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +1 -1
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +5 -1
- data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +36 -3
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +48 -50
- data/lib/active_record/connection_adapters.rb +52 -0
- data/lib/active_record/connection_handling.rb +218 -71
- data/lib/active_record/core.rb +264 -63
- data/lib/active_record/database_configurations/connection_url_resolver.rb +99 -0
- data/lib/active_record/database_configurations/database_config.rb +52 -9
- data/lib/active_record/database_configurations/hash_config.rb +54 -8
- data/lib/active_record/database_configurations/url_config.rb +15 -40
- data/lib/active_record/database_configurations.rb +125 -85
- data/lib/active_record/delegated_type.rb +209 -0
- data/lib/active_record/destroy_association_async_job.rb +36 -0
- data/lib/active_record/enum.rb +69 -34
- data/lib/active_record/errors.rb +47 -12
- data/lib/active_record/explain.rb +9 -4
- data/lib/active_record/explain_subscriber.rb +1 -1
- data/lib/active_record/fixture_set/file.rb +10 -17
- data/lib/active_record/fixture_set/model_metadata.rb +1 -2
- data/lib/active_record/fixture_set/render_context.rb +1 -1
- data/lib/active_record/fixture_set/table_row.rb +2 -2
- data/lib/active_record/fixtures.rb +58 -9
- data/lib/active_record/gem_version.rb +3 -3
- data/lib/active_record/inheritance.rb +40 -18
- data/lib/active_record/insert_all.rb +38 -5
- data/lib/active_record/integration.rb +3 -5
- data/lib/active_record/internal_metadata.rb +18 -7
- data/lib/active_record/legacy_yaml_adapter.rb +7 -3
- data/lib/active_record/locking/optimistic.rb +24 -17
- data/lib/active_record/locking/pessimistic.rb +6 -2
- data/lib/active_record/log_subscriber.rb +27 -8
- data/lib/active_record/middleware/database_selector/resolver/session.rb +3 -0
- data/lib/active_record/middleware/database_selector/resolver.rb +5 -0
- data/lib/active_record/middleware/database_selector.rb +4 -1
- data/lib/active_record/migration/command_recorder.rb +47 -27
- data/lib/active_record/migration/compatibility.rb +72 -18
- data/lib/active_record/migration.rb +114 -84
- data/lib/active_record/model_schema.rb +89 -14
- data/lib/active_record/nested_attributes.rb +2 -3
- data/lib/active_record/no_touching.rb +1 -1
- data/lib/active_record/persistence.rb +50 -45
- data/lib/active_record/query_cache.rb +15 -5
- data/lib/active_record/querying.rb +11 -6
- data/lib/active_record/railtie.rb +64 -44
- data/lib/active_record/railties/console_sandbox.rb +2 -4
- data/lib/active_record/railties/databases.rake +279 -101
- data/lib/active_record/readonly_attributes.rb +4 -0
- data/lib/active_record/reflection.rb +60 -44
- data/lib/active_record/relation/batches/batch_enumerator.rb +25 -9
- data/lib/active_record/relation/batches.rb +38 -31
- data/lib/active_record/relation/calculations.rb +104 -43
- data/lib/active_record/relation/finder_methods.rb +44 -14
- data/lib/active_record/relation/from_clause.rb +1 -1
- data/lib/active_record/relation/merger.rb +20 -23
- data/lib/active_record/relation/predicate_builder/array_handler.rb +8 -9
- data/lib/active_record/relation/predicate_builder/association_query_value.rb +4 -5
- data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +10 -6
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +1 -1
- data/lib/active_record/relation/predicate_builder.rb +61 -38
- data/lib/active_record/relation/query_methods.rb +322 -196
- data/lib/active_record/relation/record_fetch_warning.rb +3 -3
- data/lib/active_record/relation/spawn_methods.rb +8 -7
- data/lib/active_record/relation/where_clause.rb +111 -61
- data/lib/active_record/relation.rb +100 -81
- data/lib/active_record/result.rb +41 -33
- data/lib/active_record/runtime_registry.rb +2 -2
- data/lib/active_record/sanitization.rb +6 -17
- data/lib/active_record/schema_dumper.rb +34 -4
- data/lib/active_record/schema_migration.rb +2 -8
- data/lib/active_record/scoping/default.rb +1 -3
- data/lib/active_record/scoping/named.rb +1 -17
- data/lib/active_record/secure_token.rb +16 -8
- data/lib/active_record/serialization.rb +5 -3
- data/lib/active_record/signed_id.rb +116 -0
- data/lib/active_record/statement_cache.rb +20 -4
- data/lib/active_record/store.rb +8 -3
- data/lib/active_record/suppressor.rb +2 -2
- data/lib/active_record/table_metadata.rb +42 -51
- data/lib/active_record/tasks/database_tasks.rb +140 -113
- data/lib/active_record/tasks/mysql_database_tasks.rb +34 -35
- data/lib/active_record/tasks/postgresql_database_tasks.rb +24 -26
- data/lib/active_record/tasks/sqlite_database_tasks.rb +13 -9
- data/lib/active_record/test_databases.rb +5 -4
- data/lib/active_record/test_fixtures.rb +79 -31
- data/lib/active_record/timestamp.rb +4 -6
- data/lib/active_record/touch_later.rb +21 -21
- data/lib/active_record/transactions.rb +19 -66
- data/lib/active_record/type/serialized.rb +6 -2
- data/lib/active_record/type.rb +8 -1
- data/lib/active_record/type_caster/connection.rb +0 -1
- data/lib/active_record/type_caster/map.rb +8 -5
- data/lib/active_record/validations/associated.rb +1 -1
- data/lib/active_record/validations/numericality.rb +35 -0
- data/lib/active_record/validations/uniqueness.rb +24 -4
- data/lib/active_record/validations.rb +1 -0
- data/lib/active_record.rb +7 -14
- data/lib/arel/attributes/attribute.rb +4 -0
- data/lib/arel/collectors/bind.rb +5 -0
- data/lib/arel/collectors/composite.rb +8 -0
- data/lib/arel/collectors/sql_string.rb +7 -0
- data/lib/arel/collectors/substitute_binds.rb +7 -0
- data/lib/arel/nodes/binary.rb +82 -8
- data/lib/arel/nodes/bind_param.rb +8 -0
- data/lib/arel/nodes/casted.rb +21 -9
- data/lib/arel/nodes/equality.rb +6 -9
- data/lib/arel/nodes/grouping.rb +3 -0
- data/lib/arel/nodes/homogeneous_in.rb +76 -0
- data/lib/arel/nodes/in.rb +8 -1
- data/lib/arel/nodes/infix_operation.rb +13 -1
- data/lib/arel/nodes/join_source.rb +1 -1
- data/lib/arel/nodes/node.rb +7 -6
- data/lib/arel/nodes/ordering.rb +27 -0
- data/lib/arel/nodes/sql_literal.rb +3 -0
- data/lib/arel/nodes/table_alias.rb +7 -3
- data/lib/arel/nodes/unary.rb +0 -1
- data/lib/arel/nodes.rb +3 -1
- data/lib/arel/predications.rb +12 -18
- data/lib/arel/select_manager.rb +1 -2
- data/lib/arel/table.rb +13 -5
- data/lib/arel/visitors/dot.rb +14 -2
- data/lib/arel/visitors/mysql.rb +11 -1
- data/lib/arel/visitors/postgresql.rb +15 -4
- data/lib/arel/visitors/to_sql.rb +89 -78
- data/lib/arel/visitors.rb +0 -7
- data/lib/arel.rb +5 -13
- data/lib/rails/generators/active_record/migration/migration_generator.rb +1 -0
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +2 -0
- data/lib/rails/generators/active_record/migration/templates/migration.rb.tt +3 -3
- data/lib/rails/generators/active_record/migration.rb +6 -1
- data/lib/rails/generators/active_record/model/model_generator.rb +39 -2
- data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +7 -0
- metadata +25 -26
- data/lib/active_record/advisory_lock_base.rb +0 -18
- data/lib/active_record/attribute_decorators.rb +0 -88
- data/lib/active_record/connection_adapters/connection_specification.rb +0 -296
- data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +0 -29
- data/lib/active_record/define_callbacks.rb +0 -22
- data/lib/active_record/railties/collection_cache_association_loading.rb +0 -34
- data/lib/active_record/relation/predicate_builder/base_handler.rb +0 -18
- data/lib/active_record/relation/where_clause_factory.rb +0 -33
- data/lib/arel/attributes.rb +0 -22
- data/lib/arel/visitors/depth_first.rb +0 -203
- data/lib/arel/visitors/ibm_db.rb +0 -34
- data/lib/arel/visitors/informix.rb +0 -62
- data/lib/arel/visitors/mssql.rb +0 -156
- data/lib/arel/visitors/oracle.rb +0 -158
- data/lib/arel/visitors/oracle12.rb +0 -65
- data/lib/arel/visitors/where_sql.rb +0 -22
@@ -3,7 +3,7 @@
|
|
3
3
|
module ActiveRecord
|
4
4
|
module ConnectionAdapters
|
5
5
|
module MySQL
|
6
|
-
class SchemaCreation <
|
6
|
+
class SchemaCreation < SchemaCreation # :nodoc:
|
7
7
|
delegate :add_sql_comment!, :mariadb?, to: :@conn, private: true
|
8
8
|
|
9
9
|
private
|
@@ -11,6 +11,10 @@ module ActiveRecord
|
|
11
11
|
"DROP FOREIGN KEY #{name}"
|
12
12
|
end
|
13
13
|
|
14
|
+
def visit_DropCheckConstraint(name)
|
15
|
+
"DROP #{mariadb? ? 'CONSTRAINT' : 'CHECK'} #{name}"
|
16
|
+
end
|
17
|
+
|
14
18
|
def visit_AddColumnDefinition(o)
|
15
19
|
add_column_position!(super, column_options(o.column))
|
16
20
|
end
|
@@ -20,15 +24,37 @@ module ActiveRecord
|
|
20
24
|
add_column_position!(change_column_sql, column_options(o.column))
|
21
25
|
end
|
22
26
|
|
23
|
-
def
|
24
|
-
|
27
|
+
def visit_CreateIndexDefinition(o)
|
28
|
+
sql = visit_IndexDefinition(o.index, true)
|
29
|
+
sql << " #{o.algorithm}" if o.algorithm
|
30
|
+
sql
|
31
|
+
end
|
32
|
+
|
33
|
+
def visit_IndexDefinition(o, create = false)
|
34
|
+
index_type = o.type&.to_s&.upcase || o.unique && "UNIQUE"
|
35
|
+
|
36
|
+
sql = create ? ["CREATE"] : []
|
37
|
+
sql << index_type if index_type
|
38
|
+
sql << "INDEX"
|
39
|
+
sql << quote_column_name(o.name)
|
40
|
+
sql << "USING #{o.using}" if o.using
|
41
|
+
sql << "ON #{quote_table_name(o.table)}" if create
|
42
|
+
sql << "(#{quoted_columns(o)})"
|
43
|
+
|
44
|
+
add_sql_comment!(sql.join(" "), o.comment)
|
45
|
+
end
|
46
|
+
|
47
|
+
def add_table_options!(create_sql, o)
|
48
|
+
create_sql << " DEFAULT CHARSET=#{o.charset}" if o.charset
|
49
|
+
create_sql << " COLLATE=#{o.collation}" if o.collation
|
50
|
+
add_sql_comment!(super, o.comment)
|
25
51
|
end
|
26
52
|
|
27
53
|
def add_column_options!(sql, options)
|
28
54
|
# By default, TIMESTAMP columns are NOT NULL, cannot contain NULL values,
|
29
55
|
# and assigning NULL assigns the current timestamp. To permit a TIMESTAMP
|
30
56
|
# column to contain NULL, explicitly declare it with the NULL attribute.
|
31
|
-
# See https://dev.mysql.com/doc/refman/
|
57
|
+
# See https://dev.mysql.com/doc/refman/en/timestamp-initialization.html
|
32
58
|
if /\Atimestamp\b/.match?(options[:column].sql_type) && !options[:primary_key]
|
33
59
|
sql << " NULL" unless options[:null] == false || options_include_default?(options)
|
34
60
|
end
|
@@ -62,8 +88,8 @@ module ActiveRecord
|
|
62
88
|
end
|
63
89
|
|
64
90
|
def index_in_create(table_name, column_name, options)
|
65
|
-
|
66
|
-
|
91
|
+
index, _ = @conn.add_index_options(table_name, column_name, **options)
|
92
|
+
accept(index)
|
67
93
|
end
|
68
94
|
end
|
69
95
|
end
|
@@ -60,6 +60,14 @@ module ActiveRecord
|
|
60
60
|
class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
|
61
61
|
include ColumnMethods
|
62
62
|
|
63
|
+
attr_reader :charset, :collation
|
64
|
+
|
65
|
+
def initialize(conn, name, charset: nil, collation: nil, **)
|
66
|
+
super
|
67
|
+
@charset = charset
|
68
|
+
@collation = collation
|
69
|
+
end
|
70
|
+
|
63
71
|
def new_column_definition(name, type, **options) # :nodoc:
|
64
72
|
case type
|
65
73
|
when :virtual
|
@@ -49,7 +49,7 @@ module ActiveRecord
|
|
49
49
|
end
|
50
50
|
|
51
51
|
def schema_limit(column)
|
52
|
-
super unless /\A(?:
|
52
|
+
super unless /\A(?:tiny|medium|long)?(?:text|blob)\b/.match?(column.sql_type)
|
53
53
|
end
|
54
54
|
|
55
55
|
def schema_precision(column)
|
@@ -79,7 +79,10 @@ module ActiveRecord
|
|
79
79
|
" WHERE table_schema = #{scope[:schema]}" \
|
80
80
|
" AND table_name = #{scope[:name]}" \
|
81
81
|
" AND column_name = #{column_name}"
|
82
|
-
|
82
|
+
# Calling .inspect leads into issues with the query result
|
83
|
+
# which already returns escaped quotes.
|
84
|
+
# We remove the escape sequence from the result in order to deal with double escaping issues.
|
85
|
+
@connection.query_value(sql, "SCHEMA").gsub("\\'", "'").inspect
|
83
86
|
end
|
84
87
|
end
|
85
88
|
end
|
@@ -122,7 +122,7 @@ module ActiveRecord
|
|
122
122
|
end
|
123
123
|
|
124
124
|
def table_alias_length
|
125
|
-
256 # https://dev.mysql.com/doc/refman/
|
125
|
+
256 # https://dev.mysql.com/doc/refman/en/identifiers.html
|
126
126
|
end
|
127
127
|
|
128
128
|
private
|
@@ -154,8 +154,8 @@ module ActiveRecord
|
|
154
154
|
MySQL::SchemaCreation.new(self)
|
155
155
|
end
|
156
156
|
|
157
|
-
def create_table_definition(
|
158
|
-
MySQL::TableDefinition.new(self,
|
157
|
+
def create_table_definition(name, **options)
|
158
|
+
MySQL::TableDefinition.new(self, name, **options)
|
159
159
|
end
|
160
160
|
|
161
161
|
def new_column_from_field(table_name, field)
|
@@ -167,6 +167,9 @@ module ActiveRecord
|
|
167
167
|
elsif type_metadata.extra == "DEFAULT_GENERATED"
|
168
168
|
default = +"(#{default})" unless default.start_with?("(")
|
169
169
|
default, default_function = nil, default
|
170
|
+
elsif type_metadata.type == :text && default
|
171
|
+
# strip and unescape quotes
|
172
|
+
default = default[1...-1].gsub("\\'", "'")
|
170
173
|
end
|
171
174
|
|
172
175
|
MySQL::Column.new(
|
@@ -203,7 +206,7 @@ module ActiveRecord
|
|
203
206
|
def data_source_sql(name = nil, type: nil)
|
204
207
|
scope = quoted_scope(name, type: type)
|
205
208
|
|
206
|
-
sql = +"SELECT table_name FROM (SELECT
|
209
|
+
sql = +"SELECT table_name FROM (SELECT table_name, table_type FROM information_schema.tables "
|
207
210
|
sql << " WHERE table_schema = #{scope[:schema]}) _subquery"
|
208
211
|
if scope[:type] || scope[:name]
|
209
212
|
conditions = []
|
@@ -6,9 +6,11 @@ module ActiveRecord
|
|
6
6
|
class TypeMetadata < DelegateClass(SqlTypeMetadata) # :nodoc:
|
7
7
|
undef to_yaml if method_defined?(:to_yaml)
|
8
8
|
|
9
|
+
include Deduplicable
|
10
|
+
|
9
11
|
attr_reader :extra
|
10
12
|
|
11
|
-
def initialize(type_metadata, extra:
|
13
|
+
def initialize(type_metadata, extra: nil)
|
12
14
|
super(type_metadata)
|
13
15
|
@extra = extra
|
14
16
|
end
|
@@ -25,6 +27,13 @@ module ActiveRecord
|
|
25
27
|
__getobj__.hash ^
|
26
28
|
extra.hash
|
27
29
|
end
|
30
|
+
|
31
|
+
private
|
32
|
+
def deduplicated
|
33
|
+
__setobj__(__getobj__.deduplicate)
|
34
|
+
@extra = -extra if extra
|
35
|
+
super
|
36
|
+
end
|
28
37
|
end
|
29
38
|
end
|
30
39
|
end
|
@@ -3,13 +3,11 @@
|
|
3
3
|
require "active_record/connection_adapters/abstract_mysql_adapter"
|
4
4
|
require "active_record/connection_adapters/mysql/database_statements"
|
5
5
|
|
6
|
-
gem "mysql2", "
|
6
|
+
gem "mysql2", "~> 0.5"
|
7
7
|
require "mysql2"
|
8
8
|
|
9
9
|
module ActiveRecord
|
10
10
|
module ConnectionHandling # :nodoc:
|
11
|
-
ER_BAD_DB_ERROR = 1049
|
12
|
-
|
13
11
|
# Establishes a connection to the database that's used by all Active Record objects.
|
14
12
|
def mysql2_connection(config)
|
15
13
|
config = config.symbolize_keys
|
@@ -21,23 +19,34 @@ module ActiveRecord
|
|
21
19
|
config[:flags] |= Mysql2::Client::FOUND_ROWS
|
22
20
|
end
|
23
21
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
raise
|
31
|
-
end
|
22
|
+
ConnectionAdapters::Mysql2Adapter.new(
|
23
|
+
ConnectionAdapters::Mysql2Adapter.new_client(config),
|
24
|
+
logger,
|
25
|
+
nil,
|
26
|
+
config,
|
27
|
+
)
|
32
28
|
end
|
33
29
|
end
|
34
30
|
|
35
31
|
module ConnectionAdapters
|
36
32
|
class Mysql2Adapter < AbstractMysqlAdapter
|
33
|
+
ER_BAD_DB_ERROR = 1049
|
37
34
|
ADAPTER_NAME = "Mysql2"
|
38
35
|
|
39
36
|
include MySQL::DatabaseStatements
|
40
37
|
|
38
|
+
class << self
|
39
|
+
def new_client(config)
|
40
|
+
Mysql2::Client.new(config)
|
41
|
+
rescue Mysql2::Error => error
|
42
|
+
if error.error_number == ConnectionAdapters::Mysql2Adapter::ER_BAD_DB_ERROR
|
43
|
+
raise ActiveRecord::NoDatabaseError
|
44
|
+
else
|
45
|
+
raise ActiveRecord::ConnectionNotEstablished, error.message
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
41
50
|
def initialize(connection, logger, connection_options, config)
|
42
51
|
superclass_config = config.reverse_merge(prepared_statements: false)
|
43
52
|
super(connection, logger, connection_options, superclass_config)
|
@@ -92,6 +101,8 @@ module ActiveRecord
|
|
92
101
|
|
93
102
|
def quote_string(string)
|
94
103
|
@connection.escape(string)
|
104
|
+
rescue Mysql2::Error => error
|
105
|
+
raise translate_exception(error, message: error.message, sql: "<escape>", binds: [])
|
95
106
|
end
|
96
107
|
|
97
108
|
#--
|
@@ -124,7 +135,7 @@ module ActiveRecord
|
|
124
135
|
|
125
136
|
private
|
126
137
|
def connect
|
127
|
-
@connection =
|
138
|
+
@connection = self.class.new_client(@config)
|
128
139
|
configure_connection
|
129
140
|
end
|
130
141
|
|
@@ -140,6 +151,14 @@ module ActiveRecord
|
|
140
151
|
def get_full_version
|
141
152
|
@connection.server_info[:version]
|
142
153
|
end
|
154
|
+
|
155
|
+
def translate_exception(exception, message:, sql:, binds:)
|
156
|
+
if exception.is_a?(Mysql2::Error::TimeoutError) && !exception.error_number
|
157
|
+
ActiveRecord::AdapterTimeout.new(message, sql: sql, binds: binds)
|
158
|
+
else
|
159
|
+
super
|
160
|
+
end
|
161
|
+
end
|
143
162
|
end
|
144
163
|
end
|
145
164
|
end
|
@@ -0,0 +1,73 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ActiveRecord
|
4
|
+
module ConnectionAdapters
|
5
|
+
class PoolConfig # :nodoc:
|
6
|
+
include Mutex_m
|
7
|
+
|
8
|
+
attr_reader :db_config, :connection_klass
|
9
|
+
attr_accessor :schema_cache
|
10
|
+
|
11
|
+
INSTANCES = ObjectSpace::WeakMap.new
|
12
|
+
private_constant :INSTANCES
|
13
|
+
|
14
|
+
class << self
|
15
|
+
def discard_pools!
|
16
|
+
INSTANCES.each_key(&:discard_pool!)
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
def initialize(connection_klass, db_config)
|
21
|
+
super()
|
22
|
+
@connection_klass = connection_klass
|
23
|
+
@db_config = db_config
|
24
|
+
@pool = nil
|
25
|
+
INSTANCES[self] = self
|
26
|
+
end
|
27
|
+
|
28
|
+
def connection_specification_name
|
29
|
+
if connection_klass.is_a?(String)
|
30
|
+
connection_klass
|
31
|
+
elsif connection_klass.primary_class?
|
32
|
+
"ActiveRecord::Base"
|
33
|
+
else
|
34
|
+
connection_klass.name
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
def disconnect!
|
39
|
+
ActiveSupport::ForkTracker.check!
|
40
|
+
|
41
|
+
return unless @pool
|
42
|
+
|
43
|
+
synchronize do
|
44
|
+
return unless @pool
|
45
|
+
|
46
|
+
@pool.automatic_reconnect = false
|
47
|
+
@pool.disconnect!
|
48
|
+
end
|
49
|
+
|
50
|
+
nil
|
51
|
+
end
|
52
|
+
|
53
|
+
def pool
|
54
|
+
ActiveSupport::ForkTracker.check!
|
55
|
+
|
56
|
+
@pool || synchronize { @pool ||= ConnectionAdapters::ConnectionPool.new(self) }
|
57
|
+
end
|
58
|
+
|
59
|
+
def discard_pool!
|
60
|
+
return unless @pool
|
61
|
+
|
62
|
+
synchronize do
|
63
|
+
return unless @pool
|
64
|
+
|
65
|
+
@pool.discard!
|
66
|
+
@pool = nil
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
ActiveSupport::ForkTracker.after_fork { ActiveRecord::ConnectionAdapters::PoolConfig.discard_pools! }
|
@@ -0,0 +1,47 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ActiveRecord
|
4
|
+
module ConnectionAdapters
|
5
|
+
class PoolManager # :nodoc:
|
6
|
+
def initialize
|
7
|
+
@name_to_role_mapping = Hash.new { |h, k| h[k] = {} }
|
8
|
+
end
|
9
|
+
|
10
|
+
def shard_names
|
11
|
+
@name_to_role_mapping.values.flat_map { |shard_map| shard_map.keys }
|
12
|
+
end
|
13
|
+
|
14
|
+
def role_names
|
15
|
+
@name_to_role_mapping.keys
|
16
|
+
end
|
17
|
+
|
18
|
+
def pool_configs(role = nil)
|
19
|
+
if role
|
20
|
+
@name_to_role_mapping[role].values
|
21
|
+
else
|
22
|
+
@name_to_role_mapping.flat_map { |_, shard_map| shard_map.values }
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
def remove_role(role)
|
27
|
+
@name_to_role_mapping.delete(role)
|
28
|
+
end
|
29
|
+
|
30
|
+
def remove_pool_config(role, shard)
|
31
|
+
@name_to_role_mapping[role].delete(shard)
|
32
|
+
end
|
33
|
+
|
34
|
+
def get_pool_config(role, shard)
|
35
|
+
@name_to_role_mapping[role][shard]
|
36
|
+
end
|
37
|
+
|
38
|
+
def set_pool_config(role, shard, pool_config)
|
39
|
+
if pool_config
|
40
|
+
@name_to_role_mapping[role][shard] = pool_config
|
41
|
+
else
|
42
|
+
raise ArgumentError, "The `pool_config` for the :#{role} role and :#{shard} shard was `nil`. Please check your configuration. If you want your writing role to be something other than `:writing` set `config.active_record.writing_role` in your application configuration. The same setting should be applied for the `reading_role` if applicable."
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
@@ -21,7 +21,30 @@ module ActiveRecord
|
|
21
21
|
alias :array? :array
|
22
22
|
|
23
23
|
def sql_type
|
24
|
-
super.
|
24
|
+
super.delete_suffix("[]")
|
25
|
+
end
|
26
|
+
|
27
|
+
def init_with(coder)
|
28
|
+
@serial = coder["serial"]
|
29
|
+
super
|
30
|
+
end
|
31
|
+
|
32
|
+
def encode_with(coder)
|
33
|
+
coder["serial"] = @serial
|
34
|
+
super
|
35
|
+
end
|
36
|
+
|
37
|
+
def ==(other)
|
38
|
+
other.is_a?(Column) &&
|
39
|
+
super &&
|
40
|
+
serial? == other.serial?
|
41
|
+
end
|
42
|
+
alias :eql? :==
|
43
|
+
|
44
|
+
def hash
|
45
|
+
Column.hash ^
|
46
|
+
super.hash ^
|
47
|
+
serial?.hash
|
25
48
|
end
|
26
49
|
end
|
27
50
|
end
|
@@ -9,60 +9,14 @@ module ActiveRecord
|
|
9
9
|
PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN", binds))
|
10
10
|
end
|
11
11
|
|
12
|
-
# The internal PostgreSQL identifier of the money data type.
|
13
|
-
MONEY_COLUMN_TYPE_OID = 790 #:nodoc:
|
14
|
-
# The internal PostgreSQL identifier of the BYTEA data type.
|
15
|
-
BYTEA_COLUMN_TYPE_OID = 17 #:nodoc:
|
16
|
-
|
17
|
-
# create a 2D array representing the result set
|
18
|
-
def result_as_array(res) #:nodoc:
|
19
|
-
# check if we have any binary column and if they need escaping
|
20
|
-
ftypes = Array.new(res.nfields) do |i|
|
21
|
-
[i, res.ftype(i)]
|
22
|
-
end
|
23
|
-
|
24
|
-
rows = res.values
|
25
|
-
return rows unless ftypes.any? { |_, x|
|
26
|
-
x == BYTEA_COLUMN_TYPE_OID || x == MONEY_COLUMN_TYPE_OID
|
27
|
-
}
|
28
|
-
|
29
|
-
typehash = ftypes.group_by { |_, type| type }
|
30
|
-
binaries = typehash[BYTEA_COLUMN_TYPE_OID] || []
|
31
|
-
monies = typehash[MONEY_COLUMN_TYPE_OID] || []
|
32
|
-
|
33
|
-
rows.each do |row|
|
34
|
-
# unescape string passed BYTEA field (OID == 17)
|
35
|
-
binaries.each do |index, _|
|
36
|
-
row[index] = unescape_bytea(row[index])
|
37
|
-
end
|
38
|
-
|
39
|
-
# If this is a money type column and there are any currency symbols,
|
40
|
-
# then strip them off. Indeed it would be prettier to do this in
|
41
|
-
# PostgreSQLColumn.string_to_decimal but would break form input
|
42
|
-
# fields that call value_before_type_cast.
|
43
|
-
monies.each do |index, _|
|
44
|
-
data = row[index]
|
45
|
-
# Because money output is formatted according to the locale, there are two
|
46
|
-
# cases to consider (note the decimal separators):
|
47
|
-
# (1) $12,345,678.12
|
48
|
-
# (2) $12.345.678,12
|
49
|
-
case data
|
50
|
-
when /^-?\D+[\d,]+\.\d{2}$/ # (1)
|
51
|
-
data.gsub!(/[^-\d.]/, "")
|
52
|
-
when /^-?\D+[\d.]+,\d{2}$/ # (2)
|
53
|
-
data.gsub!(/[^-\d,]/, "").sub!(/,/, ".")
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
12
|
# Queries the database and returns the results in an Array-like object
|
60
13
|
def query(sql, name = nil) #:nodoc:
|
61
14
|
materialize_transactions
|
15
|
+
mark_transaction_written_if_write(sql)
|
62
16
|
|
63
17
|
log(sql, name) do
|
64
18
|
ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
|
65
|
-
|
19
|
+
@connection.async_exec(sql).map_types!(@type_map_for_results).values
|
66
20
|
end
|
67
21
|
end
|
68
22
|
end
|
@@ -74,6 +28,8 @@ module ActiveRecord
|
|
74
28
|
|
75
29
|
def write_query?(sql) # :nodoc:
|
76
30
|
!READ_QUERY.match?(sql)
|
31
|
+
rescue ArgumentError # Invalid encoding
|
32
|
+
!READ_QUERY.match?(sql.b)
|
77
33
|
end
|
78
34
|
|
79
35
|
# Executes an SQL statement, returning a PG::Result object on success
|
@@ -86,6 +42,7 @@ module ActiveRecord
|
|
86
42
|
end
|
87
43
|
|
88
44
|
materialize_transactions
|
45
|
+
mark_transaction_written_if_write(sql)
|
89
46
|
|
90
47
|
log(sql, name) do
|
91
48
|
ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
|
@@ -101,9 +58,13 @@ module ActiveRecord
|
|
101
58
|
fields.each_with_index do |fname, i|
|
102
59
|
ftype = result.ftype i
|
103
60
|
fmod = result.fmod i
|
104
|
-
|
61
|
+
case type = get_oid_type(ftype, fmod, fname)
|
62
|
+
when Type::Integer, Type::Float, OID::Decimal, Type::String, Type::DateTime, Type::Boolean
|
63
|
+
# skip if a column has already been type casted by pg decoders
|
64
|
+
else types[fname] = type
|
65
|
+
end
|
105
66
|
end
|
106
|
-
|
67
|
+
build_result(columns: fields, rows: result.values, column_types: types)
|
107
68
|
end
|
108
69
|
end
|
109
70
|
|
@@ -147,7 +108,7 @@ module ActiveRecord
|
|
147
108
|
|
148
109
|
# Begins a transaction.
|
149
110
|
def begin_db_transaction
|
150
|
-
execute
|
111
|
+
execute("BEGIN", "TRANSACTION")
|
151
112
|
end
|
152
113
|
|
153
114
|
def begin_isolated_db_transaction(isolation)
|
@@ -157,12 +118,12 @@ module ActiveRecord
|
|
157
118
|
|
158
119
|
# Commits a transaction.
|
159
120
|
def commit_db_transaction
|
160
|
-
execute
|
121
|
+
execute("COMMIT", "TRANSACTION")
|
161
122
|
end
|
162
123
|
|
163
124
|
# Aborts a transaction.
|
164
125
|
def exec_rollback_db_transaction
|
165
|
-
execute
|
126
|
+
execute("ROLLBACK", "TRANSACTION")
|
166
127
|
end
|
167
128
|
|
168
129
|
private
|
@@ -12,19 +12,17 @@ module ActiveRecord
|
|
12
12
|
end
|
13
13
|
|
14
14
|
def type_cast_for_schema(value)
|
15
|
-
subnet_mask = value.instance_variable_get(:@mask_addr)
|
16
|
-
|
17
15
|
# If the subnet mask is equal to /32, don't output it
|
18
|
-
if
|
16
|
+
if value.prefix == 32
|
19
17
|
"\"#{value}\""
|
20
18
|
else
|
21
|
-
"\"#{value}/#{
|
19
|
+
"\"#{value}/#{value.prefix}\""
|
22
20
|
end
|
23
21
|
end
|
24
22
|
|
25
23
|
def serialize(value)
|
26
24
|
if IPAddr === value
|
27
|
-
"#{value}/#{value.
|
25
|
+
"#{value}/#{value.prefix}"
|
28
26
|
else
|
29
27
|
value
|
30
28
|
end
|
@@ -10,8 +10,8 @@ module ActiveRecord
|
|
10
10
|
when "infinity" then ::Float::INFINITY
|
11
11
|
when "-infinity" then -::Float::INFINITY
|
12
12
|
when / BC$/
|
13
|
-
|
14
|
-
super(value.
|
13
|
+
value = value.sub(/^\d+/) { |year| format("%04d", -year.to_i + 1) }
|
14
|
+
super(value.delete_suffix!(" BC"))
|
15
15
|
else
|
16
16
|
super
|
17
17
|
end
|
@@ -10,8 +10,8 @@ module ActiveRecord
|
|
10
10
|
when "infinity" then ::Float::INFINITY
|
11
11
|
when "-infinity" then -::Float::INFINITY
|
12
12
|
when / BC$/
|
13
|
-
|
14
|
-
super(value.
|
13
|
+
value = value.sub(/^\d+/) { |year| format("%04d", -year.to_i + 1) }
|
14
|
+
super(value.delete_suffix!(" BC"))
|
15
15
|
else
|
16
16
|
super
|
17
17
|
end
|
@@ -0,0 +1,49 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "active_support/duration"
|
4
|
+
|
5
|
+
module ActiveRecord
|
6
|
+
module ConnectionAdapters
|
7
|
+
module PostgreSQL
|
8
|
+
module OID # :nodoc:
|
9
|
+
class Interval < Type::Value # :nodoc:
|
10
|
+
def type
|
11
|
+
:interval
|
12
|
+
end
|
13
|
+
|
14
|
+
def cast_value(value)
|
15
|
+
case value
|
16
|
+
when ::ActiveSupport::Duration
|
17
|
+
value
|
18
|
+
when ::String
|
19
|
+
begin
|
20
|
+
::ActiveSupport::Duration.parse(value)
|
21
|
+
rescue ::ActiveSupport::Duration::ISO8601Parser::ParsingError
|
22
|
+
nil
|
23
|
+
end
|
24
|
+
else
|
25
|
+
super
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
def serialize(value)
|
30
|
+
case value
|
31
|
+
when ::ActiveSupport::Duration
|
32
|
+
value.iso8601(precision: self.precision)
|
33
|
+
when ::Numeric
|
34
|
+
# Sometimes operations on Times returns just float number of seconds so we need to handle that.
|
35
|
+
# Example: Time.current - (Time.current + 1.hour) # => -3600.000001776 (Float)
|
36
|
+
value.seconds.iso8601(precision: self.precision)
|
37
|
+
else
|
38
|
+
super
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
def type_cast_for_schema(value)
|
43
|
+
serialize(value).inspect
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
@@ -14,7 +14,7 @@ module ActiveRecord
|
|
14
14
|
def cast(value)
|
15
15
|
case value
|
16
16
|
when ::String
|
17
|
-
if value
|
17
|
+
if value.start_with?("(") && value.end_with?(")")
|
18
18
|
value = value[1...-1]
|
19
19
|
end
|
20
20
|
cast(value.split(","))
|
@@ -35,7 +35,7 @@ module ActiveRecord
|
|
35
35
|
|
36
36
|
private
|
37
37
|
def number_for_point(number)
|
38
|
-
number.to_s.
|
38
|
+
number.to_s.delete_suffix(".0")
|
39
39
|
end
|
40
40
|
end
|
41
41
|
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ActiveRecord
|
4
|
+
module ConnectionAdapters
|
5
|
+
module PostgreSQL
|
6
|
+
module OID # :nodoc:
|
7
|
+
class Macaddr < Type::String # :nodoc:
|
8
|
+
def type
|
9
|
+
:macaddr
|
10
|
+
end
|
11
|
+
|
12
|
+
def changed?(old_value, new_value, _new_value_before_type_cast)
|
13
|
+
old_value.class != new_value.class ||
|
14
|
+
new_value && old_value.casecmp(new_value) != 0
|
15
|
+
end
|
16
|
+
|
17
|
+
def changed_in_place?(raw_old_value, new_value)
|
18
|
+
raw_old_value.class != new_value.class ||
|
19
|
+
new_value && raw_old_value.casecmp(new_value) != 0
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|