activerecord 6.0.4.1 → 6.1.0.rc1

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 (242) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +767 -851
  3. data/MIT-LICENSE +1 -1
  4. data/README.rdoc +3 -3
  5. data/lib/active_record.rb +7 -14
  6. data/lib/active_record/aggregations.rb +1 -1
  7. data/lib/active_record/association_relation.rb +22 -14
  8. data/lib/active_record/associations.rb +114 -11
  9. data/lib/active_record/associations/alias_tracker.rb +19 -15
  10. data/lib/active_record/associations/association.rb +39 -27
  11. data/lib/active_record/associations/association_scope.rb +11 -15
  12. data/lib/active_record/associations/belongs_to_association.rb +15 -5
  13. data/lib/active_record/associations/belongs_to_polymorphic_association.rb +1 -1
  14. data/lib/active_record/associations/builder/association.rb +9 -3
  15. data/lib/active_record/associations/builder/belongs_to.rb +10 -7
  16. data/lib/active_record/associations/builder/collection_association.rb +5 -4
  17. data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +0 -1
  18. data/lib/active_record/associations/builder/has_many.rb +6 -2
  19. data/lib/active_record/associations/builder/has_one.rb +11 -14
  20. data/lib/active_record/associations/builder/singular_association.rb +1 -1
  21. data/lib/active_record/associations/collection_association.rb +19 -13
  22. data/lib/active_record/associations/collection_proxy.rb +12 -5
  23. data/lib/active_record/associations/foreign_association.rb +13 -0
  24. data/lib/active_record/associations/has_many_association.rb +24 -2
  25. data/lib/active_record/associations/has_many_through_association.rb +10 -4
  26. data/lib/active_record/associations/has_one_association.rb +15 -1
  27. data/lib/active_record/associations/join_dependency.rb +63 -49
  28. data/lib/active_record/associations/join_dependency/join_association.rb +29 -14
  29. data/lib/active_record/associations/join_dependency/join_part.rb +1 -1
  30. data/lib/active_record/associations/preloader.rb +5 -3
  31. data/lib/active_record/associations/preloader/association.rb +13 -5
  32. data/lib/active_record/associations/preloader/through_association.rb +1 -1
  33. data/lib/active_record/associations/singular_association.rb +1 -1
  34. data/lib/active_record/attribute_assignment.rb +10 -8
  35. data/lib/active_record/attribute_methods.rb +52 -48
  36. data/lib/active_record/attribute_methods/before_type_cast.rb +13 -9
  37. data/lib/active_record/attribute_methods/dirty.rb +1 -11
  38. data/lib/active_record/attribute_methods/primary_key.rb +6 -2
  39. data/lib/active_record/attribute_methods/query.rb +3 -6
  40. data/lib/active_record/attribute_methods/read.rb +8 -11
  41. data/lib/active_record/attribute_methods/serialization.rb +4 -4
  42. data/lib/active_record/attribute_methods/time_zone_conversion.rb +12 -13
  43. data/lib/active_record/attribute_methods/write.rb +12 -20
  44. data/lib/active_record/attributes.rb +27 -7
  45. data/lib/active_record/autosave_association.rb +47 -30
  46. data/lib/active_record/base.rb +2 -14
  47. data/lib/active_record/callbacks.rb +32 -22
  48. data/lib/active_record/coders/yaml_column.rb +1 -1
  49. data/lib/active_record/connection_adapters.rb +50 -0
  50. data/lib/active_record/connection_adapters/abstract/connection_pool.rb +180 -134
  51. data/lib/active_record/connection_adapters/abstract/database_limits.rb +2 -44
  52. data/lib/active_record/connection_adapters/abstract/database_statements.rb +65 -22
  53. data/lib/active_record/connection_adapters/abstract/query_cache.rb +2 -7
  54. data/lib/active_record/connection_adapters/abstract/quoting.rb +34 -34
  55. data/lib/active_record/connection_adapters/abstract/savepoints.rb +3 -3
  56. data/lib/active_record/connection_adapters/abstract/schema_creation.rb +153 -116
  57. data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +110 -30
  58. data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +3 -3
  59. data/lib/active_record/connection_adapters/abstract/schema_statements.rb +224 -85
  60. data/lib/active_record/connection_adapters/abstract/transaction.rb +66 -24
  61. data/lib/active_record/connection_adapters/abstract_adapter.rb +31 -70
  62. data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +123 -87
  63. data/lib/active_record/connection_adapters/column.rb +15 -1
  64. data/lib/active_record/connection_adapters/deduplicable.rb +29 -0
  65. data/lib/active_record/connection_adapters/legacy_pool_manager.rb +31 -0
  66. data/lib/active_record/connection_adapters/mysql/database_statements.rb +22 -24
  67. data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +1 -1
  68. data/lib/active_record/connection_adapters/mysql/quoting.rb +1 -1
  69. data/lib/active_record/connection_adapters/mysql/schema_creation.rb +33 -6
  70. data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +8 -0
  71. data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +1 -1
  72. data/lib/active_record/connection_adapters/mysql/schema_statements.rb +3 -3
  73. data/lib/active_record/connection_adapters/mysql/type_metadata.rb +10 -1
  74. data/lib/active_record/connection_adapters/mysql2_adapter.rb +31 -12
  75. data/lib/active_record/connection_adapters/pool_config.rb +63 -0
  76. data/lib/active_record/connection_adapters/pool_manager.rb +43 -0
  77. data/lib/active_record/connection_adapters/postgresql/column.rb +24 -1
  78. data/lib/active_record/connection_adapters/postgresql/database_statements.rb +12 -53
  79. data/lib/active_record/connection_adapters/postgresql/oid.rb +2 -0
  80. data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +3 -5
  81. data/lib/active_record/connection_adapters/postgresql/oid/date.rb +2 -2
  82. data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +2 -10
  83. data/lib/active_record/connection_adapters/postgresql/oid/interval.rb +49 -0
  84. data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +2 -2
  85. data/lib/active_record/connection_adapters/postgresql/oid/macaddr.rb +25 -0
  86. data/lib/active_record/connection_adapters/postgresql/oid/money.rb +2 -2
  87. data/lib/active_record/connection_adapters/postgresql/oid/point.rb +2 -2
  88. data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +11 -1
  89. data/lib/active_record/connection_adapters/postgresql/quoting.rb +4 -4
  90. data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +1 -1
  91. data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +5 -1
  92. data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +61 -29
  93. data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +8 -0
  94. data/lib/active_record/connection_adapters/postgresql_adapter.rb +72 -55
  95. data/lib/active_record/connection_adapters/schema_cache.rb +98 -15
  96. data/lib/active_record/connection_adapters/sql_type_metadata.rb +10 -0
  97. data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +30 -5
  98. data/lib/active_record/connection_adapters/sqlite3/quoting.rb +1 -1
  99. data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +5 -1
  100. data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +36 -3
  101. data/lib/active_record/connection_adapters/sqlite3_adapter.rb +48 -50
  102. data/lib/active_record/connection_handling.rb +210 -71
  103. data/lib/active_record/core.rb +215 -49
  104. data/lib/active_record/database_configurations.rb +124 -85
  105. data/lib/active_record/database_configurations/connection_url_resolver.rb +98 -0
  106. data/lib/active_record/database_configurations/database_config.rb +52 -9
  107. data/lib/active_record/database_configurations/hash_config.rb +54 -8
  108. data/lib/active_record/database_configurations/url_config.rb +15 -40
  109. data/lib/active_record/delegated_type.rb +209 -0
  110. data/lib/active_record/destroy_association_async_job.rb +36 -0
  111. data/lib/active_record/enum.rb +33 -23
  112. data/lib/active_record/errors.rb +47 -12
  113. data/lib/active_record/explain.rb +9 -4
  114. data/lib/active_record/explain_subscriber.rb +1 -1
  115. data/lib/active_record/fixture_set/file.rb +10 -17
  116. data/lib/active_record/fixture_set/model_metadata.rb +1 -2
  117. data/lib/active_record/fixture_set/render_context.rb +1 -1
  118. data/lib/active_record/fixture_set/table_row.rb +2 -2
  119. data/lib/active_record/fixtures.rb +54 -8
  120. data/lib/active_record/gem_version.rb +3 -3
  121. data/lib/active_record/inheritance.rb +40 -18
  122. data/lib/active_record/insert_all.rb +32 -5
  123. data/lib/active_record/integration.rb +3 -5
  124. data/lib/active_record/internal_metadata.rb +15 -4
  125. data/lib/active_record/legacy_yaml_adapter.rb +7 -3
  126. data/lib/active_record/locking/optimistic.rb +13 -16
  127. data/lib/active_record/locking/pessimistic.rb +6 -2
  128. data/lib/active_record/log_subscriber.rb +26 -8
  129. data/lib/active_record/middleware/database_selector.rb +4 -1
  130. data/lib/active_record/middleware/database_selector/resolver.rb +5 -0
  131. data/lib/active_record/middleware/database_selector/resolver/session.rb +3 -0
  132. data/lib/active_record/migration.rb +113 -83
  133. data/lib/active_record/migration/command_recorder.rb +47 -27
  134. data/lib/active_record/migration/compatibility.rb +67 -17
  135. data/lib/active_record/model_schema.rb +88 -42
  136. data/lib/active_record/nested_attributes.rb +2 -3
  137. data/lib/active_record/no_touching.rb +1 -1
  138. data/lib/active_record/persistence.rb +50 -45
  139. data/lib/active_record/query_cache.rb +15 -5
  140. data/lib/active_record/querying.rb +11 -6
  141. data/lib/active_record/railtie.rb +64 -44
  142. data/lib/active_record/railties/databases.rake +253 -98
  143. data/lib/active_record/readonly_attributes.rb +4 -0
  144. data/lib/active_record/reflection.rb +59 -44
  145. data/lib/active_record/relation.rb +90 -64
  146. data/lib/active_record/relation/batches.rb +38 -31
  147. data/lib/active_record/relation/batches/batch_enumerator.rb +25 -9
  148. data/lib/active_record/relation/calculations.rb +100 -43
  149. data/lib/active_record/relation/finder_methods.rb +44 -14
  150. data/lib/active_record/relation/from_clause.rb +1 -1
  151. data/lib/active_record/relation/merger.rb +20 -23
  152. data/lib/active_record/relation/predicate_builder.rb +57 -33
  153. data/lib/active_record/relation/predicate_builder/array_handler.rb +8 -9
  154. data/lib/active_record/relation/predicate_builder/association_query_value.rb +2 -2
  155. data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +3 -3
  156. data/lib/active_record/relation/predicate_builder/relation_handler.rb +1 -1
  157. data/lib/active_record/relation/query_methods.rb +319 -196
  158. data/lib/active_record/relation/record_fetch_warning.rb +3 -3
  159. data/lib/active_record/relation/spawn_methods.rb +6 -5
  160. data/lib/active_record/relation/where_clause.rb +104 -57
  161. data/lib/active_record/result.rb +41 -33
  162. data/lib/active_record/runtime_registry.rb +2 -2
  163. data/lib/active_record/sanitization.rb +6 -17
  164. data/lib/active_record/schema_dumper.rb +34 -4
  165. data/lib/active_record/schema_migration.rb +0 -4
  166. data/lib/active_record/scoping/named.rb +1 -17
  167. data/lib/active_record/secure_token.rb +16 -8
  168. data/lib/active_record/serialization.rb +5 -3
  169. data/lib/active_record/signed_id.rb +116 -0
  170. data/lib/active_record/statement_cache.rb +20 -4
  171. data/lib/active_record/store.rb +2 -2
  172. data/lib/active_record/suppressor.rb +2 -2
  173. data/lib/active_record/table_metadata.rb +36 -52
  174. data/lib/active_record/tasks/database_tasks.rb +139 -113
  175. data/lib/active_record/tasks/mysql_database_tasks.rb +34 -35
  176. data/lib/active_record/tasks/postgresql_database_tasks.rb +24 -26
  177. data/lib/active_record/tasks/sqlite_database_tasks.rb +13 -9
  178. data/lib/active_record/test_databases.rb +5 -4
  179. data/lib/active_record/test_fixtures.rb +36 -33
  180. data/lib/active_record/timestamp.rb +4 -6
  181. data/lib/active_record/touch_later.rb +21 -21
  182. data/lib/active_record/transactions.rb +15 -64
  183. data/lib/active_record/type.rb +8 -1
  184. data/lib/active_record/type/serialized.rb +6 -2
  185. data/lib/active_record/type_caster/connection.rb +0 -1
  186. data/lib/active_record/type_caster/map.rb +8 -5
  187. data/lib/active_record/validations.rb +1 -0
  188. data/lib/active_record/validations/associated.rb +1 -1
  189. data/lib/active_record/validations/numericality.rb +35 -0
  190. data/lib/active_record/validations/uniqueness.rb +24 -4
  191. data/lib/arel.rb +5 -13
  192. data/lib/arel/attributes/attribute.rb +4 -0
  193. data/lib/arel/collectors/bind.rb +5 -0
  194. data/lib/arel/collectors/composite.rb +8 -0
  195. data/lib/arel/collectors/sql_string.rb +7 -0
  196. data/lib/arel/collectors/substitute_binds.rb +7 -0
  197. data/lib/arel/nodes.rb +3 -1
  198. data/lib/arel/nodes/binary.rb +82 -8
  199. data/lib/arel/nodes/bind_param.rb +8 -0
  200. data/lib/arel/nodes/casted.rb +21 -9
  201. data/lib/arel/nodes/equality.rb +6 -9
  202. data/lib/arel/nodes/grouping.rb +3 -0
  203. data/lib/arel/nodes/homogeneous_in.rb +72 -0
  204. data/lib/arel/nodes/in.rb +8 -1
  205. data/lib/arel/nodes/infix_operation.rb +13 -1
  206. data/lib/arel/nodes/join_source.rb +1 -1
  207. data/lib/arel/nodes/node.rb +7 -6
  208. data/lib/arel/nodes/ordering.rb +27 -0
  209. data/lib/arel/nodes/sql_literal.rb +3 -0
  210. data/lib/arel/nodes/table_alias.rb +7 -3
  211. data/lib/arel/nodes/unary.rb +0 -1
  212. data/lib/arel/predications.rb +12 -18
  213. data/lib/arel/select_manager.rb +1 -2
  214. data/lib/arel/table.rb +13 -5
  215. data/lib/arel/visitors.rb +0 -7
  216. data/lib/arel/visitors/dot.rb +14 -2
  217. data/lib/arel/visitors/mysql.rb +11 -1
  218. data/lib/arel/visitors/postgresql.rb +15 -4
  219. data/lib/arel/visitors/to_sql.rb +89 -78
  220. data/lib/rails/generators/active_record/migration.rb +6 -1
  221. data/lib/rails/generators/active_record/migration/migration_generator.rb +1 -0
  222. data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +2 -0
  223. data/lib/rails/generators/active_record/migration/templates/migration.rb.tt +3 -3
  224. data/lib/rails/generators/active_record/model/model_generator.rb +39 -2
  225. data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +7 -0
  226. metadata +30 -31
  227. data/lib/active_record/advisory_lock_base.rb +0 -18
  228. data/lib/active_record/attribute_decorators.rb +0 -88
  229. data/lib/active_record/connection_adapters/connection_specification.rb +0 -296
  230. data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +0 -29
  231. data/lib/active_record/define_callbacks.rb +0 -22
  232. data/lib/active_record/railties/collection_cache_association_loading.rb +0 -34
  233. data/lib/active_record/relation/predicate_builder/base_handler.rb +0 -18
  234. data/lib/active_record/relation/where_clause_factory.rb +0 -33
  235. data/lib/arel/attributes.rb +0 -22
  236. data/lib/arel/visitors/depth_first.rb +0 -203
  237. data/lib/arel/visitors/ibm_db.rb +0 -34
  238. data/lib/arel/visitors/informix.rb +0 -62
  239. data/lib/arel/visitors/mssql.rb +0 -156
  240. data/lib/arel/visitors/oracle.rb +0 -158
  241. data/lib/arel/visitors/oracle12.rb +0 -65
  242. data/lib/arel/visitors/where_sql.rb +0 -22
