activerecord 6.1.4.1 → 7.0.1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activerecord might be problematic. Click here for more details.

Files changed (237) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1132 -936
  3. data/MIT-LICENSE +1 -1
  4. data/README.rdoc +1 -1
  5. data/lib/active_record/aggregations.rb +1 -1
  6. data/lib/active_record/association_relation.rb +0 -10
  7. data/lib/active_record/associations/association.rb +33 -17
  8. data/lib/active_record/associations/association_scope.rb +1 -3
  9. data/lib/active_record/associations/belongs_to_association.rb +15 -4
  10. data/lib/active_record/associations/belongs_to_polymorphic_association.rb +10 -2
  11. data/lib/active_record/associations/builder/association.rb +8 -2
  12. data/lib/active_record/associations/builder/belongs_to.rb +19 -6
  13. data/lib/active_record/associations/builder/collection_association.rb +10 -3
  14. data/lib/active_record/associations/builder/has_many.rb +3 -2
  15. data/lib/active_record/associations/builder/has_one.rb +2 -1
  16. data/lib/active_record/associations/builder/singular_association.rb +2 -2
  17. data/lib/active_record/associations/collection_association.rb +34 -27
  18. data/lib/active_record/associations/collection_proxy.rb +8 -3
  19. data/lib/active_record/associations/disable_joins_association_scope.rb +59 -0
  20. data/lib/active_record/associations/has_many_association.rb +1 -1
  21. data/lib/active_record/associations/has_many_through_association.rb +2 -1
  22. data/lib/active_record/associations/has_one_association.rb +10 -7
  23. data/lib/active_record/associations/has_one_through_association.rb +1 -1
  24. data/lib/active_record/associations/join_dependency.rb +6 -2
  25. data/lib/active_record/associations/preloader/association.rb +187 -55
  26. data/lib/active_record/associations/preloader/batch.rb +48 -0
  27. data/lib/active_record/associations/preloader/branch.rb +147 -0
  28. data/lib/active_record/associations/preloader/through_association.rb +49 -13
  29. data/lib/active_record/associations/preloader.rb +39 -113
  30. data/lib/active_record/associations/singular_association.rb +8 -2
  31. data/lib/active_record/associations/through_association.rb +3 -3
  32. data/lib/active_record/associations.rb +118 -90
  33. data/lib/active_record/asynchronous_queries_tracker.rb +60 -0
  34. data/lib/active_record/attribute_assignment.rb +1 -1
  35. data/lib/active_record/attribute_methods/before_type_cast.rb +7 -2
  36. data/lib/active_record/attribute_methods/dirty.rb +49 -16
  37. data/lib/active_record/attribute_methods/primary_key.rb +2 -2
  38. data/lib/active_record/attribute_methods/query.rb +2 -2
  39. data/lib/active_record/attribute_methods/read.rb +7 -5
  40. data/lib/active_record/attribute_methods/serialization.rb +66 -12
  41. data/lib/active_record/attribute_methods/time_zone_conversion.rb +4 -3
  42. data/lib/active_record/attribute_methods/write.rb +7 -10
  43. data/lib/active_record/attribute_methods.rb +13 -14
  44. data/lib/active_record/attributes.rb +24 -35
  45. data/lib/active_record/autosave_association.rb +6 -21
  46. data/lib/active_record/base.rb +19 -1
  47. data/lib/active_record/callbacks.rb +2 -2
  48. data/lib/active_record/connection_adapters/abstract/connection_handler.rb +292 -0
  49. data/lib/active_record/connection_adapters/abstract/connection_pool/queue.rb +209 -0
  50. data/lib/active_record/connection_adapters/abstract/connection_pool/reaper.rb +76 -0
  51. data/lib/active_record/connection_adapters/abstract/connection_pool.rb +47 -561
  52. data/lib/active_record/connection_adapters/abstract/database_limits.rb +0 -17
  53. data/lib/active_record/connection_adapters/abstract/database_statements.rb +46 -22
  54. data/lib/active_record/connection_adapters/abstract/query_cache.rb +24 -12
  55. data/lib/active_record/connection_adapters/abstract/quoting.rb +42 -72
  56. data/lib/active_record/connection_adapters/abstract/schema_creation.rb +4 -17
  57. data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +34 -9
  58. data/lib/active_record/connection_adapters/abstract/schema_statements.rb +78 -22
  59. data/lib/active_record/connection_adapters/abstract/transaction.rb +15 -22
  60. data/lib/active_record/connection_adapters/abstract_adapter.rb +149 -74
  61. data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +97 -81
  62. data/lib/active_record/connection_adapters/column.rb +4 -0
  63. data/lib/active_record/connection_adapters/mysql/database_statements.rb +37 -23
  64. data/lib/active_record/connection_adapters/mysql/quoting.rb +35 -21
  65. data/lib/active_record/connection_adapters/mysql/schema_statements.rb +5 -1
  66. data/lib/active_record/connection_adapters/mysql2_adapter.rb +12 -6
  67. data/lib/active_record/connection_adapters/pool_config.rb +7 -7
  68. data/lib/active_record/connection_adapters/postgresql/column.rb +17 -1
  69. data/lib/active_record/connection_adapters/postgresql/database_statements.rb +21 -12
  70. data/lib/active_record/connection_adapters/postgresql/oid/date.rb +8 -0
  71. data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +5 -0
  72. data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +53 -14
  73. data/lib/active_record/connection_adapters/postgresql/oid/range.rb +1 -1
  74. data/lib/active_record/connection_adapters/postgresql/oid/timestamp.rb +15 -0
  75. data/lib/active_record/connection_adapters/postgresql/oid/timestamp_with_time_zone.rb +30 -0
  76. data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +18 -6
  77. data/lib/active_record/connection_adapters/postgresql/oid.rb +2 -0
  78. data/lib/active_record/connection_adapters/postgresql/quoting.rb +50 -50
  79. data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +32 -0
  80. data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +21 -1
  81. data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +22 -1
  82. data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +25 -0
  83. data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +29 -18
  84. data/lib/active_record/connection_adapters/postgresql_adapter.rb +205 -105
  85. data/lib/active_record/connection_adapters/schema_cache.rb +29 -4
  86. data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +27 -19
  87. data/lib/active_record/connection_adapters/sqlite3/quoting.rb +28 -16
  88. data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +16 -14
  89. data/lib/active_record/connection_adapters/sqlite3_adapter.rb +89 -30
  90. data/lib/active_record/connection_adapters.rb +6 -5
  91. data/lib/active_record/connection_handling.rb +47 -53
  92. data/lib/active_record/core.rb +122 -132
  93. data/lib/active_record/database_configurations/connection_url_resolver.rb +2 -1
  94. data/lib/active_record/database_configurations/database_config.rb +12 -9
  95. data/lib/active_record/database_configurations/hash_config.rb +63 -5
  96. data/lib/active_record/database_configurations/url_config.rb +2 -2
  97. data/lib/active_record/database_configurations.rb +16 -32
  98. data/lib/active_record/delegated_type.rb +52 -11
  99. data/lib/active_record/destroy_association_async_job.rb +1 -1
  100. data/lib/active_record/disable_joins_association_relation.rb +39 -0
  101. data/lib/active_record/dynamic_matchers.rb +1 -1
  102. data/lib/active_record/encryption/cipher/aes256_gcm.rb +98 -0
  103. data/lib/active_record/encryption/cipher.rb +53 -0
  104. data/lib/active_record/encryption/config.rb +44 -0
  105. data/lib/active_record/encryption/configurable.rb +61 -0
  106. data/lib/active_record/encryption/context.rb +35 -0
  107. data/lib/active_record/encryption/contexts.rb +72 -0
  108. data/lib/active_record/encryption/derived_secret_key_provider.rb +12 -0
  109. data/lib/active_record/encryption/deterministic_key_provider.rb +14 -0
  110. data/lib/active_record/encryption/encryptable_record.rb +208 -0
  111. data/lib/active_record/encryption/encrypted_attribute_type.rb +140 -0
  112. data/lib/active_record/encryption/encrypted_fixtures.rb +38 -0
  113. data/lib/active_record/encryption/encrypting_only_encryptor.rb +12 -0
  114. data/lib/active_record/encryption/encryptor.rb +155 -0
  115. data/lib/active_record/encryption/envelope_encryption_key_provider.rb +55 -0
  116. data/lib/active_record/encryption/errors.rb +15 -0
  117. data/lib/active_record/encryption/extended_deterministic_queries.rb +160 -0
  118. data/lib/active_record/encryption/extended_deterministic_uniqueness_validator.rb +28 -0
  119. data/lib/active_record/encryption/key.rb +28 -0
  120. data/lib/active_record/encryption/key_generator.rb +42 -0
  121. data/lib/active_record/encryption/key_provider.rb +46 -0
  122. data/lib/active_record/encryption/message.rb +33 -0
  123. data/lib/active_record/encryption/message_serializer.rb +90 -0
  124. data/lib/active_record/encryption/null_encryptor.rb +21 -0
  125. data/lib/active_record/encryption/properties.rb +76 -0
  126. data/lib/active_record/encryption/read_only_null_encryptor.rb +24 -0
  127. data/lib/active_record/encryption/scheme.rb +99 -0
  128. data/lib/active_record/encryption.rb +55 -0
  129. data/lib/active_record/enum.rb +49 -42
  130. data/lib/active_record/errors.rb +67 -4
  131. data/lib/active_record/explain_registry.rb +11 -6
  132. data/lib/active_record/fixture_set/file.rb +15 -1
  133. data/lib/active_record/fixture_set/table_row.rb +41 -6
  134. data/lib/active_record/fixture_set/table_rows.rb +4 -4
  135. data/lib/active_record/fixtures.rb +17 -20
  136. data/lib/active_record/future_result.rb +139 -0
  137. data/lib/active_record/gem_version.rb +4 -4
  138. data/lib/active_record/inheritance.rb +55 -17
  139. data/lib/active_record/insert_all.rb +80 -14
  140. data/lib/active_record/integration.rb +4 -3
  141. data/lib/active_record/internal_metadata.rb +3 -5
  142. data/lib/active_record/legacy_yaml_adapter.rb +2 -39
  143. data/lib/active_record/locking/optimistic.rb +10 -9
  144. data/lib/active_record/locking/pessimistic.rb +9 -3
  145. data/lib/active_record/log_subscriber.rb +14 -3
  146. data/lib/active_record/middleware/database_selector/resolver.rb +6 -10
  147. data/lib/active_record/middleware/database_selector.rb +8 -3
  148. data/lib/active_record/middleware/shard_selector.rb +60 -0
  149. data/lib/active_record/migration/command_recorder.rb +4 -4
  150. data/lib/active_record/migration/compatibility.rb +107 -3
  151. data/lib/active_record/migration/join_table.rb +1 -1
  152. data/lib/active_record/migration.rb +109 -79
  153. data/lib/active_record/model_schema.rb +45 -58
  154. data/lib/active_record/nested_attributes.rb +13 -12
  155. data/lib/active_record/no_touching.rb +3 -3
  156. data/lib/active_record/null_relation.rb +2 -6
  157. data/lib/active_record/persistence.rb +219 -52
  158. data/lib/active_record/query_cache.rb +2 -2
  159. data/lib/active_record/query_logs.rb +138 -0
  160. data/lib/active_record/querying.rb +15 -5
  161. data/lib/active_record/railtie.rb +127 -17
  162. data/lib/active_record/railties/controller_runtime.rb +1 -1
  163. data/lib/active_record/railties/databases.rake +66 -129
  164. data/lib/active_record/readonly_attributes.rb +11 -0
  165. data/lib/active_record/reflection.rb +67 -50
  166. data/lib/active_record/relation/batches/batch_enumerator.rb +19 -5
  167. data/lib/active_record/relation/batches.rb +3 -3
  168. data/lib/active_record/relation/calculations.rb +43 -38
  169. data/lib/active_record/relation/delegation.rb +6 -6
  170. data/lib/active_record/relation/finder_methods.rb +31 -35
  171. data/lib/active_record/relation/merger.rb +20 -13
  172. data/lib/active_record/relation/predicate_builder.rb +1 -6
  173. data/lib/active_record/relation/query_attribute.rb +5 -11
  174. data/lib/active_record/relation/query_methods.rb +243 -61
  175. data/lib/active_record/relation/record_fetch_warning.rb +7 -9
  176. data/lib/active_record/relation/spawn_methods.rb +2 -2
  177. data/lib/active_record/relation/where_clause.rb +10 -19
  178. data/lib/active_record/relation.rb +184 -84
  179. data/lib/active_record/result.rb +17 -7
  180. data/lib/active_record/runtime_registry.rb +9 -13
  181. data/lib/active_record/sanitization.rb +11 -7
  182. data/lib/active_record/schema_dumper.rb +10 -3
  183. data/lib/active_record/schema_migration.rb +4 -4
  184. data/lib/active_record/scoping/default.rb +61 -12
  185. data/lib/active_record/scoping/named.rb +3 -11
  186. data/lib/active_record/scoping.rb +64 -34
  187. data/lib/active_record/serialization.rb +1 -1
  188. data/lib/active_record/signed_id.rb +1 -1
  189. data/lib/active_record/suppressor.rb +11 -15
  190. data/lib/active_record/tasks/database_tasks.rb +120 -58
  191. data/lib/active_record/tasks/mysql_database_tasks.rb +1 -1
  192. data/lib/active_record/tasks/postgresql_database_tasks.rb +19 -12
  193. data/lib/active_record/test_databases.rb +1 -1
  194. data/lib/active_record/test_fixtures.rb +4 -4
  195. data/lib/active_record/timestamp.rb +3 -4
  196. data/lib/active_record/transactions.rb +9 -14
  197. data/lib/active_record/translation.rb +2 -2
  198. data/lib/active_record/type/adapter_specific_registry.rb +32 -7
  199. data/lib/active_record/type/hash_lookup_type_map.rb +34 -1
  200. data/lib/active_record/type/internal/timezone.rb +2 -2
  201. data/lib/active_record/type/serialized.rb +1 -1
  202. data/lib/active_record/type/type_map.rb +17 -20
  203. data/lib/active_record/type.rb +1 -2
  204. data/lib/active_record/validations/associated.rb +1 -1
  205. data/lib/active_record/validations/uniqueness.rb +1 -1
  206. data/lib/active_record.rb +204 -28
  207. data/lib/arel/attributes/attribute.rb +0 -8
  208. data/lib/arel/crud.rb +28 -22
  209. data/lib/arel/delete_manager.rb +18 -4
  210. data/lib/arel/filter_predications.rb +9 -0
  211. data/lib/arel/insert_manager.rb +2 -3
  212. data/lib/arel/nodes/casted.rb +1 -1
  213. data/lib/arel/nodes/delete_statement.rb +12 -13
  214. data/lib/arel/nodes/filter.rb +10 -0
  215. data/lib/arel/nodes/function.rb +1 -0
  216. data/lib/arel/nodes/insert_statement.rb +2 -2
  217. data/lib/arel/nodes/select_core.rb +2 -2
  218. data/lib/arel/nodes/select_statement.rb +2 -2
  219. data/lib/arel/nodes/update_statement.rb +8 -3
  220. data/lib/arel/nodes.rb +1 -0
  221. data/lib/arel/predications.rb +11 -3
  222. data/lib/arel/select_manager.rb +10 -4
  223. data/lib/arel/table.rb +0 -1
  224. data/lib/arel/tree_manager.rb +0 -12
  225. data/lib/arel/update_manager.rb +18 -4
  226. data/lib/arel/visitors/dot.rb +80 -90
  227. data/lib/arel/visitors/mysql.rb +8 -2
  228. data/lib/arel/visitors/postgresql.rb +0 -10
  229. data/lib/arel/visitors/to_sql.rb +58 -2
  230. data/lib/arel.rb +2 -1
  231. data/lib/rails/generators/active_record/application_record/templates/application_record.rb.tt +1 -1
  232. data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +1 -1
  233. data/lib/rails/generators/active_record/model/templates/model.rb.tt +1 -1
  234. data/lib/rails/generators/active_record/model/templates/module.rb.tt +2 -2
  235. data/lib/rails/generators/active_record/multi_db/multi_db_generator.rb +16 -0
  236. data/lib/rails/generators/active_record/multi_db/templates/multi_db.rb.tt +44 -0
  237. metadata +59 -14
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require "active_support/core_ext/string/access"
4
- require "digest/sha2"
4
+ require "openssl"
5
5
 
