activerecord 7.0.4 → 7.1.5.1

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.
Files changed (246) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1971 -1243
  3. data/MIT-LICENSE +1 -1
  4. data/README.rdoc +18 -18
  5. data/lib/active_record/aggregations.rb +16 -13
  6. data/lib/active_record/association_relation.rb +1 -1
  7. data/lib/active_record/associations/association.rb +20 -4
  8. data/lib/active_record/associations/association_scope.rb +16 -9
  9. data/lib/active_record/associations/belongs_to_association.rb +14 -6
  10. data/lib/active_record/associations/builder/association.rb +3 -3
  11. data/lib/active_record/associations/builder/belongs_to.rb +21 -8
  12. data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +1 -5
  13. data/lib/active_record/associations/builder/singular_association.rb +4 -0
  14. data/lib/active_record/associations/collection_association.rb +20 -14
  15. data/lib/active_record/associations/collection_proxy.rb +20 -10
  16. data/lib/active_record/associations/foreign_association.rb +10 -3
  17. data/lib/active_record/associations/has_many_association.rb +20 -13
  18. data/lib/active_record/associations/has_many_through_association.rb +10 -6
  19. data/lib/active_record/associations/has_one_association.rb +10 -3
  20. data/lib/active_record/associations/join_dependency/join_association.rb +3 -2
  21. data/lib/active_record/associations/join_dependency.rb +10 -10
  22. data/lib/active_record/associations/preloader/association.rb +31 -7
  23. data/lib/active_record/associations/preloader/through_association.rb +1 -1
  24. data/lib/active_record/associations/preloader.rb +13 -10
  25. data/lib/active_record/associations/singular_association.rb +1 -1
  26. data/lib/active_record/associations/through_association.rb +22 -11
  27. data/lib/active_record/associations.rb +333 -222
  28. data/lib/active_record/attribute_assignment.rb +0 -2
  29. data/lib/active_record/attribute_methods/before_type_cast.rb +17 -0
  30. data/lib/active_record/attribute_methods/dirty.rb +53 -35
  31. data/lib/active_record/attribute_methods/primary_key.rb +76 -24
  32. data/lib/active_record/attribute_methods/query.rb +28 -16
  33. data/lib/active_record/attribute_methods/read.rb +21 -8
  34. data/lib/active_record/attribute_methods/serialization.rb +150 -31
  35. data/lib/active_record/attribute_methods/time_zone_conversion.rb +4 -4
  36. data/lib/active_record/attribute_methods/write.rb +6 -6
  37. data/lib/active_record/attribute_methods.rb +148 -26
  38. data/lib/active_record/attributes.rb +3 -3
  39. data/lib/active_record/autosave_association.rb +59 -10
  40. data/lib/active_record/base.rb +7 -2
  41. data/lib/active_record/callbacks.rb +16 -32
  42. data/lib/active_record/coders/column_serializer.rb +61 -0
  43. data/lib/active_record/coders/json.rb +1 -1
  44. data/lib/active_record/coders/yaml_column.rb +70 -42
  45. data/lib/active_record/connection_adapters/abstract/connection_handler.rb +163 -88
  46. data/lib/active_record/connection_adapters/abstract/connection_pool/queue.rb +2 -0
  47. data/lib/active_record/connection_adapters/abstract/connection_pool/reaper.rb +3 -1
  48. data/lib/active_record/connection_adapters/abstract/connection_pool.rb +80 -50
  49. data/lib/active_record/connection_adapters/abstract/database_limits.rb +5 -0
  50. data/lib/active_record/connection_adapters/abstract/database_statements.rb +129 -31
  51. data/lib/active_record/connection_adapters/abstract/query_cache.rb +62 -23
  52. data/lib/active_record/connection_adapters/abstract/quoting.rb +51 -7
  53. data/lib/active_record/connection_adapters/abstract/savepoints.rb +4 -3
  54. data/lib/active_record/connection_adapters/abstract/schema_creation.rb +18 -4
  55. data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +155 -25
  56. data/lib/active_record/connection_adapters/abstract/schema_statements.rb +297 -127
  57. data/lib/active_record/connection_adapters/abstract/transaction.rb +287 -58
  58. data/lib/active_record/connection_adapters/abstract_adapter.rb +509 -103
  59. data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +254 -125
  60. data/lib/active_record/connection_adapters/column.rb +9 -0
  61. data/lib/active_record/connection_adapters/mysql/column.rb +1 -0
  62. data/lib/active_record/connection_adapters/mysql/database_statements.rb +23 -144
  63. data/lib/active_record/connection_adapters/mysql/quoting.rb +29 -14
  64. data/lib/active_record/connection_adapters/mysql/schema_creation.rb +9 -0
  65. data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +10 -1
  66. data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +1 -1
  67. data/lib/active_record/connection_adapters/mysql/schema_statements.rb +19 -13
  68. data/lib/active_record/connection_adapters/mysql2/database_statements.rb +151 -0
  69. data/lib/active_record/connection_adapters/mysql2_adapter.rb +106 -55
  70. data/lib/active_record/connection_adapters/pool_config.rb +14 -5
  71. data/lib/active_record/connection_adapters/pool_manager.rb +19 -9
  72. data/lib/active_record/connection_adapters/postgresql/column.rb +16 -3
  73. data/lib/active_record/connection_adapters/postgresql/database_statements.rb +75 -45
  74. data/lib/active_record/connection_adapters/postgresql/oid/array.rb +1 -1
  75. data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +6 -0
  76. data/lib/active_record/connection_adapters/postgresql/oid/money.rb +3 -2
  77. data/lib/active_record/connection_adapters/postgresql/oid/range.rb +11 -2
  78. data/lib/active_record/connection_adapters/postgresql/oid/timestamp_with_time_zone.rb +2 -2
  79. data/lib/active_record/connection_adapters/postgresql/quoting.rb +41 -8
  80. data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +3 -9
  81. data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +76 -6
  82. data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +131 -2
  83. data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +53 -0
  84. data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +365 -61
  85. data/lib/active_record/connection_adapters/postgresql/utils.rb +9 -10
  86. data/lib/active_record/connection_adapters/postgresql_adapter.rb +354 -193
  87. data/lib/active_record/connection_adapters/schema_cache.rb +287 -59
  88. data/lib/active_record/connection_adapters/sqlite3/column.rb +49 -0
  89. data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +52 -39
  90. data/lib/active_record/connection_adapters/sqlite3/quoting.rb +9 -5
  91. data/lib/active_record/connection_adapters/sqlite3/schema_definitions.rb +7 -0
  92. data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +28 -9
  93. data/lib/active_record/connection_adapters/sqlite3_adapter.rb +213 -85
  94. data/lib/active_record/connection_adapters/statement_pool.rb +7 -0
  95. data/lib/active_record/connection_adapters/trilogy/database_statements.rb +99 -0
  96. data/lib/active_record/connection_adapters/trilogy_adapter.rb +258 -0
  97. data/lib/active_record/connection_adapters.rb +3 -1
  98. data/lib/active_record/connection_handling.rb +72 -95
  99. data/lib/active_record/core.rb +181 -154
  100. data/lib/active_record/counter_cache.rb +52 -27
  101. data/lib/active_record/database_configurations/connection_url_resolver.rb +1 -1
  102. data/lib/active_record/database_configurations/database_config.rb +9 -3
  103. data/lib/active_record/database_configurations/hash_config.rb +28 -14
  104. data/lib/active_record/database_configurations/url_config.rb +17 -11
  105. data/lib/active_record/database_configurations.rb +86 -33
  106. data/lib/active_record/delegated_type.rb +15 -10
  107. data/lib/active_record/deprecator.rb +7 -0
  108. data/lib/active_record/destroy_association_async_job.rb +3 -1
  109. data/lib/active_record/disable_joins_association_relation.rb +1 -1
  110. data/lib/active_record/encryption/auto_filtered_parameters.rb +66 -0
  111. data/lib/active_record/encryption/cipher/aes256_gcm.rb +4 -1
  112. data/lib/active_record/encryption/config.rb +25 -1
  113. data/lib/active_record/encryption/configurable.rb +12 -19
  114. data/lib/active_record/encryption/context.rb +10 -3
  115. data/lib/active_record/encryption/contexts.rb +5 -1
  116. data/lib/active_record/encryption/derived_secret_key_provider.rb +8 -2
  117. data/lib/active_record/encryption/encryptable_record.rb +42 -18
  118. data/lib/active_record/encryption/encrypted_attribute_type.rb +23 -8
  119. data/lib/active_record/encryption/extended_deterministic_queries.rb +66 -69
  120. data/lib/active_record/encryption/extended_deterministic_uniqueness_validator.rb +3 -3
  121. data/lib/active_record/encryption/key_generator.rb +12 -1
  122. data/lib/active_record/encryption/message_serializer.rb +2 -0
  123. data/lib/active_record/encryption/properties.rb +3 -3
  124. data/lib/active_record/encryption/scheme.rb +22 -21
  125. data/lib/active_record/encryption.rb +3 -0
  126. data/lib/active_record/enum.rb +112 -28
  127. data/lib/active_record/errors.rb +112 -18
  128. data/lib/active_record/explain.rb +23 -3
  129. data/lib/active_record/explain_subscriber.rb +1 -1
  130. data/lib/active_record/fixture_set/model_metadata.rb +14 -4
  131. data/lib/active_record/fixture_set/render_context.rb +2 -0
  132. data/lib/active_record/fixture_set/table_row.rb +29 -8
  133. data/lib/active_record/fixtures.rb +135 -71
  134. data/lib/active_record/future_result.rb +40 -5
  135. data/lib/active_record/gem_version.rb +4 -4
  136. data/lib/active_record/inheritance.rb +30 -16
  137. data/lib/active_record/insert_all.rb +57 -10
  138. data/lib/active_record/integration.rb +8 -8
  139. data/lib/active_record/internal_metadata.rb +120 -30
  140. data/lib/active_record/locking/optimistic.rb +33 -19
  141. data/lib/active_record/locking/pessimistic.rb +5 -2
  142. data/lib/active_record/log_subscriber.rb +29 -12
  143. data/lib/active_record/marshalling.rb +59 -0
  144. data/lib/active_record/message_pack.rb +124 -0
  145. data/lib/active_record/middleware/database_selector/resolver.rb +4 -0
  146. data/lib/active_record/middleware/database_selector.rb +9 -11
  147. data/lib/active_record/middleware/shard_selector.rb +3 -1
  148. data/lib/active_record/migration/command_recorder.rb +105 -7
  149. data/lib/active_record/migration/compatibility.rb +163 -58
  150. data/lib/active_record/migration/default_strategy.rb +23 -0
  151. data/lib/active_record/migration/execution_strategy.rb +19 -0
  152. data/lib/active_record/migration/pending_migration_connection.rb +21 -0
  153. data/lib/active_record/migration.rb +271 -114
  154. data/lib/active_record/model_schema.rb +69 -44
  155. data/lib/active_record/nested_attributes.rb +37 -8
  156. data/lib/active_record/normalization.rb +167 -0
  157. data/lib/active_record/persistence.rb +195 -42
  158. data/lib/active_record/promise.rb +84 -0
  159. data/lib/active_record/query_cache.rb +4 -22
  160. data/lib/active_record/query_logs.rb +87 -51
  161. data/lib/active_record/query_logs_formatter.rb +41 -0
  162. data/lib/active_record/querying.rb +15 -2
  163. data/lib/active_record/railtie.rb +107 -45
  164. data/lib/active_record/railties/controller_runtime.rb +14 -9
  165. data/lib/active_record/railties/databases.rake +144 -150
  166. data/lib/active_record/railties/job_runtime.rb +23 -0
  167. data/lib/active_record/readonly_attributes.rb +32 -5
  168. data/lib/active_record/reflection.rb +189 -45
  169. data/lib/active_record/relation/batches/batch_enumerator.rb +5 -3
  170. data/lib/active_record/relation/batches.rb +190 -61
  171. data/lib/active_record/relation/calculations.rb +232 -81
  172. data/lib/active_record/relation/delegation.rb +23 -9
  173. data/lib/active_record/relation/finder_methods.rb +77 -16
  174. data/lib/active_record/relation/merger.rb +2 -0
  175. data/lib/active_record/relation/predicate_builder/association_query_value.rb +31 -3
  176. data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +10 -7
  177. data/lib/active_record/relation/predicate_builder/relation_handler.rb +5 -1
  178. data/lib/active_record/relation/predicate_builder.rb +26 -14
  179. data/lib/active_record/relation/query_attribute.rb +25 -1
  180. data/lib/active_record/relation/query_methods.rb +408 -76
  181. data/lib/active_record/relation/spawn_methods.rb +18 -1
  182. data/lib/active_record/relation.rb +103 -37
  183. data/lib/active_record/result.rb +25 -9
  184. data/lib/active_record/runtime_registry.rb +24 -1
  185. data/lib/active_record/sanitization.rb +51 -11
  186. data/lib/active_record/schema.rb +2 -3
  187. data/lib/active_record/schema_dumper.rb +50 -7
  188. data/lib/active_record/schema_migration.rb +68 -33
  189. data/lib/active_record/scoping/default.rb +15 -5
  190. data/lib/active_record/scoping/named.rb +2 -2
  191. data/lib/active_record/scoping.rb +2 -1
  192. data/lib/active_record/secure_password.rb +60 -0
  193. data/lib/active_record/secure_token.rb +21 -3
  194. data/lib/active_record/signed_id.rb +7 -5
  195. data/lib/active_record/store.rb +9 -9
  196. data/lib/active_record/suppressor.rb +3 -1
  197. data/lib/active_record/table_metadata.rb +16 -3
  198. data/lib/active_record/tasks/database_tasks.rb +152 -108
  199. data/lib/active_record/tasks/mysql_database_tasks.rb +15 -6
  200. data/lib/active_record/tasks/postgresql_database_tasks.rb +16 -13
  201. data/lib/active_record/tasks/sqlite_database_tasks.rb +15 -7
  202. data/lib/active_record/test_fixtures.rb +114 -96
  203. data/lib/active_record/timestamp.rb +30 -16
  204. data/lib/active_record/token_for.rb +113 -0
  205. data/lib/active_record/touch_later.rb +11 -6
  206. data/lib/active_record/transactions.rb +39 -13
  207. data/lib/active_record/type/adapter_specific_registry.rb +1 -8
  208. data/lib/active_record/type/internal/timezone.rb +7 -2
  209. data/lib/active_record/type/serialized.rb +8 -4
  210. data/lib/active_record/type/time.rb +4 -0
  211. data/lib/active_record/validations/absence.rb +1 -1
  212. data/lib/active_record/validations/numericality.rb +5 -4
  213. data/lib/active_record/validations/presence.rb +5 -28
  214. data/lib/active_record/validations/uniqueness.rb +47 -2
  215. data/lib/active_record/validations.rb +8 -4
  216. data/lib/active_record/version.rb +1 -1
  217. data/lib/active_record.rb +130 -17
  218. data/lib/arel/errors.rb +10 -0
  219. data/lib/arel/factory_methods.rb +4 -0
  220. data/lib/arel/filter_predications.rb +1 -1
  221. data/lib/arel/nodes/and.rb +4 -0
  222. data/lib/arel/nodes/binary.rb +6 -1
  223. data/lib/arel/nodes/bound_sql_literal.rb +61 -0
  224. data/lib/arel/nodes/cte.rb +36 -0
  225. data/lib/arel/nodes/filter.rb +1 -1
  226. data/lib/arel/nodes/fragments.rb +35 -0
  227. data/lib/arel/nodes/homogeneous_in.rb +1 -9
  228. data/lib/arel/nodes/leading_join.rb +8 -0
  229. data/lib/arel/nodes/node.rb +111 -2
  230. data/lib/arel/nodes/sql_literal.rb +6 -0
  231. data/lib/arel/nodes/table_alias.rb +4 -0
  232. data/lib/arel/nodes.rb +4 -0
  233. data/lib/arel/predications.rb +2 -0
  234. data/lib/arel/table.rb +9 -5
  235. data/lib/arel/tree_manager.rb +5 -1
  236. data/lib/arel/visitors/mysql.rb +8 -1
  237. data/lib/arel/visitors/to_sql.rb +83 -18
  238. data/lib/arel/visitors/visitor.rb +2 -2
  239. data/lib/arel.rb +16 -2
  240. data/lib/rails/generators/active_record/application_record/USAGE +8 -0
  241. data/lib/rails/generators/active_record/migration.rb +3 -1
  242. data/lib/rails/generators/active_record/model/USAGE +113 -0
  243. data/lib/rails/generators/active_record/model/model_generator.rb +15 -6
  244. metadata +51 -15
  245. data/lib/active_record/connection_adapters/legacy_pool_manager.rb +0 -35
  246. data/lib/active_record/null_relation.rb +0 -63