@@ -1,12 +1,15 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require "active_record"
4
+ require "active_support/configuration_file"
5
+ require "active_support/deprecation"
4
6
 
5
7
  databases = ActiveRecord::Tasks::DatabaseTasks.setup_initial_database_yaml
6
8
 
7
9
  db_namespace = namespace :db do
8
10
  desc "Set the environment value for the database"
9
11
  task "environment:set" => :load_config do
12
+ raise ActiveRecord::EnvironmentStorageError unless ActiveRecord::InternalMetadata.enabled?
10
13
  ActiveRecord::InternalMetadata.create_table
11
14
  ActiveRecord::InternalMetadata[:environment] = ActiveRecord::Base.connection.migration_context.current_environment
12
15
  end
@@ -16,7 +19,10 @@ db_namespace = namespace :db do
16
19
  end
17
20
 
18
21
  task load_config: :environment do
19
- ActiveRecord::Base.configurations = ActiveRecord::Tasks::DatabaseTasks.database_configuration || {}
22
+ if ActiveRecord::Base.configurations.empty?
23
+ ActiveRecord::Base.configurations = ActiveRecord::Tasks::DatabaseTasks.database_configuration
24
+ end
25
+
20
26
  ActiveRecord::Migrator.migrations_paths = ActiveRecord::Tasks::DatabaseTasks.migrations_paths