6
6
  module ActiveRecord
7
7
  module ConnectionAdapters # :nodoc:
@@ -29,7 +29,7 @@ module ActiveRecord
29
29
  table_name[0...table_alias_length].tr(".", "_")
30
30
  end
31
31
 
32
- # Returns the relation names useable to back Active Record models.
32
+ # Returns the relation names usable to back Active Record models.
33
33
  # For most adapters this means all #tables and #views.
34
34
  def data_sources
35
35
  query_values(data_source_sql, "SCHEMA")
@@ -124,6 +124,9 @@ module ActiveRecord
124
124
  # column_exists?(:suppliers, :name)
125
125
  #
126
126
  # # Check a column exists of a particular type
127
+ # #
128
+ # # This works for standard non-casted types (eg. string) but is unreliable
129
+ # # for types that may get cast to something else (eg. char, bigint).
127
130
  # column_exists?(:suppliers, :name, :string)
128
131
  #
129
132
  # # Check a column exists with a specific definition
@@ -518,24 +521,31 @@ module ActiveRecord
518
521
 
519
522
  # Add a new +type+ column named +column_name+ to +table_name+.
520
523
  #
524
+ # See {ActiveRecord::ConnectionAdapters::TableDefinition.column}[rdoc-ref:ActiveRecord::ConnectionAdapters::TableDefinition#column].
525
+ #
521
526
  # The +type+ parameter is normally one of the migrations native types,