@@ -96,25 +96,19 @@ module ActiveRecord
96
96
  # # Check an index with a custom name exists
97
97
  # index_exists?(:suppliers, :company_id, name: "idx_company_id")
98
98
  #
99
+ # # Check a valid index exists (PostgreSQL only)
100
+ # index_exists?(:suppliers, :company_id, valid: true)
101
+ #
99
102
  def index_exists?(table_name, column_name, **options)
100
- checks = []
101
-
102
- if column_name.present?
103
- column_names = Array(column_name).map(&:to_s)
104
- checks << lambda { |i| Array(i.columns) == column_names }
105
- end
106
-
107
- checks << lambda { |i| i.unique } if options[:unique]
108
- checks << lambda { |i| i.name == options[:name].to_s } if options[:name]
109
-
110
- indexes(table_name).any? { |i| checks.all? { |check| check[i] } }
103
+ indexes(table_name).any? { |i| i.defined_for?(column_name, **options) }
111
104
  end
112
105
 
113
106
  # Returns an array of +Column+ objects for the table specified by +table_name+.
114
107
  def columns(table_name)
115
108
  table_name = table_name.to_s
116
- column_definitions(table_name).map do |field|
117
- new_column_from_field(table_name, field)
109
+ definitions = column_definitions(table_name)
110
+ definitions.map do |field|
111
+ new_column_from_field(table_name, field, definitions)
118
112
  end