21
27
  end
22
28
 
@@ -25,16 +31,16 @@ db_namespace = namespace :db do
25
31
  ActiveRecord::Tasks::DatabaseTasks.create_all
26
32
  end
27
33
 
28
- ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |spec_name|
29
- desc "Create #{spec_name} database for current environment"
30
- task spec_name => :load_config do
31
- db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name)
32
- ActiveRecord::Tasks::DatabaseTasks.create(db_config.config)
34
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
35
+ desc "Create #{name} database for current environment"
36
+ task name => :load_config do
37
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: name)
38
+ ActiveRecord::Tasks::DatabaseTasks.create(db_config)
33
39
  end
34
40
  end
35
41
  end
36
42
 
37
- desc "Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to creating the development and test databases."
43
+ desc "Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to creating the development and test databases, except when DATABASE_URL is present."
38
44
  task create: [:load_config] do
39
45
  ActiveRecord::Tasks::DatabaseTasks.create_current
40
46
  end
@@ -44,16 +50,16 @@ db_namespace = namespace :db do
44
50
  ActiveRecord::Tasks::DatabaseTasks.drop_all
45
51
  end
46
52
 
47
- ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |spec_name|
48
- desc "Drop #{spec_name} database for current environment"
49
- task spec_name => [:load_config, :check_protected_environments] do
50
- db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name)
51
- ActiveRecord::Tasks::DatabaseTasks.drop(db_config.config)
53
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
54
+ desc "Drop #{name} database for current environment"
55
+ task name => [:load_config, :check_protected_environments] do
56
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: name)
57
+ ActiveRecord::Tasks::DatabaseTasks.drop(db_config)
52
58
  end