522
527
  # which is one of the following:
523
528
  # <tt>:primary_key</tt>, <tt>:string</tt>, <tt>:text</tt>,
524
529
  # <tt>:integer</tt>, <tt>:bigint</tt>, <tt>:float</tt>, <tt>:decimal</tt>, <tt>:numeric</tt>,
525
530
  # <tt>:datetime</tt>, <tt>:time</tt>, <tt>:date</tt>,
526
- # <tt>:binary</tt>, <tt>:boolean</tt>.
531
+ # <tt>:binary</tt>, <tt>:blob</tt>, <tt>:boolean</tt>.
527
532
  #
528
533
  # You may use a type not in this list as long as it is supported by your
529
534
  # database (for example, "polygon" in MySQL), but this will not be database
530
535
  # agnostic and should usually be avoided.
531
536
  #
532
537
  # Available options are (none of these exists by default):
538
+ # * <tt>:comment</tt> -
539
+ # Specifies the comment for the column. This option is ignored by some backends.
540
+ # * <tt>:collation</tt> -
541
+ # Specifies the collation for a <tt>:string</tt> or <tt>:text</tt> column.
542
+ # If not specified, the column will have the same collation as the table.
543
+ # * <tt>:default</tt> -
544
+ # The column's default value. Use +nil+ for +NULL+.
533
545
  # * <tt>:limit</tt> -