119
113
  end
120
114
 
@@ -263,7 +257,7 @@ module ActiveRecord
263
257
  #
264
258
  # generates:
265
259
  #
266
- # CREATE TABLE order (
260
+ # CREATE TABLE orders (
267
261
  # product_id bigint NOT NULL,
268
262
  # client_id bigint NOT NULL
269
263
  # );
@@ -296,25 +290,10 @@ module ActiveRecord
296
290
  # SELECT * FROM orders INNER JOIN line_items ON order_id=orders.id
297
291
  #
298
292
  # See also TableDefinition#column for details on how to create columns.
299
- def create_table(table_name, id: :primary_key, primary_key: nil, force: nil, **options)
300
- td = create_table_definition(table_name, **extract_table_options!(options))
301
-
302
- if id && !td.as
303
- pk = primary_key || Base.get_primary_key(table_name.to_s.singularize)
304
-
305
- if id.is_a?(Hash)
306
- options.merge!(id.except(:type))
307
- id = id.fetch(:type, :primary_key)
308
- end
309
-
310
- if pk.is_a?(Array)
311
- td.primary_keys pk
312
- else
313
- td.primary_key pk, id, **options
314
- end
315
- end
316
-
317
- yield td if block_given?
293
+ def create_table(table_name, id: :primary_key, primary_key: nil, force: nil, **options, &block)
294
+ validate_create_table_options!(options)
295
+ validate_table_length!(table_name) unless options[:_uses_legacy_table_name]
296
+ td = build_create_table_definition(table_name, id: id, primary_key: primary_key, force: force, **options, &block)
318
297
 
319
298
  if force
320
299
  drop_table(table_name, force: force, if_exists: true)
@@ -322,7 +301,7 @@ module ActiveRecord
322
301
  schema_cache.clear_data_source_cache!(table_name.to_s)
323
302
  end
324
303
 
325
- result = execute schema_creation.accept td
304
+ result = execute schema_creation.accept(td)
326
305
 
327
306
  unless supports_indexes_in_create?
328
307
  td.indexes.each do |column_name, index_options|
@@ -343,6 +322,18 @@ module ActiveRecord
343
322
  result
344
323
  end
345
324
 
325
+ # Returns a TableDefinition object containing information about the table that would be created
326
+ # if the same arguments were passed to #create_table. See #create_table for information about
327
+ # passing a +table_name+, and other additional options that can be passed.
328
+ def build_create_table_definition(table_name, id: :primary_key, primary_key: nil, force: nil, **options)
329
+ table_definition = create_table_definition(table_name, **options.extract!(*valid_table_definition_options, :_skip_validate_options))
330
+ table_definition.set_primary_key(table_name, id, primary_key, **options.extract!(*valid_primary_key_options, :_skip_validate_options))
331
+
332
+ yield table_definition if block_given?
333
+
334
+ table_definition
335
+ end
336
+
346
337
  # Creates a new join table with the name created using the lexical order of the first two