53
59
  end
54
60
  end
55
61
 
56
- desc "Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to dropping the development and test databases."
62
+ desc "Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to dropping the development and test databases, except when DATABASE_URL is present."
57
63
  task drop: [:load_config, :check_protected_environments] do
58
64
  db_namespace["drop:_unsafe"].invoke
59
65
  end
@@ -73,50 +79,65 @@ db_namespace = namespace :db do
73
79
  ActiveRecord::Tasks::DatabaseTasks.truncate_all
74
80
  end
75
81
 
76
- # desc "Empty the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:purge:all to purge all databases in the config). Without RAILS_ENV it defaults to purging the development and test databases."
82
+ # desc "Empty the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:purge:all to purge all databases in the config). Without RAILS_ENV it defaults to purging the development and test databases, except when DATABASE_URL is present."
77
83
  task purge: [:load_config, :check_protected_environments] do
78
84
  ActiveRecord::Tasks::DatabaseTasks.purge_current
79
85
  end
80
86
 
81
87
  desc "Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)."
82
88
  task migrate: :load_config do
83
- original_config = ActiveRecord::Base.connection_config
89
+ original_db_config = ActiveRecord::Base.connection_db_config
84
90
  ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
85
- ActiveRecord::Base.establish_connection(db_config.config)
91
+ ActiveRecord::Base.establish_connection(db_config)
86
92
  ActiveRecord::Tasks::DatabaseTasks.migrate
87
93
  end
88
94
  db_namespace["_dump"].invoke
89
95
  ensure
90
- ActiveRecord::Base.establish_connection(original_config)
96
+ ActiveRecord::Base.establish_connection(original_db_config)
91
97
  end
92
98
 
93
99
  # IMPORTANT: This task won't dump the schema if ActiveRecord::Base.dump_schema_after_migration is set to false
94
100
  task :_dump do
95
101
  if ActiveRecord::Base.dump_schema_after_migration
96
- case ActiveRecord::Base.schema_format
97
- when :ruby then db_namespace["schema:dump"].invoke
98
- when :sql then db_namespace["structure:dump"].invoke
99
- else
100
- raise "unknown schema format #{ActiveRecord::Base.schema_format}"
101
- end
102
+ db_namespace["schema:dump"].invoke
102
103
  end
103
104
  # Allow this task to be called as many times as required. An example is the
104
105
  # migrate:redo task, which calls other two internally that depend on this one.
105
106
  db_namespace["_dump"].reenable
106
107
  end
107
108
 
109
+ namespace :_dump do
110
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
111
+ # IMPORTANT: This task won't dump the schema if ActiveRecord::Base.dump_schema_after_migration is set to false
112
+ task name do
113
+ if ActiveRecord::Base.dump_schema_after_migration
114
+ db_namespace["schema:dump:#{name}"].invoke
115
+ end
116
+ # Allow this task to be called as many times as required. An example is the
117
+ # migrate:redo task, which calls other two internally that depend on this one.
118
+ db_namespace["_dump:#{name}"].reenable
119
+ end
120
+ end
121
+ end
122
+
108
123
  namespace :migrate do
109
- ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |spec_name|
110
- desc "Migrate #{spec_name} database for current environment"
111
- task spec_name => :load_config do
112
- db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name)
113
- ActiveRecord::Base.establish_connection(db_config.config)
124
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
125
+ desc "Migrate #{name} database for current environment"
126
+ task name => :load_config do
127
+ original_db_config = ActiveRecord::Base.connection_db_config
128
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: name)
129
+ ActiveRecord::Base.establish_connection(db_config)
114
130
  ActiveRecord::Tasks::DatabaseTasks.migrate
131
+ db_namespace["_dump:#{name}"].invoke
132
+ ensure
133
+ ActiveRecord::Base.establish_connection(original_db_config)
115
134
  end