534
546
  # Requests a maximum column length. This is the number of characters for a <tt>:string</tt> column
535
- # and number of bytes for <tt>:text</tt>, <tt>:binary</tt>, and <tt>:integer</tt> columns.
547
+ # and number of bytes for <tt>:text</tt>, <tt>:binary</tt>, <tt>:blob</tt>, and <tt>:integer</tt> columns.
536
548
  # This option is ignored by some backends.
537
- # * <tt>:default</tt> -
538
- # The column's default value. Use +nil+ for +NULL+.
539
549
  # * <tt>:null</tt> -
540
550
  # Allows or disallows +NULL+ values in the column.
541
551
  # * <tt>:precision</tt> -
@@ -604,7 +614,13 @@ module ActiveRecord
604
614
  # # Ignores the method call if the column exists
605
615
  # add_column(:shapes, :triangle, 'polygon', if_not_exists: true)
606
616
  def add_column(table_name, column_name, type, **options)
607
- return if options[:if_not_exists] == true && column_exists?(table_name, column_name, type)
617
+ return if options[:if_not_exists] == true && column_exists?(table_name, column_name)
618
+
619
+ if supports_datetime_with_precision?
620
+ if type == :datetime && !options.key?(:precision)
621
+ options[:precision] = 6
622
+ end
623
+ end
608
624
 