347
338
  # arguments. These arguments can be a String or a Symbol.
348
339
  #
@@ -386,7 +377,7 @@ module ActiveRecord
386
377
 
387
378
  column_options.reverse_merge!(null: false, index: false)
388
379
 
389
- t1_ref, t2_ref = [table_1, table_2].map { |t| t.to_s.singularize }
380
+ t1_ref, t2_ref = [table_1, table_2].map { |t| reference_name_for_table(t) }
390
381
 
391
382
  create_table(join_table_name, **options.merge!(id: false)) do |td|
392
383
  td.references t1_ref, **column_options
@@ -395,15 +386,33 @@ module ActiveRecord
395
386
  end
396
387
  end
397
388
 
389
+ # Builds a TableDefinition object for a join table.
390
+ #
391
+ # This definition object contains information about the table that would be created
392
+ # if the same arguments were passed to #create_join_table. See #create_join_table for
393
+ # information about what arguments should be passed.
394
+ def build_create_join_table_definition(table_1, table_2, column_options: {}, **options) # :nodoc:
395
+ join_table_name = find_join_table_name(table_1, table_2, options)
396
+ column_options.reverse_merge!(null: false, index: false)
397
+
398
+ t1_ref, t2_ref = [table_1, table_2].map { |t| reference_name_for_table(t) }
399
+
400
+ build_create_table_definition(join_table_name, **options.merge!(id: false)) do |td|
401
+ td.references t1_ref, **column_options
402
+ td.references t2_ref, **column_options
403
+ yield td if block_given?
404
+ end
405
+ end
406
+
398
407
  # Drops the join table specified by the given arguments.
399
- # See #create_join_table for details.
408
+ # See #create_join_table and #drop_table for details.
400
409
  #
401
410
  # Although this command ignores the block if one is given, it can be helpful
402
411
  # to provide one in a migration's +change+ method so it can be reverted.
403
412
  # In that case, the block will be used by #create_join_table.
404
413
  def drop_join_table(table_1, table_2, **options)
405
414
  join_table_name = find_join_table_name(table_1, table_2, options)
406
- drop_table(join_table_name)
415
+ drop_table(join_table_name, **options)
407
416
  end
408
417
 
409
418
  # A block for changing columns in +table+.
@@ -484,13 +493,13 @@ module ActiveRecord
484
493
  # end
485
494
  #
486
495
  # See also Table for details on all of the various column transformations.
487
- def change_table(table_name, **options)
496
+ def change_table(table_name, base = self, **options)
488
497
  if supports_bulk_alter? && options[:bulk]
489
498
  recorder = ActiveRecord::Migration::CommandRecorder.new(self)
490
499
  yield update_table_definition(table_name, recorder)
491
500
  bulk_change_table(table_name, recorder.commands)
492
501
  else
493
- yield update_table_definition(table_name, self)
502
+ yield update_table_definition(table_name, base)
494
503
  end
495
504
  end
496
505
 
@@ -498,7 +507,7 @@ module ActiveRecord
498
507
  #
499
508
  # rename_table('octopuses', 'octopi')
500
509
  #
501
- def rename_table(table_name, new_name)
510
+ def rename_table(table_name, new_name, **)
502
511
  raise NotImplementedError, "rename_table is not implemented"
503
512
  end
504
513
 
@@ -553,11 +562,6 @@ module ActiveRecord
553
562
  # <tt>:datetime</tt>, and <tt>:time</tt> columns.
554
563
  # * <tt>:scale</tt> -
555
564
  # Specifies the scale for the <tt>:decimal</tt> and <tt>:numeric</tt> columns.
556
- # * <tt>:collation</tt> -
557
- # Specifies the collation for a <tt>:string</tt> or <tt>:text</tt> column. If not specified, the
558
- # column will have the same collation as the table.
559
- # * <tt>:comment</tt> -
560
- # Specifies the comment for the column. This option is ignored by some backends.
561
565
  # * <tt>:if_not_exists</tt> -
562
566
  # Specifies if the column already exists to not try to re-add it. This will avoid
563
567
  # duplicate column errors.
@@ -573,7 +577,7 @@ module ActiveRecord
573
577
  # * The SQL standard says the default scale should be 0, <tt>:scale</tt> <=
574
578
  # <tt>:precision</tt>, and makes no comments about the requirements of
575
579
  # <tt>:precision</tt>.
576
- # * MySQL: <tt>:precision</tt> [1..63], <tt>:scale</tt> [0..30].
580
+ # * MySQL: <tt>:precision</tt> [1..65], <tt>:scale</tt> [0..30].
577
581
  # Default is (10,0).
578
582
  # * PostgreSQL: <tt>:precision</tt> [1..infinity],
579
583
  # <tt>:scale</tt> [0..infinity]. No default.
@@ -614,6 +618,24 @@ module ActiveRecord
614
618
  # # Ignores the method call if the column exists
615
619
  # add_column(:shapes, :triangle, 'polygon', if_not_exists: true)
616
620
  def add_column(table_name, column_name, type, **options)
621
+ add_column_def = build_add_column_definition(table_name, column_name, type, **options)
622
+ return unless add_column_def
623
+
624
+ execute schema_creation.accept(add_column_def)
625
+ end
626
+
627
+ def add_columns(table_name, *column_names, type:, **options) # :nodoc:
628
+ column_names.each do |column_name|
629
+ add_column(table_name, column_name, type, **options)
630
+ end
631
+ end
632
+
633
+ # Builds an AlterTable object for adding a column to a table.
634
+ #
635
+ # This definition object contains information about the column that would be created
636
+ # if the same arguments were passed to #add_column. See #add_column for information about
637
+ # passing a +table_name+, +column_name+, +type+ and other options that can be passed.
638
+ def build_add_column_definition(table_name, column_name, type, **options) # :nodoc:
617
639
  return if options[:if_not_exists] == true && column_exists?(table_name, column_name)
618
640
 
619
641
  if supports_datetime_with_precision?
@@ -622,15 +644,9 @@ module ActiveRecord
622
644
  end
623
645
  end
624
646
 
625
- at = create_alter_table table_name
626
- at.add_column(column_name, type, **options)
627
- execute schema_creation.accept at
628
- end
629
-
630
- def add_columns(table_name, *column_names, type:, **options) # :nodoc:
631
- column_names.each do |column_name|
632
- add_column(table_name, column_name, type, **options)
633
- end
647
+ alter_table = create_alter_table(table_name)
648
+ alter_table.add_column(column_name, type, **options)
649
+ alter_table
634
650
  end
635
651
 
636
652
  # Removes the given columns from the table definition.
@@ -698,6 +714,15 @@ module ActiveRecord
698
714
  raise NotImplementedError, "change_column_default is not implemented"
699
715
  end
700
716
 
717
+ # Builds a ChangeColumnDefaultDefinition object.
718
+ #
719
+ # This definition object contains information about the column change that would occur
720
+ # if the same arguments were passed to #change_column_default. See #change_column_default for
721
+ # information about passing a +table_name+, +column_name+, +type+ and other options that can be passed.
722
+ def build_change_column_default_definition(table_name, column_name, default_or_changes) # :nodoc:
723
+ raise NotImplementedError, "build_change_column_default_definition is not implemented"
724
+ end
725
+
701
726
  # Sets or removes a <tt>NOT NULL</tt> constraint on a column. The +null+ flag