116
135
  end
117
136
 
118
- # desc 'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
137
+ desc "Rolls back the database one migration and re-migrates up (options: STEP=x, VERSION=x)."
119
138
  task redo: :load_config do
139
+ ActiveRecord::Tasks::DatabaseTasks.raise_for_multi_db(command: "db:migrate:redo")
140
+
120
141
  raise "Empty VERSION provided" if ENV["VERSION"] && ENV["VERSION"].empty?
121
142
 
122
143
  if ENV["VERSION"]
@@ -128,10 +149,27 @@ db_namespace = namespace :db do
128
149
  end
129
150
  end
130
151
 
152
+ namespace :redo do
153
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
154
+ desc "Rolls back #{name} database one migration and re-migrates up (options: STEP=x, VERSION=x)."
155
+ task name => :load_config do
156
+ raise "Empty VERSION provided" if ENV["VERSION"] && ENV["VERSION"].empty?
157
+
158
+ if ENV["VERSION"]
159
+ db_namespace["migrate:down:#{name}"].invoke
160
+ db_namespace["migrate:up:#{name}"].invoke
161
+ else
162
+ db_namespace["rollback:#{name}"].invoke
163
+ db_namespace["migrate:#{name}"].invoke
164
+ end
165
+ end
166
+ end
167
+ end
168
+
131
169
  # desc 'Resets your database using your migrations for the current environment'
132
170
  task reset: ["db:drop", "db:create", "db:migrate"]
133
171
 
134
- # desc 'Runs the "up" for a given migration VERSION.'
172
+ desc 'Runs the "up" for a given migration VERSION.'
135
173
  task up: :load_config do
136
174
  ActiveRecord::Tasks::DatabaseTasks.raise_for_multi_db(command: "db:migrate:up")
137
175
 
@@ -147,13 +185,13 @@ db_namespace = namespace :db do
147
185
  end
148
186
 
149
187
  namespace :up do
150
- ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |spec_name|
151
- task spec_name => :load_config do
188
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
189
+ task name => :load_config do
152
190
  raise "VERSION is required" if !ENV["VERSION"] || ENV["VERSION"].empty?
153
191
 
154
- db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name)
192
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: name)
155
193
 
156
- ActiveRecord::Base.establish_connection(db_config.config)
194
+ ActiveRecord::Base.establish_connection(db_config)
157
195
  ActiveRecord::Tasks::DatabaseTasks.check_target_version
158
196
  ActiveRecord::Base.connection.migration_context.run(
159
197
  :up,
@@ -165,7 +203,7 @@ db_namespace = namespace :db do
165
203
  end
166
204
  end
167
205
 
168
- # desc 'Runs the "down" for a given migration VERSION.'
206
+ desc 'Runs the "down" for a given migration VERSION.'
169
207
  task down: :load_config do
170
208
  ActiveRecord::Tasks::DatabaseTasks.raise_for_multi_db(command: "db:migrate:down")
171
209
 
@@ -181,13 +219,13 @@ db_namespace = namespace :db do
181
219
  end
182
220
 
183
221
  namespace :down do
184
- ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |spec_name|
185
- task spec_name => :load_config do
222
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
223
+ task name => :load_config do
186
224
  raise "VERSION is required" if !ENV["VERSION"] || ENV["VERSION"].empty?
187
225
 
188
- db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name)
226
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: name)
189
227
 
190
- ActiveRecord::Base.establish_connection(db_config.config)
228
+ ActiveRecord::Base.establish_connection(db_config)
191
229
  ActiveRecord::Tasks::DatabaseTasks.check_target_version
192
230
  ActiveRecord::Base.connection.migration_context.run(
193
231
  :down,
@@ -202,27 +240,46 @@ db_namespace = namespace :db do
202
240
  desc "Display status of migrations"
203
241
  task status: :load_config do
204
242
  ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
205
- ActiveRecord::Base.establish_connection(db_config.config)
243
+ ActiveRecord::Base.establish_connection(db_config)
206
244
  ActiveRecord::Tasks::DatabaseTasks.migrate_status
207
245
  end
208
246
  end
209
247
 
210
248
  namespace :status do
211
- ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |spec_name|
212
- desc "Display status of migrations for #{spec_name} database"
213
- task spec_name => :load_config do
214
- db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name)
215
- ActiveRecord::Base.establish_connection(db_config.config)
249
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
250
+ desc "Display status of migrations for #{name} database"
251
+ task name => :load_config do
252
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: name)
253
+ ActiveRecord::Base.establish_connection(db_config)
216
254
  ActiveRecord::Tasks::DatabaseTasks.migrate_status
217
255
  end
218
256
  end
219
257
  end
220
258
  end
221
259
 
260
+ namespace :rollback do
261
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
262
+ desc "Rollback #{name} database for current environment (specify steps w/ STEP=n)."
263
+ task name => :load_config do
264
+ step = ENV["STEP"] ? ENV["STEP"].to_i : 1
265
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: name)
266
+
267
+ ActiveRecord::Base.establish_connection(db_config)
268
+ ActiveRecord::Base.connection.migration_context.rollback(step)
269
+
270
+ db_namespace["_dump"].invoke
271
+ end
272
+ end
273
+ end
274
+
222
275
  desc "Rolls the schema back to the previous version (specify steps w/ STEP=n)."
223
276
  task rollback: :load_config do
277
+ ActiveRecord::Tasks::DatabaseTasks.raise_for_multi_db(command: "db:rollback")
278
+
224
279
  step = ENV["STEP"] ? ENV["STEP"].to_i : 1
280
+
225
281
  ActiveRecord::Base.connection.migration_context.rollback(step)
282
+
226
283
  db_namespace["_dump"].invoke
227
284
  end
228
285
 
@@ -233,7 +290,7 @@ db_namespace = namespace :db do
233
290
  db_namespace["_dump"].invoke