609
625
  at = create_alter_table table_name
610
626
  at.add_column(column_name, type, **options)
@@ -629,9 +645,8 @@ module ActiveRecord
629
645
  raise ArgumentError.new("You must specify at least one column name. Example: remove_columns(:people, :first_name)")
630
646
  end
631
647
 
632
- column_names.each do |column_name|
633
- remove_column(table_name, column_name, type, **options)
634
- end
648
+ remove_column_fragments = remove_columns_for_alter(table_name, *column_names, type: type, **options)
649
+ execute "ALTER TABLE #{quote_table_name(table_name)} #{remove_column_fragments.join(', ')}"
635
650
  end
636
651
 
637
652
  # Removes the column from the table definition.
@@ -641,7 +656,8 @@ module ActiveRecord
641
656
  # The +type+ and +options+ parameters will be ignored if present. It can be helpful
642
657
  # to provide these in a migration's +change+ method so it can be reverted.
643
658
  # In that case, +type+ and +options+ will be used by #add_column.
644
- # Indexes on the column are automatically removed.
659
+ # Depending on the database you're using, indexes using this column may be
660
+ # automatically removed or modified to remove this column from the index.
645
661
  #
646
662
  # If the options provided include an +if_exists+ key, it will be used to check if the
647
663
  # column does not exist. This will silently ignore the migration rather than raising