702
727
  # indicates whether the value can be +NULL+. For example
703
728
  #
@@ -804,6 +829,16 @@ module ActiveRecord
804
829
  #
805
830
  # Note: Partial indexes are only supported for PostgreSQL and SQLite.
806
831
  #
832
+ # ====== Creating an index that includes additional columns
833
+ #
834
+ # add_index(:accounts, :branch_id, include: :party_id)
835
+ #
836
+ # generates:
837
+ #
838
+ # CREATE INDEX index_accounts_on_branch_id ON accounts USING btree(branch_id) INCLUDE (party_id)
839
+ #
840
+ # Note: only supported by PostgreSQL.
841
+ #
807
842
  # ====== Creating an index with a specific method
808
843
  #
809
844
  # add_index(:developers, :name, using: 'btree')
@@ -849,12 +884,20 @@ module ActiveRecord
849
884
  #
850
885
  # For more information see the {"Transactional Migrations" section}[rdoc-ref:Migration].
851
886
  def add_index(table_name, column_name, **options)
852
- index, algorithm, if_not_exists = add_index_options(table_name, column_name, **options)
853
-
854
- create_index = CreateIndexDefinition.new(index, algorithm, if_not_exists)
887
+ create_index = build_create_index_definition(table_name, column_name, **options)
855
888
  execute schema_creation.accept(create_index)
856
889
  end
857
890
 
891
+ # Builds a CreateIndexDefinition object.
892
+ #
893
+ # This definition object contains information about the index that would be created
894
+ # if the same arguments were passed to #add_index. See #add_index for information about
895
+ # passing a +table_name+, +column_name+, and other additional options that can be passed.
896
+ def build_create_index_definition(table_name, column_name, **options) # :nodoc:
897
+ index, algorithm, if_not_exists = add_index_options(table_name, column_name, **options)
898
+ CreateIndexDefinition.new(index, algorithm, if_not_exists)
899
+ end
900
+
858
901
  # Removes the given index from the table.
859
902
  #
860
903
  # Removes the index on +branch_id+ in the +accounts+ table if exactly one such index exists.
@@ -920,7 +963,11 @@ module ActiveRecord
920
963
  def index_name(table_name, options) # :nodoc:
921
964
  if Hash === options
922
965
  if options[:column]
923
- "index_#{table_name}_on_#{Array(options[:column]) * '_and_'}"
966
+ if options[:_uses_legacy_index_name]
967
+ "index_#{table_name}_on_#{Array(options[:column]) * '_and_'}"
968
+ else
969
+ generate_index_name(table_name, options[:column])
970
+ end
924
971
  elsif options[:name]
925
972
  options[:name]
926
973
  else
@@ -940,7 +987,6 @@ module ActiveRecord
940
987
  # Adds a reference. The reference column is a bigint by default,
941
988
  # the <tt>:type</tt> option can be used to specify a different type.
942
989
  # Optionally adds a +_type+ column, if <tt>:polymorphic</tt> option is provided.
943
- # #add_reference and #add_belongs_to are acceptable.
944
990
  #
945
991
  # The +options+ hash can include the following keys:
946
992
  # [<tt>:type</tt>]
@@ -986,12 +1032,11 @@ module ActiveRecord
986
1032
  # add_reference(:products, :supplier, foreign_key: { to_table: :firms })
987
1033
  #
988
1034
  def add_reference(table_name, ref_name, **options)
989
- ReferenceDefinition.new(ref_name, **options).add_to(update_table_definition(table_name, self))
1035
+ ReferenceDefinition.new(ref_name, **options).add(table_name, self)
990
1036
  end
991
1037
  alias :add_belongs_to :add_reference
992
1038
 
993
1039
  # Removes the reference(s). Also removes a +type+ column if one exists.
994
- # #remove_reference and #remove_belongs_to are acceptable.
995
1040
  #
996
1041
  # ====== Remove the reference
997
1042
  #
@@ -1006,19 +1051,21 @@ module ActiveRecord
1006
1051
  # remove_reference(:products, :user, foreign_key: true)
1007
1052
  #
1008
1053
  def remove_reference(table_name, ref_name, foreign_key: false, polymorphic: false, **options)
1054
+ conditional_options = options.slice(:if_exists, :if_not_exists)
1055
+
1009
1056
  if foreign_key
1010
1057
  reference_name = Base.pluralize_table_names ? ref_name.to_s.pluralize : ref_name
1011
1058
  if foreign_key.is_a?(Hash)
1012
- foreign_key_options = foreign_key
1059
+ foreign_key_options = foreign_key.merge(conditional_options)
1013
1060
  else
1014
- foreign_key_options = { to_table: reference_name }
1061
+ foreign_key_options = { to_table: reference_name, **conditional_options }
1015
1062
  end
1016
1063
  foreign_key_options[:column] ||= "#{ref_name}_id"
1017
1064
  remove_foreign_key(table_name, **foreign_key_options)
1018
1065
  end
1019
1066
 
1020
- remove_column(table_name, "#{ref_name}_id")
1021
- remove_column(table_name, "#{ref_name}_type") if polymorphic
1067
+ remove_column(table_name, "#{ref_name}_id", **conditional_options)
1068
+ remove_column(table_name, "#{ref_name}_type", **conditional_options) if polymorphic
1022
1069
  end
1023
1070
  alias :remove_belongs_to :remove_reference
1024
1071
 
@@ -1055,6 +1102,16 @@ module ActiveRecord
1055
1102
  #
1056
1103
  # ALTER TABLE "articles" ADD CONSTRAINT fk_rails_58ca3d3a82 FOREIGN KEY ("author_id") REFERENCES "users" ("lng_id")
1057
1104
  #
1105
+ # ====== Creating a composite foreign key
1106
+ #
1107
+ # Assuming "carts" table has "(shop_id, user_id)" as a primary key.
1108
+ #
1109
+ # add_foreign_key :orders, :carts, primary_key: [:shop_id, :user_id]
1110
+ #
1111
+ # generates:
1112
+ #
1113
+ # ALTER TABLE "orders" ADD CONSTRAINT fk_rails_6f5e4cb3a4 FOREIGN KEY ("cart_shop_id", "cart_user_id") REFERENCES "carts" ("shop_id", "user_id")
1114
+ #
1058
1115
  # ====== Creating a cascading foreign key
1059
1116
  #
1060
1117
  # add_foreign_key :articles, :authors, on_delete: :cascade
@@ -1065,9 +1122,11 @@ module ActiveRecord
1065
1122
  #
1066
1123
  # The +options+ hash can include the following keys:
1067
1124
  # [<tt>:column</tt>]
1068
- # The foreign key column name on +from_table+. Defaults to <tt>to_table.singularize + "_id"</tt>
1125
+ # The foreign key column name on +from_table+. Defaults to <tt>to_table.singularize + "_id"</tt>.
1126
+ # Pass an array to create a composite foreign key.
1069
1127
  # [<tt>:primary_key</tt>]