234
291
  end
235
292
 
236
- # desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
293
+ desc "Drops and recreates the database from db/schema.rb for the current environment and loads the seeds."
237
294
  task reset: [ "db:drop", "db:setup" ]
238
295
 
239
296
  # desc "Retrieves the charset for the current environment's database"
@@ -256,7 +313,7 @@ db_namespace = namespace :db do
256
313
  # desc "Raises an error if there are pending migrations"
257
314
  task abort_if_pending_migrations: :load_config do
258
315
  pending_migrations = ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).flat_map do |db_config|
259
- ActiveRecord::Base.establish_connection(db_config.config)
316
+ ActiveRecord::Base.establish_connection(db_config)
260
317
 
261
318
  ActiveRecord::Base.connection.migration_context.open.pending_migrations
262
319
  end
@@ -266,18 +323,18 @@ db_namespace = namespace :db do
266
323
  pending_migrations.each do |pending_migration|
267
324
  puts " %4d %s" % [pending_migration.version, pending_migration.name]
268
325
  end
269
- abort %{Run `rails db:migrate` to update your database then try again.}
326
+ abort %{Run `bin/rails db:migrate` to update your database then try again.}
270
327
  end
271
328
  ensure
272
329
  ActiveRecord::Base.establish_connection(ActiveRecord::Tasks::DatabaseTasks.env.to_sym)
273
330
  end
274
331
 
275
332
  namespace :abort_if_pending_migrations do
276
- ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |spec_name|
277
- # desc "Raises an error if there are pending migrations for #{spec_name} database"
278
- task spec_name => :load_config do
279
- db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name)
280
- ActiveRecord::Base.establish_connection(db_config.config)
333
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
334
+ # desc "Raises an error if there are pending migrations for #{name} database"
335
+ task name => :load_config do
336
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: name)
337
+ ActiveRecord::Base.establish_connection(db_config)
281
338
 
282
339
  pending_migrations = ActiveRecord::Base.connection.migration_context.open.pending_migrations
283
340
 
@@ -286,36 +343,34 @@ db_namespace = namespace :db do
286
343
  pending_migrations.each do |pending_migration|
287
344
  puts " %4d %s" % [pending_migration.version, pending_migration.name]
288
345
  end
289
- abort %{Run `rails db:migrate:#{spec_name}` to update your database then try again.}
346
+ abort %{Run `bin/rails db:migrate:#{name}` to update your database then try again.}
290
347
  end
291
348
  end
292
349
  end
293
350
  end
294
351
 
295
352
  desc "Creates the database, loads the schema, and initializes with the seed data (use db:reset to also drop the database first)"
296
- task setup: ["db:schema:load_if_ruby", "db:structure:load_if_sql", :seed]
353
+ task setup: ["db:create", :environment, "db:schema:load", :seed]
297
354
 
298
355
  desc "Runs setup if database does not exist, or runs migrations if it does"
299
356
  task prepare: :load_config do
300
357
  seed = false
301
358
 
302
359
  ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
303
- ActiveRecord::Base.establish_connection(db_config.config)
360
+ ActiveRecord::Base.establish_connection(db_config)
304
361
 
305
362
  # Skipped when no database
306
363
  ActiveRecord::Tasks::DatabaseTasks.migrate
307
364
  if ActiveRecord::Base.dump_schema_after_migration
308
- ActiveRecord::Tasks::DatabaseTasks.dump_schema(db_config.config, ActiveRecord::Base.schema_format, db_config.spec_name)
365
+ ActiveRecord::Tasks::DatabaseTasks.dump_schema(db_config, ActiveRecord::Base.schema_format)
309
366
  end
310
367
 
311
368
  rescue ActiveRecord::NoDatabaseError
312
- ActiveRecord::Tasks::DatabaseTasks.create_current(db_config.env_name, db_config.spec_name)
369
+ ActiveRecord::Tasks::DatabaseTasks.create_current(db_config.env_name, db_config.name)
313
370
  ActiveRecord::Tasks::DatabaseTasks.load_schema(
314
- db_config.config,
371
+ db_config,
315
372
  ActiveRecord::Base.schema_format,
316
- nil,
317
- db_config.env_name,
318
- db_config.spec_name
373
+ nil
319
374
  )
320
375
 
321
376
  seed = true
@@ -337,7 +392,7 @@ db_namespace = namespace :db do
337
392
  end
338
393
 
339
394
  namespace :fixtures do
340
- desc "Loads fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
395
+ desc "Loads fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z. Specify an alternative path (e.g. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
341
396
  task load: :load_config do
342
397
  require "active_record/fixtures"
343
398
 
@@ -359,7 +414,7 @@ db_namespace = namespace :db do
359
414
  ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, fixture_files)
360
415
  end
361
416
 
362
- # desc "Search for a fixture given a LABEL or ID. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
417
+ # desc "Search for a fixture given a LABEL or ID. Specify an alternative path (e.g. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
363
418
  task identify: :load_config do
364
419
  require "active_record/fixtures"
365
420
 
@@ -371,7 +426,7 @@ db_namespace = namespace :db do
371
426
  base_dir = ActiveRecord::Tasks::DatabaseTasks.fixtures_path
372
427
 
373
428
  Dir["#{base_dir}/**/*.yml"].each do |file|
374
- if data = YAML.load(ERB.new(IO.read(file)).result)
429
+ if data = ActiveSupport::ConfigurationFile.parse(file)
375
430
  data.each_key do |key|
376
431
  key_id = ActiveRecord::FixtureSet.identify(key)
377
432
 
@@ -385,31 +440,52 @@ db_namespace = namespace :db do
385
440
  end
386
441
 
387
442
  namespace :schema do
388
- desc "Creates a db/schema.rb file that is portable against any DB supported by Active Record"
443
+ desc "Creates a database schema file (either db/schema.rb or db/structure.sql, depending on `config.active_record.schema_format`)"
389
444
  task dump: :load_config do