@@ -766,7 +782,7 @@ module ActiveRecord
766
782
  #
767
783
  # CREATE INDEX by_name_surname ON accounts(name(10), surname(15))
768
784
  #
769
- # Note: SQLite doesn't support index length.
785
+ # Note: only supported by MySQL
770
786
  #
771
787
  # ====== Creating an index with a sort order (desc or asc, asc is the default)
772
788
  #
@@ -901,7 +917,7 @@ module ActiveRecord
901
917
  remove_index(table_name, name: old_name)
902
918
  end
903
919
 
904
- def index_name(table_name, options) #:nodoc:
920
+ def index_name(table_name, options) # :nodoc:
905
921
  if Hash === options
906
922
  if options[:column]
907
923
  "index_#{table_name}_on_#{Array(options[:column]) * '_and_'}"
@@ -1027,6 +1043,10 @@ module ActiveRecord
1027
1043
  #
1028
1044
  # ALTER TABLE "articles" ADD CONSTRAINT fk_rails_e74ce85cbc FOREIGN KEY ("author_id") REFERENCES "authors" ("id")
1029
1045
  #
1046
+ # ====== Creating a foreign key, ignoring method call if the foreign key exists
1047
+ #
1048
+ # add_foreign_key(:articles, :authors, if_not_exists: true)
1049
+ #
1030
1050
  # ====== Creating a foreign key on a specific column
1031
1051
  #
1032
1052
  # add_foreign_key :articles, :users, column: :author_id, primary_key: "lng_id"
@@ -1054,10 +1074,17 @@ module ActiveRecord
1054
1074
  # Action that happens <tt>ON DELETE</tt>. Valid values are +:nullify+, +:cascade+ and +:restrict+
1055
1075
  # [<tt>:on_update</tt>]
1056
1076
  # Action that happens <tt>ON UPDATE</tt>. Valid values are +:nullify+, +:cascade+ and +:restrict+
1077
+ # [<tt>:if_not_exists</tt>]
1078
+ # Specifies if the foreign key already exists to not try to re-add it. This will avoid
1079
+ # duplicate column errors.
1057
1080
  # [<tt>:validate</tt>]
1058
1081
  # (PostgreSQL only) Specify whether or not the constraint should be validated. Defaults to +true+.
1082
+ # [<tt>:deferrable</tt>]
1083
+ # (PostgreSQL only) Specify whether or not the foreign key should be deferrable. Valid values are booleans or
1084
+ # +:deferred+ or +:immediate+ to specify the default behavior. Defaults to +false+.
1059
1085
  def add_foreign_key(from_table, to_table, **options)
1060
1086
  return unless supports_foreign_keys?
1087
+ return if options[:if_not_exists] == true && foreign_key_exists?(from_table, to_table)
1061
1088
 
1062
1089
  options = foreign_key_options(from_table, to_table, options)
1063
1090
  at = create_alter_table from_table
@@ -1087,12 +1114,18 @@ module ActiveRecord
1087
1114
  #