1070
1128
  # The primary key column name on +to_table+. Defaults to +id+.
1129
+ # Pass an array to create a composite foreign key.
1071
1130
  # [<tt>:name</tt>]
1072
1131
  # The constraint name. Defaults to <tt>fk_rails_<identifier></tt>.
1073
1132
  # [<tt>:on_delete</tt>]
@@ -1083,8 +1142,8 @@ module ActiveRecord
1083
1142
  # (PostgreSQL only) Specify whether or not the foreign key should be deferrable. Valid values are booleans or
1084
1143
  # +:deferred+ or +:immediate+ to specify the default behavior. Defaults to +false+.
1085
1144
  def add_foreign_key(from_table, to_table, **options)
1086
- return unless supports_foreign_keys?
1087
- return if options[:if_not_exists] == true && foreign_key_exists?(from_table, to_table)
1145
+ return unless use_foreign_keys?
1146
+ return if options[:if_not_exists] == true && foreign_key_exists?(from_table, to_table, **options.slice(:column))
1088
1147
 
1089
1148
  options = foreign_key_options(from_table, to_table, options)
1090
1149
  at = create_alter_table from_table
@@ -1124,7 +1183,7 @@ module ActiveRecord
1124
1183
  # [<tt>:to_table</tt>]
1125
1184
  # The name of the table that contains the referenced primary key.
1126
1185
  def remove_foreign_key(from_table, to_table = nil, **options)
1127
- return unless supports_foreign_keys?
1186
+ return unless use_foreign_keys?
1128
1187
  return if options.delete(:if_exists) == true && !foreign_key_exists?(from_table, to_table)
1129
1188
 
1130
1189
  fk_name_to_delete = foreign_key_for!(from_table, to_table: to_table, **options).name
@@ -1150,15 +1209,33 @@ module ActiveRecord
1150
1209
  foreign_key_for(from_table, to_table: to_table, **options).present?
1151
1210
  end
1152
1211
 
1153
- def foreign_key_column_for(table_name) # :nodoc:
1212
+ def foreign_key_column_for(table_name, column_name) # :nodoc:
1154
1213
  name = strip_table_name_prefix_and_suffix(table_name)
1155
- "#{name.singularize}_id"
1214
+ "#{name.singularize}_#{column_name}"
1156
1215
  end
1157
1216
 
1158
1217
  def foreign_key_options(from_table, to_table, options) # :nodoc:
1159
1218
  options = options.dup
1160
- options[:column] ||= foreign_key_column_for(to_table)
1219
+
1220
+ if options[:primary_key].is_a?(Array)
1221
+ options[:column] ||= options[:primary_key].map do |pk_column|
1222
+ foreign_key_column_for(to_table, pk_column)
1223
+ end
1224
+ else
1225
+ options[:column] ||= foreign_key_column_for(to_table, "id")
1226
+ end
1227
+
1161
1228
  options[:name] ||= foreign_key_name(from_table, options)
1229
+
1230
+ if options[:column].is_a?(Array) || options[:primary_key].is_a?(Array)
1231
+ if Array(options[:primary_key]).size != Array(options[:column]).size
1232
+ raise ArgumentError, <<~MSG.squish
1233
+ For composite primary keys, specify :column and :primary_key, where
1234
+ :column must reference all the :primary_key columns from #{to_table.inspect}
1235
+ MSG
1236
+ end
1237
+ end
1238
+
1162
1239
  options
1163
1240
  end
1164
1241
 
@@ -1180,12 +1257,16 @@ module ActiveRecord
1180
1257
  # The +options+ hash can include the following keys:
1181
1258
  # [<tt>:name</tt>]
1182
1259
  # The constraint name. Defaults to <tt>chk_rails_<identifier></tt>.
1260
+ # [<tt>:if_not_exists</tt>]
1261
+ # Silently ignore if the constraint already exists, rather than raise an error.
1183
1262
  # [<tt>:validate</tt>]
1184
1263
  # (PostgreSQL only) Specify whether or not the constraint should be validated. Defaults to +true+.
1185
- def add_check_constraint(table_name, expression, **options)
1264
+ def add_check_constraint(table_name, expression, if_not_exists: false, **options)
1186
1265
  return unless supports_check_constraints?
1187
1266
 
1188
1267
  options = check_constraint_options(table_name, expression, options)
1268
+ return if if_not_exists && check_constraint_exists?(table_name, **options)
1269
+
1189
1270
  at = create_alter_table(table_name)
1190
1271
  at.add_check_constraint(expression, options)
1191
1272
 
@@ -1198,16 +1279,24 @@ module ActiveRecord
1198
1279
  options
1199
1280
  end
1200
1281
 
1201
- # Removes the given check constraint from the table.
1282
+ # Removes the given check constraint from the table. Removing a check constraint
1283
+ # that does not exist will raise an error.
1202
1284
  #
1203
1285
  # remove_check_constraint :products, name: "price_check"
1204
1286
  #
1287
+ # To silently ignore a non-existent check constraint rather than raise an error,
1288
+ # use the +if_exists+ option.
1289
+ #
1290
+ # remove_check_constraint :products, name: "price_check", if_exists: true
1291
+ #
1205
1292
  # The +expression+ parameter will be ignored if present. It can be helpful
1206
1293
  # to provide this in a migration's +change+ method so it can be reverted.
1207
1294
  # In that case, +expression+ will be used by #add_check_constraint.
1208
- def remove_check_constraint(table_name, expression = nil, **options)
1295
+ def remove_check_constraint(table_name, expression = nil, if_exists: false, **options)
1209
1296
  return unless supports_check_constraints?
1210
1297
 
1298
+ return if if_exists && !check_constraint_exists?(table_name, **options)
1299
+
1211
1300
  chk_name_to_delete = check_constraint_for!(table_name, expression: expression, **options).name
1212
1301
 
1213
1302
  at = create_alter_table(table_name)
@@ -1216,8 +1305,20 @@ module ActiveRecord
1216
1305
  execute schema_creation.accept(at)
1217
1306
  end
1218
1307
 
1308
+
1309
+ # Checks to see if a check constraint exists on a table for a given check constraint definition.
1310
+ #
1311
+ # check_constraint_exists?(:products, name: "price_check")
1312
+ #
1313
+ def check_constraint_exists?(table_name, **options)
1314
+ if !options.key?(:name) && !options.key?(:expression)
1315
+ raise ArgumentError, "At least one of :name or :expression must be supplied"
1316
+ end
1317
+ check_constraint_for(table_name, **options).present?
1318
+ end
1319
+
1219
1320
  def dump_schema_information # :nodoc:
1220
- versions = schema_migration.all_versions
1321
+ versions = schema_migration.versions
1221
1322
  insert_versions_sql(versions) if versions.any?
1222
1323
  end
1223
1324
 
@@ -1290,18 +1391,24 @@ module ActiveRecord
1290
1391
  end
1291
1392
 
1292
1393
  def distinct_relation_for_primary_key(relation) # :nodoc:
