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
@@ -1,6 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require "active_record/middleware/database_selector/resolver/session"
|
4
|
+
require "active_support/core_ext/numeric/time"
|
4
5
|
|
5
6
|
module ActiveRecord
|
6
7
|
module Middleware
|
@@ -43,6 +44,10 @@ module ActiveRecord
|
|
43
44
|
write_to_primary(&blk)
|
44
45
|
end
|
45
46
|
|
47
|
+
def update_context(response)
|
48
|
+
context.save(response)
|
49
|
+
end
|
50
|
+
|
46
51
|
private
|
47
52
|
def read_from_primary(&blk)
|
48
53
|
ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role, prevent_writes: true) do
|
@@ -59,11 +59,14 @@ module ActiveRecord
|
|
59
59
|
context = context_klass.call(request)
|
60
60
|
resolver = resolver_klass.call(context, options)
|
61
61
|
|
62
|
-
if reading_request?(request)
|
62
|
+
response = if reading_request?(request)
|
63
63
|
resolver.read(&blk)
|
64
64
|
else
|
65
65
|
resolver.write(&blk)
|
66
66
|
end
|
67
|
+
|
68
|
+
resolver.update_context(response)
|
69
|
+
response
|
67
70
|
end
|
68
71
|
|
69
72
|
def reading_request?(request)
|
@@ -8,6 +8,7 @@ module ActiveRecord
|
|
8
8
|
#
|
9
9
|
# * add_column
|
10
10
|
# * add_foreign_key
|
11
|
+
# * add_check_constraint
|
11
12
|
# * add_index
|
12
13
|
# * add_reference
|
13
14
|
# * add_timestamps
|
@@ -25,6 +26,7 @@ module ActiveRecord
|
|
25
26
|
# * remove_column (must supply a type)
|
26
27
|
# * remove_columns (must specify at least one column name or more)
|
27
28
|
# * remove_foreign_key (must supply a second table)
|
29
|
+
# * remove_check_constraint
|
28
30
|
# * remove_index
|
29
31
|
# * remove_reference
|
30
32
|
# * remove_timestamps
|
@@ -39,7 +41,8 @@ module ActiveRecord
|
|
39
41
|
:drop_join_table, :drop_table, :execute_block, :enable_extension, :disable_extension,
|
40
42
|
:change_column, :execute, :remove_columns, :change_column_null,
|
41
43
|
:add_foreign_key, :remove_foreign_key,
|
42
|
-
:change_column_comment, :change_table_comment
|
44
|
+
:change_column_comment, :change_table_comment,
|
45
|
+
:add_check_constraint, :remove_check_constraint
|
43
46
|
]
|
44
47
|
include JoinTable
|
45
48
|
|
@@ -85,6 +88,11 @@ module ActiveRecord
|
|
85
88
|
# recorder.inverse_of(:rename_table, [:old, :new])
|
86
89
|
# # => [:rename_table, [:new, :old]]
|
87
90
|
#
|
91
|
+
# If the inverse of a command requires several commands, returns array of commands.
|
92
|
+
#
|
93
|
+
# recorder.inverse_of(:remove_columns, [:some_table, :foo, :bar, type: :string])
|
94
|
+
# # => [[:add_column, :some_table, :foo, :string], [:add_column, :some_table, :bar, :string]]
|
95
|
+
#
|
88
96
|
# This method will raise an +IrreversibleMigration+ exception if it cannot
|
89
97
|
# invert the +command+.
|
90
98
|
def inverse_of(command, args, &block)
|
@@ -127,9 +135,11 @@ module ActiveRecord
|
|
127
135
|
create_table: :drop_table,
|
128
136
|
create_join_table: :drop_join_table,
|
129
137
|
add_column: :remove_column,
|
138
|
+
add_index: :remove_index,
|
130
139
|
add_timestamps: :remove_timestamps,
|
131
140
|
add_reference: :remove_reference,
|
132
141
|
add_foreign_key: :remove_foreign_key,
|
142
|
+
add_check_constraint: :remove_check_constraint,
|
133
143
|
enable_extension: :disable_extension
|
134
144
|
}.each do |cmd, inv|
|
135
145
|
[[inv, cmd], [cmd, inv]].uniq.each do |method, inverse|
|
@@ -171,44 +181,49 @@ module ActiveRecord
|
|
171
181
|
super
|
172
182
|
end
|
173
183
|
|
184
|
+
def invert_remove_columns(args)
|
185
|
+
unless args[-1].is_a?(Hash) && args[-1].has_key?(:type)
|
186
|
+
raise ActiveRecord::IrreversibleMigration, "remove_columns is only reversible if given a type."
|
187
|
+
end
|
188
|
+
|
189
|
+
[:add_columns, args]
|
190
|
+
end
|
191
|
+
|
174
192
|
def invert_rename_index(args)
|
175
|
-
|
193
|
+
table_name, old_name, new_name = args
|
194
|
+
[:rename_index, [table_name, new_name, old_name]]
|
176
195
|
end
|
177
196
|
|
178
197
|
def invert_rename_column(args)
|
179
|
-
|
198
|
+
table_name, old_name, new_name = args
|
199
|
+
[:rename_column, [table_name, new_name, old_name]]
|
180
200
|
end
|
181
201
|
|
182
|
-
def
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
options_hash = options.slice(:name, :algorithm)
|
187
|
-
options_hash[:column] = columns if !options_hash[:name]
|
202
|
+
def invert_remove_index(args)
|
203
|
+
options = args.extract_options!
|
204
|
+
table, columns = args
|
188
205
|
|
189
|
-
|
190
|
-
end
|
206
|
+
columns ||= options.delete(:column)
|
191
207
|
|
192
|
-
|
193
|
-
|
194
|
-
if (options = options_or_column).is_a?(Hash)
|
195
|
-
unless options[:column]
|
196
|
-
raise ActiveRecord::IrreversibleMigration, "remove_index is only reversible if given a :column option."
|
197
|
-
end
|
198
|
-
options = options.dup
|
199
|
-
[:add_index, [table, options.delete(:column), options]]
|
200
|
-
elsif (column = options_or_column).present?
|
201
|
-
[:add_index, [table, column]]
|
208
|
+
unless columns
|
209
|
+
raise ActiveRecord::IrreversibleMigration, "remove_index is only reversible if given a :column option."
|
202
210
|
end
|
211
|
+
|
212
|
+
options.delete(:if_exists)
|
213
|
+
|
214
|
+
args = [table, columns]
|
215
|
+
args << options unless options.empty?
|
216
|
+
|
217
|
+
[:add_index, args]
|
203
218
|
end
|
204
219
|
|
205
220
|
alias :invert_add_belongs_to :invert_add_reference
|
206
221
|
alias :invert_remove_belongs_to :invert_remove_reference
|
207
222
|
|
208
223
|
def invert_change_column_default(args)
|
209
|
-
table, column, options =
|
224
|
+
table, column, options = args
|
210
225
|
|
211
|
-
unless options
|
226
|
+
unless options.is_a?(Hash) && options.has_key?(:from) && options.has_key?(:to)
|
212
227
|
raise ActiveRecord::IrreversibleMigration, "change_column_default is only reversible if given a :from and :to option."
|
213
228
|
end
|
214
229
|
|
@@ -235,9 +250,9 @@ module ActiveRecord
|
|
235
250
|
end
|
236
251
|
|
237
252
|
def invert_change_column_comment(args)
|
238
|
-
table, column, options =
|
253
|
+
table, column, options = args
|
239
254
|
|
240
|
-
unless options
|
255
|
+
unless options.is_a?(Hash) && options.has_key?(:from) && options.has_key?(:to)
|
241
256
|
raise ActiveRecord::IrreversibleMigration, "change_column_comment is only reversible if given a :from and :to option."
|
242
257
|
end
|
243
258
|
|
@@ -245,15 +260,20 @@ module ActiveRecord
|
|
245
260
|
end
|
246
261
|
|
247
262
|
def invert_change_table_comment(args)
|
248
|
-
table, options =
|
263
|
+
table, options = args
|
249
264
|
|
250
|
-
unless options
|
265
|
+
unless options.is_a?(Hash) && options.has_key?(:from) && options.has_key?(:to)
|
251
266
|
raise ActiveRecord::IrreversibleMigration, "change_table_comment is only reversible if given a :from and :to option."
|
252
267
|
end
|
253
268
|
|
254
269
|
[:change_table_comment, [table, from: options[:to], to: options[:from]]]
|
255
270
|
end
|
256
271
|
|
272
|
+
def invert_remove_check_constraint(args)
|
273
|
+
raise ActiveRecord::IrreversibleMigration, "remove_check_constraint is only reversible if given an expression." if args.size < 2
|
274
|
+
super
|
275
|
+
end
|
276
|
+
|
257
277
|
def respond_to_missing?(method, _)
|
258
278
|
super || delegate.respond_to?(method)
|
259
279
|
end
|
@@ -13,7 +13,65 @@ module ActiveRecord
|
|
13
13
|
const_get(name)
|
14
14
|
end
|
15
15
|
|
16
|
-
|
16
|
+
V6_1 = Current
|
17
|
+
|
18
|
+
class V6_0 < V6_1
|
19
|
+
class ReferenceDefinition < ConnectionAdapters::ReferenceDefinition
|
20
|
+
def index_options(table_name)
|
21
|
+
as_options(index)
|
22
|
+
end
|
23
|
+
end
|
24
|
+
|
25
|
+
module TableDefinition
|
26
|
+
def references(*args, **options)
|
27
|
+
options[:_uses_legacy_reference_index_name] = true
|
28
|
+
super
|
29
|
+
end
|
30
|
+
alias :belongs_to :references
|
31
|
+
end
|
32
|
+
|
33
|
+
def create_table(table_name, **options)
|
34
|
+
if block_given?
|
35
|
+
super { |t| yield compatible_table_definition(t) }
|
36
|
+
else
|
37
|
+
super
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
def change_table(table_name, **options)
|
42
|
+
if block_given?
|
43
|
+
super { |t| yield compatible_table_definition(t) }
|
44
|
+
else
|
45
|
+
super
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
def create_join_table(table_1, table_2, **options)
|
50
|
+
if block_given?
|
51
|
+
super { |t| yield compatible_table_definition(t) }
|
52
|
+
else
|
53
|
+
super
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
def add_reference(table_name, ref_name, **options)
|
58
|
+
if connection.adapter_name == "SQLite"
|
59
|
+
options[:type] = :integer
|
60
|
+
end
|
61
|
+
|
62
|
+
options[:_uses_legacy_reference_index_name] = true
|
63
|
+
super
|
64
|
+
end
|
65
|
+
alias :add_belongs_to :add_reference
|
66
|
+
|
67
|
+
private
|
68
|
+
def compatible_table_definition(t)
|
69
|
+
class << t
|
70
|
+
prepend TableDefinition
|
71
|
+
end
|
72
|
+
t
|
73
|
+
end
|
74
|
+
end
|
17
75
|
|
18
76
|
class V5_2 < V6_0
|
19
77
|
module TableDefinition
|
@@ -29,13 +87,11 @@ module ActiveRecord
|
|
29
87
|
end
|
30
88
|
|
31
89
|
def invert_change_column_comment(args)
|
32
|
-
|
33
|
-
[:change_column_comment, [table_name, column_name, from: comment, to: comment]]
|
90
|
+
[:change_column_comment, args]
|
34
91
|
end
|
35
92
|
|
36
93
|
def invert_change_table_comment(args)
|
37
|
-
|
38
|
-
[:change_table_comment, [table_name, from: comment, to: comment]]
|
94
|
+
[:change_table_comment, args]
|
39
95
|
end
|
40
96
|
end
|
41
97
|
|
@@ -73,7 +129,7 @@ module ActiveRecord
|
|
73
129
|
class << t
|
74
130
|
prepend TableDefinition
|
75
131
|
end
|
76
|
-
|
132
|
+
super
|
77
133
|
end
|
78
134
|
|
79
135
|
def command_recorder
|
@@ -86,9 +142,9 @@ module ActiveRecord
|
|
86
142
|
end
|
87
143
|
|
88
144
|
class V5_1 < V5_2
|
89
|
-
def change_column(table_name, column_name, type, options
|
145
|
+
def change_column(table_name, column_name, type, **options)
|
90
146
|
if connection.adapter_name == "PostgreSQL"
|
91
|
-
super(table_name, column_name, type, options.except(:default, :null, :comment))
|
147
|
+
super(table_name, column_name, type, **options.except(:default, :null, :comment))
|
92
148
|
connection.change_column_default(table_name, column_name, options[:default]) if options.key?(:default)
|
93
149
|
connection.change_column_null(table_name, column_name, options[:null], options[:default]) if options.key?(:null)
|
94
150
|
connection.change_column_comment(table_name, column_name, options[:comment]) if options.key?(:comment)
|
@@ -194,7 +250,7 @@ module ActiveRecord
|
|
194
250
|
super
|
195
251
|
end
|
196
252
|
|
197
|
-
def index_exists?(table_name, column_name, options
|
253
|
+
def index_exists?(table_name, column_name, **options)
|
198
254
|
column_names = Array(column_name).map(&:to_s)
|
199
255
|
options[:name] =
|
200
256
|
if options[:name].present?
|
@@ -205,10 +261,9 @@ module ActiveRecord
|
|
205
261
|
super
|
206
262
|
end
|
207
263
|
|
208
|
-
def remove_index(table_name,
|
209
|
-
options =
|
210
|
-
|
211
|
-
super(table_name, options)
|
264
|
+
def remove_index(table_name, column_name = nil, **options)
|
265
|
+
options[:name] = index_name_for_remove(table_name, column_name, options)
|
266
|
+
super
|
212
267
|
end
|
213
268
|
|
214
269
|
private
|
@@ -219,13 +274,12 @@ module ActiveRecord
|
|
219
274
|
super
|
220
275
|
end
|
221
276
|
|
222
|
-
def index_name_for_remove(table_name, options
|
223
|
-
index_name = connection.index_name(table_name, options)
|
277
|
+
def index_name_for_remove(table_name, column_name, options)
|
278
|
+
index_name = connection.index_name(table_name, column_name || options)
|
224
279
|
|
225
280
|
unless connection.index_name_exists?(table_name, index_name)
|
226
|
-
if options.
|
227
|
-
options_without_column = options.
|
228
|
-
options_without_column.delete :column
|
281
|
+
if options.key?(:name)
|
282
|
+
options_without_column = options.except(:column)
|
229
283
|
index_name_without_column = connection.index_name(table_name, options_without_column)
|
230
284
|
|
231
285
|
if connection.index_name_exists?(table_name, index_name_without_column)
|