1088
1115
  # remove_foreign_key :accounts, name: :special_fk_name
1089
1116
  #
1117
+ # Checks if the foreign key exists before trying to remove it. Will silently ignore indexes that
1118
+ # don't exist.
1119
+ #
1120
+ # remove_foreign_key :accounts, :branches, if_exists: true
1121
+ #
1090
1122
  # The +options+ hash accepts the same keys as SchemaStatements#add_foreign_key
1091
1123
  # with an addition of
1092
1124
  # [<tt>:to_table</tt>]
1093
1125
  # The name of the table that contains the referenced primary key.
1094
1126
  def remove_foreign_key(from_table, to_table = nil, **options)
1095
1127
  return unless supports_foreign_keys?
1128
+ return if options[:if_exists] == true && !foreign_key_exists?(from_table, to_table)
1096
1129
 
1097
1130
  fk_name_to_delete = foreign_key_for!(from_table, to_table: to_table, **options).name
1098
1131
 
@@ -1256,6 +1289,25 @@ module ActiveRecord
1256
1289
  columns
1257
1290
  end
1258
1291
 
1292
+ def distinct_relation_for_primary_key(relation) # :nodoc:
1293
+ values = columns_for_distinct(
1294
+ visitor.compile(relation.table[relation.primary_key]),
1295
+ relation.order_values
1296
+ )
1297
+
1298
+ limited = relation.reselect(values).distinct!
1299
+ limited_ids = select_rows(limited.arel, "SQL").map(&:last)
1300
+
1301
+ if limited_ids.empty?
1302
+ relation.none!
1303
+ else
1304
+ relation.where!(relation.primary_key => limited_ids)
1305
+ end
1306
+
1307
+ relation.limit_value = relation.offset_value = nil
1308
+ relation
1309
+ end
1310
+
1259
1311
  # Adds timestamps (+created_at+ and +updated_at+) columns to +table_name+.
1260
1312
  # Additional options (like +:null+) are forwarded to #add_column.
1261
1313
  #
@@ -1277,11 +1329,10 @@ module ActiveRecord
1277
1329
  # remove_timestamps(:suppliers)
1278
1330
  #
1279
1331
  def remove_timestamps(table_name, **options)
1280
- remove_column table_name, :updated_at
1281
- remove_column table_name, :created_at
1332
+ remove_columns table_name, :updated_at, :created_at
1282
1333
  end
1283
1334
 
1284
- def update_table_definition(table_name, base) #:nodoc:
1335
+ def update_table_definition(table_name, base) # :nodoc:
1285
1336
  Table.new(table_name, base)
1286
1337
  end
1287
1338
 
@@ -1387,7 +1438,7 @@ module ActiveRecord
1387
1438
 
1388
1439
  checks = []
1389
1440
 
1390
- if !options.key?(:name) && column_name.is_a?(String) && /\W/.match?(column_name)
1441
+ if !options.key?(:name) && expression_column_name?(column_name)
1391
1442
  options[:name] = index_name(table_name, column_name)
1392
1443
  column_names = []
1393
1444
  else
@@ -1396,7 +1447,7 @@ module ActiveRecord
1396
1447
 
1397
1448
  checks << lambda { |i| i.name == options[:name].to_s } if options.key?(:name)
1398
1449
 
1399
- if column_names.present?
1450
+ if column_names.present? && !(options.key?(:name) && expression_column_name?(column_names))
1400
1451
  checks << lambda { |i| index_name(table_name, i.columns) == index_name(table_name, column_names) }
1401
1452
  end
1402
1453
 
@@ -1464,7 +1515,7 @@ module ActiveRecord
1464
1515
  end
1465
1516
 
1466
1517
  def index_column_names(column_names)
1467
- if column_names.is_a?(String) && /\W/.match?(column_names)
1518
+ if expression_column_name?(column_names)
1468
1519
  column_names
1469
1520
  else
1470
1521
  Array(column_names)
@@ -1472,13 +1523,18 @@ module ActiveRecord
1472
1523
  end
1473
1524
 
1474
1525
  def index_name_options(column_names)
1475
- if column_names.is_a?(String) && /\W/.match?(column_names)
1526
+ if expression_column_name?(column_names)
1476
1527
  column_names = column_names.scan(/\w+/).join("_")