1394
+ primary_key_columns = Array(relation.primary_key).map do |column|
1395
+ visitor.compile(relation.table[column])
1396
+ end
1397
+
1293
1398
  values = columns_for_distinct(
1294
- visitor.compile(relation.table[relation.primary_key]),
1399
+ primary_key_columns,
1295
1400
  relation.order_values
1296
1401
  )
1297
1402
 
1298
1403
  limited = relation.reselect(values).distinct!
1299
- limited_ids = select_rows(limited.arel, "SQL").map(&:last)
1404
+ limited_ids = select_rows(limited.arel, "SQL").map do |results|
1405
+ results.last(Array(relation.primary_key).length) # ignores order values for MySQL and PostgreSQL
1406
+ end
1300
1407
 
1301
1408
  if limited_ids.empty?
1302
1409
  relation.none!
1303
1410
  else
1304
- relation.where!(relation.primary_key => limited_ids)
1411
+ relation.where!(**Array(relation.primary_key).zip(limited_ids.transpose).to_h)
1305
1412
  end
1306
1413
 
1307
1414
  relation.limit_value = relation.offset_value = nil
@@ -1314,14 +1421,8 @@ module ActiveRecord
1314
1421
  # add_timestamps(:suppliers, null: true)
1315
1422
  #
1316
1423
  def add_timestamps(table_name, **options)
1317
- options[:null] = false if options[:null].nil?
1318
-
1319
- if !options.key?(:precision) && supports_datetime_with_precision?
1320
- options[:precision] = 6
1321
- end
1322
-
1323
- add_column table_name, :created_at, :datetime, **options
1324
- add_column table_name, :updated_at, :datetime, **options
1424
+ fragments = add_timestamps_for_alter(table_name, **options)
1425
+ execute "ALTER TABLE #{quote_table_name(table_name)} #{fragments.join(', ')}"
1325
1426
  end
1326
1427
 
1327
1428
  # Removes the timestamp columns (+created_at+ and +updated_at+) from the table definition.
@@ -1337,7 +1438,7 @@ module ActiveRecord
1337
1438
  end
1338
1439
 
1339
1440
  def add_index_options(table_name, column_name, name: nil, if_not_exists: false, internal: false, **options) # :nodoc:
1340
- options.assert_valid_keys(:unique, :length, :order, :opclass, :where, :type, :using, :comment, :algorithm)
1441
+ options.assert_valid_keys(:unique, :length, :order, :opclass, :where, :type, :using, :comment, :algorithm, :include, :nulls_not_distinct)
1341
1442
 
1342
1443
  column_names = index_column_names(column_name)
1343
1444
 
@@ -1356,6 +1457,8 @@ module ActiveRecord
1356
1457
  where: options[:where],
1357
1458
  type: options[:type],
1358
1459
  using: options[:using],
1460
+ include: options[:include],
1461
+ nulls_not_distinct: options[:nulls_not_distinct],
1359
1462
  comment: options[:comment]
1360
1463
  )
1361
1464
 
@@ -1403,7 +1506,79 @@ module ActiveRecord
1403
1506
  SchemaDumper.create(self, options)
1404
1507
  end
1405
1508
 
1509
+ def use_foreign_keys?
1510
+ supports_foreign_keys? && foreign_keys_enabled?
1511
+ end
1512
+
1513
+ # Returns an instance of SchemaCreation, which can be used to visit a schema definition
1514
+ # object and return DDL.
1515
+ def schema_creation # :nodoc:
1516
+ SchemaCreation.new(self)
1517
+ end
1518
+
1519
+ def bulk_change_table(table_name, operations) # :nodoc:
1520
+ sql_fragments = []
1521
+ non_combinable_operations = []
1522
+
1523
+ operations.each do |command, args|
1524
+ table, arguments = args.shift, args
1525
+ method = :"#{command}_for_alter"
1526
+
1527
+ if respond_to?(method, true)
1528
+ sqls, procs = Array(send(method, table, *arguments)).partition { |v| v.is_a?(String) }
1529
+ sql_fragments.concat(sqls)
1530
+ non_combinable_operations.concat(procs)
1531
+ else
1532
+ execute "ALTER TABLE #{quote_table_name(table_name)} #{sql_fragments.join(", ")}" unless sql_fragments.empty?
1533
+ non_combinable_operations.each(&:call)
1534
+ sql_fragments = []
1535
+ non_combinable_operations = []
1536
+ send(command, table, *arguments)
1537
+ end
1538
+ end
1539
+
1540
+ execute "ALTER TABLE #{quote_table_name(table_name)} #{sql_fragments.join(", ")}" unless sql_fragments.empty?
1541
+ non_combinable_operations.each(&:call)
1542
+ end
1543
+
1544
+ def valid_table_definition_options # :nodoc:
1545
+ [:temporary, :if_not_exists, :options, :as, :comment, :charset, :collation]
1546
+ end
1547
+
1548
+ def valid_column_definition_options # :nodoc:
1549
+ ColumnDefinition::OPTION_NAMES
1550
+ end
1551
+
1552
+ def valid_primary_key_options # :nodoc:
1553
+ [:limit, :default, :precision]
1554
+ end
1555
+
1556
+ # Returns the maximum length of an index name in bytes.
1557
+ def max_index_name_size
1558
+ 62
1559
+ end
1560
+
1406
1561
  private
1562
+ def generate_index_name(table_name, column)
1563
+ name = "index_#{table_name}_on_#{Array(column) * '_and_'}"
1564
+ return name if name.bytesize <= max_index_name_size
1565
+
1566
+ # Fallback to short version, add hash to ensure uniqueness
1567
+ hashed_identifier = "_" + OpenSSL::Digest::SHA256.hexdigest(name).first(10)
1568
+ name = "idx_on_#{Array(column) * '_'}"
1569
+
1570
+ short_limit = max_index_name_size - hashed_identifier.bytesize
1571
+ short_name = name.mb_chars.limit(short_limit).to_s
1572
+
1573
+ "#{short_name}#{hashed_identifier}"
1574
+ end
1575
+
1576
+ def validate_change_column_null_argument!(value)
1577
+ unless value == true || value == false
1578
+ raise ArgumentError, "change_column_null expects a boolean value (true for NULL, false for NOT NULL). Got: #{value.inspect}"
1579
+ end
1580
+ end
1581
+
1407
1582
  def column_options_keys
1408
1583
  [:limit, :precision, :scale, :default, :null, :collation, :comment]
1409
1584
  end
@@ -1457,7 +1632,7 @@ module ActiveRecord
1457
1632
 
1458
1633
  if matching_indexes.count > 1
1459
1634
  raise ArgumentError, "Multiple indexes found on #{table_name} columns #{column_names}. " \
1460
- "Specify an index name from #{matching_indexes.map(&:name).join(', ')}"
1635
+ "Specify an index name from #{matching_indexes.map(&:name).join(', ')}"
1461
1636
  elsif matching_indexes.none?
1462
1637
  raise ArgumentError, "No indexes found on #{table_name} with the options provided."
1463
1638
  else
@@ -1465,11 +1640,11 @@ module ActiveRecord
1465
1640
  end
1466
1641
  end
1467
1642
 