390
445
  ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
391
- ActiveRecord::Base.establish_connection(db_config.config)
392
- ActiveRecord::Tasks::DatabaseTasks.dump_schema(db_config.config, :ruby, db_config.spec_name)
446
+ ActiveRecord::Base.establish_connection(db_config)
447
+ ActiveRecord::Tasks::DatabaseTasks.dump_schema(db_config)
393
448
  end
394
449
 
395
450
  db_namespace["schema:dump"].reenable
396
451
  end
397
452
 
398
- desc "Loads a schema.rb file into the database"
453
+ desc "Loads a database schema file (either db/schema.rb or db/structure.sql, depending on `config.active_record.schema_format`) into the database"
399
454
  task load: [:load_config, :check_protected_environments] do
400
- ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:ruby, ENV["SCHEMA"])
455
+ ActiveRecord::Tasks::DatabaseTasks.load_schema_current(ActiveRecord::Base.schema_format, ENV["SCHEMA"])
401
456
  end
402
457
 
403
- task load_if_ruby: ["db:create", :environment] do
404
- db_namespace["schema:load"].invoke if ActiveRecord::Base.schema_format == :ruby
458
+ namespace :dump do
459
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
460
+ desc "Creates a database schema file (either db/schema.rb or db/structure.sql, depending on `config.active_record.schema_format`) for #{name} database"
461
+ task name => :load_config do
462
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env, name: name)
463
+ ActiveRecord::Base.establish_connection(db_config)
464
+ ActiveRecord::Tasks::DatabaseTasks.dump_schema(db_config)
465
+ db_namespace["schema:dump:#{name}"].reenable
466
+ end
467
+ end
468
+ end
469
+
470
+ namespace :load do
471
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
472
+ desc "Loads a database schema file (either db/schema.rb or db/structure.sql, depending on `config.active_record.schema_format`) into the #{name} database"
473
+ task name => :load_config do
474
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env, name: name)
475
+ ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config, ActiveRecord::Base.schema_format, ENV["SCHEMA"])
476
+ end
477
+ end
405
478
  end
406
479
 
407
480
  namespace :cache do
408
481
  desc "Creates a db/schema_cache.yml file."
409
482
  task dump: :load_config do
410
483
  ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
411
- ActiveRecord::Base.establish_connection(db_config.config)
412
- filename = ActiveRecord::Tasks::DatabaseTasks.cache_dump_filename(db_config.spec_name)
484
+ ActiveRecord::Base.establish_connection(db_config)
485
+ filename = ActiveRecord::Tasks::DatabaseTasks.cache_dump_filename(
486
+ db_config.name,
487
+ schema_cache_path: db_config.schema_cache_path,
488
+ )
413
489
  ActiveRecord::Tasks::DatabaseTasks.dump_schema_cache(
414
490
  ActiveRecord::Base.connection,
415
491
  filename,
@@ -420,8 +496,13 @@ db_namespace = namespace :db do
420
496
  desc "Clears a db/schema_cache.yml file."
421
497
  task clear: :load_config do
422
498
  ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
423
- filename = ActiveRecord::Tasks::DatabaseTasks.cache_dump_filename(db_config.spec_name)
424
- rm_f filename, verbose: false
499
+ filename = ActiveRecord::Tasks::DatabaseTasks.cache_dump_filename(
500
+ db_config.name,
501
+ schema_cache_path: db_config.schema_cache_path,
502
+ )
503
+ ActiveRecord::Tasks::DatabaseTasks.clear_schema_cache(
504
+ filename,
505
+ )
425
506
  end
426
507
  end
427
508
  end
@@ -430,61 +511,85 @@ db_namespace = namespace :db do
430
511
  namespace :structure do
431
512
  desc "Dumps the database structure to db/structure.sql. Specify another file with SCHEMA=db/my_structure.sql"
432
513
  task dump: :load_config do
433
- ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
434
- ActiveRecord::Base.establish_connection(db_config.config)
435
- ActiveRecord::Tasks::DatabaseTasks.dump_schema(db_config.config, :sql, db_config.spec_name)
436
- end
514
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
515
+ Using `bin/rails db:structure:dump` is deprecated and will be removed in Rails 6.2.
516
+ Configure the format using `config.active_record.schema_format = :sql` to use `structure.sql` and run `bin/rails db:schema:dump` instead.
517
+ MSG
437
518
 
519
+ db_namespace["schema:dump"].invoke
438
520
  db_namespace["structure:dump"].reenable
439
521
  end
440
522
 
441
523
  desc "Recreates the databases from the structure.sql file"
442
524
  task load: [:load_config, :check_protected_environments] do
443
- ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:sql, ENV["SCHEMA"])
525
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
526
+ Using `bin/rails db:structure:load` is deprecated and will be removed in Rails 6.2.
527
+ Configure the format using `config.active_record.schema_format = :sql` to use `structure.sql` and run `bin/rails db:schema:load` instead.
528
+ MSG
529
+ db_namespace["schema:load"].invoke
530
+ end
531
+
532
+ namespace :dump do
533
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
534
+ desc "Dumps the #{name} database structure to db/structure.sql. Specify another file with SCHEMA=db/my_structure.sql"
535
+ task name => :load_config do
536
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
537
+ Using `bin/rails db:structure:dump:#{name}` is deprecated and will be removed in Rails 6.2.
538
+ Configure the format using `config.active_record.schema_format = :sql` to use `structure.sql` and run `bin/rails db:schema:dump:#{name}` instead.
539
+ MSG
540
+ db_namespace["schema:dump:#{name}"].invoke
541
+ db_namespace["structure:dump:#{name}"].reenable
542
+ end
543
+ end
444
544
  end
445
545
 