1477
1528
  end
1478
1529
 
1479
1530
  { column: column_names }
1480
1531
  end
1481
1532
 
1533
+ # Try to identify whether the given column name is an expression
1534
+ def expression_column_name?(column_name)
1535
+ column_name.is_a?(String) && /\W/.match?(column_name)
1536
+ end
1537
+
1482
1538
  def strip_table_name_prefix_and_suffix(table_name)
1483
1539
  prefix = Base.table_name_prefix
1484
1540
  suffix = Base.table_name_suffix
@@ -1488,7 +1544,7 @@ module ActiveRecord
1488
1544
  def foreign_key_name(table_name, options)
1489
1545
  options.fetch(:name) do
1490
1546
  identifier = "#{table_name}_#{options.fetch(:column)}_fk"
1491
- hashed_identifier = Digest::SHA256.hexdigest(identifier).first(10)
1547
+ hashed_identifier = OpenSSL::Digest::SHA256.hexdigest(identifier).first(10)
1492
1548
 
1493
1549
  "fk_rails_#{hashed_identifier}"
1494
1550
  end
@@ -1516,7 +1572,7 @@ module ActiveRecord
1516
1572
  options.fetch(:name) do
1517
1573
  expression = options.fetch(:expression)
1518
1574
  identifier = "#{table_name}_#{expression}_chk"
1519
- hashed_identifier = Digest::SHA256.hexdigest(identifier).first(10)
1575
+ hashed_identifier = OpenSSL::Digest::SHA256.hexdigest(identifier).first(10)
1520
1576
 
1521
1577
  "chk_rails_#{hashed_identifier}"
1522
1578
  end
@@ -73,7 +73,7 @@ module ActiveRecord
73
73
  end
74
74
  end
75
75
 
76
- class NullTransaction #:nodoc:
76
+ class NullTransaction # :nodoc:
77
77
  def initialize; end
78
78
  def state; end
79
79
  def closed?; true; end
@@ -82,7 +82,7 @@ module ActiveRecord
82
82
  def add_record(record, _ = true); end
83
83
  end
84
84
 
85
- class Transaction #:nodoc:
85
+ class Transaction # :nodoc:
86
86
  attr_reader :connection, :state, :savepoint_name, :isolation_level
87
87
  attr_accessor :written
88
88
 
@@ -221,7 +221,7 @@ module ActiveRecord
221
221
  end
222
222
  end
223
223
 
224
- class TransactionManager #:nodoc:
224
+ class TransactionManager # :nodoc:
225
225
  def initialize(connection)
226
226
  @stack = []
227
227
  @connection = connection
@@ -333,26 +333,19 @@ module ActiveRecord
333
333
  # @connection still holds an open or invalid transaction, so we must not
334
334
  # put it back in the pool for reuse.
335
335
  @connection.throw_away! unless transaction.state.rolledback?
336
+ elsif Thread.current.status == "aborting" || (!completed && transaction.written)
337
+ # The transaction is still open but the block returned earlier.
338
+ #
339
+ # The block could return early because of a timeout or because the thread is aborting,
340
+ # so we are rolling back to make sure the timeout didn't caused the transaction to be
341
+ # committed incompletely.
342
+ rollback_transaction
336
343
  else
337
- if Thread.current.status == "aborting"
338
- rollback_transaction
339
- else
340
- if !completed && transaction.written
341
- ActiveSupport::Deprecation.warn(<<~EOW)
342
- Using `return`, `break` or `throw` to exit a transaction block is
343
- deprecated without replacement. If the `throw` came from
344
- `Timeout.timeout(duration)`, pass an exception class as a second
345
- argument so it doesn't use `throw` to abort its block. This results
346
- in the transaction being committed, but in the next release of Rails
347
- it will rollback.
348
- EOW
349
- end
350
- begin
351
- commit_transaction
352
- rescue Exception
353
- rollback_transaction(transaction) unless transaction.state.completed?
354
- raise
355
- end
344
+ begin
345
+ commit_transaction
346
+ rescue Exception
347
+ rollback_transaction(transaction) unless transaction.state.completed?
348
+ raise
356
349
  end
357
350
  end
358
351
  end