1468
- def rename_table_indexes(table_name, new_name)
1643
+ def rename_table_indexes(table_name, new_name, **options)
1469
1644
  indexes(new_name).each do |index|
1470
- generated_index_name = index_name(table_name, column: index.columns)
1645
+ generated_index_name = index_name(table_name, column: index.columns, **options)
1471
1646
  if generated_index_name == index.name
1472
- rename_index new_name, generated_index_name, index_name(new_name, column: index.columns)
1647
+ rename_index new_name, generated_index_name, index_name(new_name, column: index.columns, **options)
1473
1648
  end
1474
1649
  end
1475
1650
  end
@@ -1487,10 +1662,6 @@ module ActiveRecord
1487
1662
  end
1488
1663
  end
1489
1664
 
1490
- def schema_creation
1491
- SchemaCreation.new(self)
1492
- end
1493
-
1494
1665
  def create_table_definition(name, **options)
1495
1666
  TableDefinition.new(self, name, **options)
1496
1667
  end
@@ -1499,8 +1670,12 @@ module ActiveRecord
1499
1670
  AlterTable.new create_table_definition(name)
1500
1671
  end
1501
1672
 
1502
- def extract_table_options!(options)
1503
- options.extract!(:temporary, :if_not_exists, :options, :as, :comment, :charset, :collation)
1673
+ def validate_create_table_options!(options)
1674
+ unless options[:_skip_validate_options]
1675
+ options
1676
+ .except(:_uses_legacy_table_name, :_skip_validate_options)
1677
+ .assert_valid_keys(valid_table_definition_options, valid_primary_key_options)
1678
+ end
1504
1679
  end
1505
1680
 
1506
1681
  def fetch_type_metadata(sql_type)
@@ -1543,7 +1718,8 @@ module ActiveRecord
1543
1718
 
1544
1719
  def foreign_key_name(table_name, options)
1545
1720
  options.fetch(:name) do
1546
- identifier = "#{table_name}_#{options.fetch(:column)}_fk"
1721
+ columns = Array(options.fetch(:column)).map(&:to_s)
1722
+ identifier = "#{table_name}_#{columns * '_and_'}_fk"
1547
1723
  hashed_identifier = OpenSSL::Digest::SHA256.hexdigest(identifier).first(10)
1548
1724
 
1549
1725
  "fk_rails_#{hashed_identifier}"
@@ -1551,7 +1727,7 @@ module ActiveRecord
1551
1727
  end
1552
1728
 
1553
1729
  def foreign_key_for(from_table, **options)
1554
- return unless supports_foreign_keys?
1730
+ return unless use_foreign_keys?
1555
1731
  foreign_keys(from_table).detect { |fk| fk.defined_for?(**options) }
1556
1732
  end
1557
1733
 
@@ -1568,6 +1744,10 @@ module ActiveRecord
1568
1744
  end
1569
1745
  end
1570
1746
 
1747
+ def foreign_keys_enabled?
1748
+ @config.fetch(:foreign_keys, true)
1749
+ end
1750
+
1571
1751
  def check_constraint_name(table_name, **options)
1572
1752
  options.fetch(:name) do
1573
1753
  expression = options.fetch(:expression)
@@ -1581,7 +1761,7 @@ module ActiveRecord
1581
1761
  def check_constraint_for(table_name, **options)
1582
1762
  return unless supports_check_constraints?
1583
1763
  chk_name = check_constraint_name(table_name, **options)
1584
- check_constraints(table_name).detect { |chk| chk.name == chk_name }
1764
+ check_constraints(table_name).detect { |chk| chk.defined_for?(name: chk_name, **options) }
1585
1765
  end
1586
1766
 
1587
1767
  def check_constraint_for!(table_name, expression: nil, **options)
@@ -1595,6 +1775,12 @@ module ActiveRecord
1595
1775
  end
1596
1776
  end
1597
1777
 
1778
+ def validate_table_length!(table_name)
1779
+ if table_name.length > table_name_length
1780
+ raise ArgumentError, "Table name '#{table_name}' is too long; the limit is #{table_name_length} characters"
1781
+ end
1782
+ end
1783
+
1598
1784
  def extract_new_default_value(default_or_changes)
1599
1785
  if default_or_changes.is_a?(Hash) && default_or_changes.has_key?(:from) && default_or_changes.has_key?(:to)
1600
1786
  default_or_changes[:to]
@@ -1608,29 +1794,8 @@ module ActiveRecord
1608
1794
  column_name.nil? && options.key?(:name) && options.except(:name, :algorithm).empty?
1609
1795
  end
1610
1796
 
1611
- def bulk_change_table(table_name, operations)
1612
- sql_fragments = []
1613
- non_combinable_operations = []
1614
-
1615
- operations.each do |command, args|
1616
- table, arguments = args.shift, args
1617
- method = :"#{command}_for_alter"
1618
-
1619
- if respond_to?(method, true)
1620
- sqls, procs = Array(send(method, table, *arguments)).partition { |v| v.is_a?(String) }
1621
- sql_fragments << sqls
1622
- non_combinable_operations.concat(procs)
1623
- else
1624
- execute "ALTER TABLE #{quote_table_name(table_name)} #{sql_fragments.join(", ")}" unless sql_fragments.empty?
1625
- non_combinable_operations.each(&:call)
1626
- sql_fragments = []
1627
- non_combinable_operations = []
1628
- send(command, table, *arguments)
1629
- end
1630
- end
1631
-
1632
- execute "ALTER TABLE #{quote_table_name(table_name)} #{sql_fragments.join(", ")}" unless sql_fragments.empty?
1633
- non_combinable_operations.each(&:call)
1797
+ def reference_name_for_table(table_name)
1798
+ table_name.to_s.singularize
1634
1799
  end
1635
1800
 
1636
1801
  def add_column_for_alter(table_name, column_name, type, **options)
@@ -1639,6 +1804,11 @@ module ActiveRecord
1639
1804
  schema_creation.accept(AddColumnDefinition.new(cd))
1640
1805
  end
1641
1806
 
1807
+ def change_column_default_for_alter(table_name, column_name, default_or_changes)
1808
+ cd = build_change_column_default_definition(table_name, column_name, default_or_changes)
1809
+ schema_creation.accept(cd)
1810
+ end
1811
+
1642
1812
  def rename_column_sql(table_name, column_name, new_column_name)
1643
1813
  "RENAME COLUMN #{quote_column_name(column_name)} TO #{quote_column_name(new_column_name)}"
1644
1814
  end
@@ -1673,8 +1843,8 @@ module ActiveRecord
1673
1843
 
1674
1844
  if versions.is_a?(Array)
1675
1845
  sql = +"INSERT INTO #{sm_table} (version) VALUES\n"
1676
- sql << versions.map { |v| "(#{quote(v)})" }.join(",\n")
1677
- sql << ";\n\n"
1846
+ sql << versions.reverse.map { |v| "(#{quote(v)})" }.join(",\n")
1847
+ sql << ";"
1678
1848
  sql
1679
1849
  else
1680
1850
  "INSERT INTO #{sm_table} (version) VALUES (#{quote(versions)});"