446
- task load_if_sql: ["db:create", :environment] do
447
- db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql
546
+ namespace :load do
547
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
548
+ desc "Recreates the #{name} database from the structure.sql file"
549
+ task name => :load_config do
550
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
551
+ Using `bin/rails db:structure:load:#{name}` is deprecated and will be removed in Rails 6.2.
552
+ Configure the format using `config.active_record.schema_format = :sql` to use `structure.sql` and run `bin/rails db:schema:load:#{name}` instead.
553
+ MSG
554
+ db_namespace["schema:load:#{name}"].invoke
555
+ end
556
+ end
448
557
  end
449
558
  end
450
559
 
451
560
  namespace :test do
452
561
  # desc "Recreate the test database from the current schema"
453
562
  task load: %w(db:test:purge) do
454
- case ActiveRecord::Base.schema_format
455
- when :ruby
456
- db_namespace["test:load_schema"].invoke
457
- when :sql
458
- db_namespace["test:load_structure"].invoke
459
- end
563
+ db_namespace["test:load_schema"].invoke
460
564
  end
461
565
 
462
- # desc "Recreate the test database from an existent schema.rb file"
566
+ # desc "Recreate the test database from an existent schema file (schema.rb or structure.sql, depending on `config.active_record.schema_format`)"
463
567
  task load_schema: %w(db:test:purge) do
464
568
  should_reconnect = ActiveRecord::Base.connection_pool.active_connection?
465
569
  ActiveRecord::Schema.verbose = false
466
570
  ActiveRecord::Base.configurations.configs_for(env_name: "test").each do |db_config|
467
- filename = ActiveRecord::Tasks::DatabaseTasks.dump_filename(db_config.spec_name, :ruby)
468
- ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config.config, :ruby, filename, "test")
571
+ filename = ActiveRecord::Tasks::DatabaseTasks.dump_filename(db_config.name)
572
+ ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config, ActiveRecord::Base.schema_format, filename)
469
573
  end
470
574
  ensure
471
575
  if should_reconnect
472
- ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations.default_hash(ActiveRecord::Tasks::DatabaseTasks.env))
576
+ ActiveRecord::Base.establish_connection(ActiveRecord::Tasks::DatabaseTasks.env.to_sym)
473
577
  end
474
578
  end
475
579
 
476
580
  # desc "Recreate the test database from an existent structure.sql file"
477
581
  task load_structure: %w(db:test:purge) do
478
- ActiveRecord::Base.configurations.configs_for(env_name: "test").each do |db_config|
479
- filename = ActiveRecord::Tasks::DatabaseTasks.dump_filename(db_config.spec_name, :sql)
480
- ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config.config, :sql, filename, "test")
481
- end
582
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
583
+ Using `bin/rails db:test:load_structure` is deprecated and will be removed in Rails 6.2.
584
+ Configure the format using `config.active_record.schema_format = :sql` to use `structure.sql` and run `bin/rails db:test:load_schema` instead.
585
+ MSG
586
+ db_namespace["test:load_schema"].invoke
482
587
  end
483
588
 
484
589
  # desc "Empty the test database"
485
590
  task purge: %w(load_config check_protected_environments) do
486
591
  ActiveRecord::Base.configurations.configs_for(env_name: "test").each do |db_config|
487
- ActiveRecord::Tasks::DatabaseTasks.purge(db_config.config)
592
+ ActiveRecord::Tasks::DatabaseTasks.purge(db_config)
488
593
  end
489
594
  end
490
595
 
@@ -494,6 +599,56 @@ db_namespace = namespace :db do
494
599
  db_namespace["test:load"].invoke
495
600
  end
496
601
  end
602
+
603
+ ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
604
+ # desc "Recreate the #{name} test database"
605
+ namespace :load do
606
+ task name => "db:test:purge:#{name}" do
607
+ db_namespace["test:load_schema:#{name}"].invoke
608
+ end
609
+ end
610
+
611
+ # desc "Recreate the #{name} test database from an existent schema.rb file"
612
+ namespace :load_schema do
613
+ task name => "db:test:purge:#{name}" do
614
+ should_reconnect = ActiveRecord::Base.connection_pool.active_connection?
615
+ ActiveRecord::Schema.verbose = false
616
+ filename = ActiveRecord::Tasks::DatabaseTasks.dump_filename(name)
617
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: "test", name: name)
618
+ ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config, ActiveRecord::Base.schema_format, filename)
619
+ ensure
620
+ if should_reconnect
621
+ ActiveRecord::Base.establish_connection(ActiveRecord::Tasks::DatabaseTasks.env.to_sym)
622
+ end
623
+ end
624
+ end
625
+
626
+ # desc "Recreate the #{name} test database from an existent structure.sql file"
627
+ namespace :load_structure do
628
+ task name => "db:test:purge:#{name}" do
629
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
630
+ Using `bin/rails db:test:load_structure:#{name}` is deprecated and will be removed in Rails 6.2.
631
+ Configure the format using `config.active_record.schema_format = :sql` to use `structure.sql` and run `bin/rails db:test:load_structure:#{name}` instead.
632
+ MSG
633
+ db_namespace["test:load_schema:#{name}"].invoke
634
+ end
635
+ end
636
+
637
+ # desc "Empty the #{name} test database"
638
+ namespace :purge do
639
+ task name => %w(load_config check_protected_environments) do
640
+ db_config = ActiveRecord::Base.configurations.configs_for(env_name: "test", name: name)
641
+ ActiveRecord::Tasks::DatabaseTasks.purge(db_config)
642
+ end
643
+ end
644
+
645
+ # desc 'Load the #{name} database test schema'
646
+ namespace :prepare do
647
+ task name => :load_config do
648
+ db_namespace["test:load:#{name}"].invoke
649
+ end
650
+ end
651
+ end
497
652
  end
498
653
  end
499
654