activerecord 5.2.2.1 → 6.0.2

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 (269) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +734 -508
  3. data/MIT-LICENSE +3 -1
  4. data/README.rdoc +4 -2
  5. data/examples/performance.rb +1 -1
  6. data/lib/active_record.rb +9 -2
  7. data/lib/active_record/aggregations.rb +4 -2
  8. data/lib/active_record/association_relation.rb +15 -6
  9. data/lib/active_record/associations.rb +20 -15
  10. data/lib/active_record/associations/association.rb +61 -20
  11. data/lib/active_record/associations/association_scope.rb +4 -6
  12. data/lib/active_record/associations/belongs_to_association.rb +36 -42
  13. data/lib/active_record/associations/belongs_to_polymorphic_association.rb +0 -4
  14. data/lib/active_record/associations/builder/association.rb +14 -18
  15. data/lib/active_record/associations/builder/belongs_to.rb +19 -52
  16. data/lib/active_record/associations/builder/collection_association.rb +5 -15
  17. data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +17 -38
  18. data/lib/active_record/associations/builder/has_many.rb +2 -0
  19. data/lib/active_record/associations/builder/has_one.rb +35 -1
  20. data/lib/active_record/associations/builder/singular_association.rb +2 -0
  21. data/lib/active_record/associations/collection_association.rb +16 -28
  22. data/lib/active_record/associations/collection_proxy.rb +19 -48
  23. data/lib/active_record/associations/foreign_association.rb +7 -0
  24. data/lib/active_record/associations/has_many_association.rb +3 -10
  25. data/lib/active_record/associations/has_many_through_association.rb +20 -25
  26. data/lib/active_record/associations/has_one_association.rb +28 -30
  27. data/lib/active_record/associations/has_one_through_association.rb +5 -5
  28. data/lib/active_record/associations/join_dependency.rb +28 -28
  29. data/lib/active_record/associations/join_dependency/join_association.rb +27 -7
  30. data/lib/active_record/associations/join_dependency/join_part.rb +2 -2
  31. data/lib/active_record/associations/preloader.rb +40 -32
  32. data/lib/active_record/associations/preloader/association.rb +38 -36
  33. data/lib/active_record/associations/preloader/through_association.rb +48 -39
  34. data/lib/active_record/associations/singular_association.rb +2 -16
  35. data/lib/active_record/attribute_assignment.rb +7 -10
  36. data/lib/active_record/attribute_methods.rb +28 -100
  37. data/lib/active_record/attribute_methods/before_type_cast.rb +4 -1
  38. data/lib/active_record/attribute_methods/dirty.rb +111 -40
  39. data/lib/active_record/attribute_methods/primary_key.rb +15 -22
  40. data/lib/active_record/attribute_methods/query.rb +2 -3
  41. data/lib/active_record/attribute_methods/read.rb +15 -53
  42. data/lib/active_record/attribute_methods/serialization.rb +1 -1
  43. data/lib/active_record/attribute_methods/time_zone_conversion.rb +1 -1
  44. data/lib/active_record/attribute_methods/write.rb +17 -24
  45. data/lib/active_record/attributes.rb +13 -0
  46. data/lib/active_record/autosave_association.rb +22 -8
  47. data/lib/active_record/base.rb +2 -3
  48. data/lib/active_record/callbacks.rb +5 -19
  49. data/lib/active_record/connection_adapters/abstract/connection_pool.rb +137 -26
  50. data/lib/active_record/connection_adapters/abstract/database_limits.rb +17 -4
  51. data/lib/active_record/connection_adapters/abstract/database_statements.rb +114 -130
  52. data/lib/active_record/connection_adapters/abstract/query_cache.rb +26 -11
  53. data/lib/active_record/connection_adapters/abstract/quoting.rb +68 -17
  54. data/lib/active_record/connection_adapters/abstract/schema_creation.rb +19 -12
  55. data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +76 -48
  56. data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +1 -3
  57. data/lib/active_record/connection_adapters/abstract/schema_statements.rb +135 -56
  58. data/lib/active_record/connection_adapters/abstract/transaction.rb +96 -56
  59. data/lib/active_record/connection_adapters/abstract_adapter.rb +189 -43
  60. data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +151 -198
  61. data/lib/active_record/connection_adapters/column.rb +17 -13
  62. data/lib/active_record/connection_adapters/connection_specification.rb +53 -43
  63. data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +7 -11
  64. data/lib/active_record/connection_adapters/mysql/database_statements.rb +75 -13
  65. data/lib/active_record/connection_adapters/mysql/quoting.rb +44 -7
  66. data/lib/active_record/connection_adapters/mysql/schema_creation.rb +3 -4
  67. data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +40 -32
  68. data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +14 -6
  69. data/lib/active_record/connection_adapters/mysql/schema_statements.rb +129 -13
  70. data/lib/active_record/connection_adapters/mysql/type_metadata.rb +6 -10
  71. data/lib/active_record/connection_adapters/mysql2_adapter.rb +26 -9
  72. data/lib/active_record/connection_adapters/postgresql/column.rb +17 -31
  73. data/lib/active_record/connection_adapters/postgresql/database_statements.rb +22 -1
  74. data/lib/active_record/connection_adapters/postgresql/oid/array.rb +1 -1
  75. data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +1 -4
  76. data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +1 -1
  77. data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +1 -1
  78. data/lib/active_record/connection_adapters/postgresql/oid/money.rb +2 -2
  79. data/lib/active_record/connection_adapters/postgresql/oid/point.rb +1 -1
  80. data/lib/active_record/connection_adapters/postgresql/oid/range.rb +1 -1
  81. data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +9 -7
  82. data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +6 -3
  83. data/lib/active_record/connection_adapters/postgresql/quoting.rb +44 -7
  84. data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +47 -0
  85. data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +107 -91
  86. data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +61 -77
  87. data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +24 -27
  88. data/lib/active_record/connection_adapters/postgresql_adapter.rb +164 -74
  89. data/lib/active_record/connection_adapters/schema_cache.rb +37 -14
  90. data/lib/active_record/connection_adapters/sql_type_metadata.rb +11 -8
  91. data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +120 -0
  92. data/lib/active_record/connection_adapters/sqlite3/quoting.rb +45 -5
  93. data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +42 -11
  94. data/lib/active_record/connection_adapters/sqlite3_adapter.rb +131 -143
  95. data/lib/active_record/connection_handling.rb +155 -26
  96. data/lib/active_record/core.rb +104 -59
  97. data/lib/active_record/counter_cache.rb +4 -29
  98. data/lib/active_record/database_configurations.rb +233 -0
  99. data/lib/active_record/database_configurations/database_config.rb +37 -0
  100. data/lib/active_record/database_configurations/hash_config.rb +50 -0
  101. data/lib/active_record/database_configurations/url_config.rb +79 -0
  102. data/lib/active_record/dynamic_matchers.rb +1 -1
  103. data/lib/active_record/enum.rb +37 -7
  104. data/lib/active_record/errors.rb +30 -16
  105. data/lib/active_record/explain.rb +1 -1
  106. data/lib/active_record/fixture_set/model_metadata.rb +33 -0
  107. data/lib/active_record/fixture_set/render_context.rb +17 -0
  108. data/lib/active_record/fixture_set/table_row.rb +153 -0
  109. data/lib/active_record/fixture_set/table_rows.rb +47 -0
  110. data/lib/active_record/fixtures.rb +145 -472
  111. data/lib/active_record/gem_version.rb +3 -3
  112. data/lib/active_record/inheritance.rb +13 -3
  113. data/lib/active_record/insert_all.rb +179 -0
  114. data/lib/active_record/integration.rb +68 -16
  115. data/lib/active_record/internal_metadata.rb +10 -2
  116. data/lib/active_record/locking/optimistic.rb +5 -6
  117. data/lib/active_record/locking/pessimistic.rb +3 -3
  118. data/lib/active_record/log_subscriber.rb +7 -26
  119. data/lib/active_record/middleware/database_selector.rb +75 -0
  120. data/lib/active_record/middleware/database_selector/resolver.rb +88 -0
  121. data/lib/active_record/middleware/database_selector/resolver/session.rb +45 -0
  122. data/lib/active_record/migration.rb +100 -81
  123. data/lib/active_record/migration/command_recorder.rb +50 -6
  124. data/lib/active_record/migration/compatibility.rb +91 -64
  125. data/lib/active_record/model_schema.rb +33 -9
  126. data/lib/active_record/nested_attributes.rb +2 -2
  127. data/lib/active_record/no_touching.rb +7 -0
  128. data/lib/active_record/persistence.rb +231 -25
  129. data/lib/active_record/query_cache.rb +11 -4
  130. data/lib/active_record/querying.rb +33 -22
  131. data/lib/active_record/railtie.rb +80 -43
  132. data/lib/active_record/railties/collection_cache_association_loading.rb +34 -0
  133. data/lib/active_record/railties/controller_runtime.rb +30 -35
  134. data/lib/active_record/railties/databases.rake +199 -46
  135. data/lib/active_record/reflection.rb +42 -44
  136. data/lib/active_record/relation.rb +311 -80
  137. data/lib/active_record/relation/batches.rb +13 -10
  138. data/lib/active_record/relation/calculations.rb +67 -57
  139. data/lib/active_record/relation/delegation.rb +26 -43
  140. data/lib/active_record/relation/finder_methods.rb +28 -28
  141. data/lib/active_record/relation/merger.rb +17 -23
  142. data/lib/active_record/relation/predicate_builder.rb +18 -15
  143. data/lib/active_record/relation/predicate_builder/array_handler.rb +5 -4
  144. data/lib/active_record/relation/predicate_builder/association_query_value.rb +1 -4
  145. data/lib/active_record/relation/predicate_builder/base_handler.rb +1 -2
  146. data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +1 -2
  147. data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +1 -4
  148. data/lib/active_record/relation/predicate_builder/range_handler.rb +3 -23
  149. data/lib/active_record/relation/query_attribute.rb +17 -10
  150. data/lib/active_record/relation/query_methods.rb +247 -73
  151. data/lib/active_record/relation/spawn_methods.rb +1 -1
  152. data/lib/active_record/relation/where_clause.rb +14 -10
  153. data/lib/active_record/relation/where_clause_factory.rb +1 -2
  154. data/lib/active_record/result.rb +30 -11
  155. data/lib/active_record/sanitization.rb +32 -40
  156. data/lib/active_record/schema.rb +2 -11
  157. data/lib/active_record/schema_dumper.rb +22 -7
  158. data/lib/active_record/schema_migration.rb +5 -1
  159. data/lib/active_record/scoping.rb +8 -8
  160. data/lib/active_record/scoping/default.rb +6 -7
  161. data/lib/active_record/scoping/named.rb +20 -15
  162. data/lib/active_record/statement_cache.rb +32 -5
  163. data/lib/active_record/store.rb +87 -8
  164. data/lib/active_record/table_metadata.rb +10 -17
  165. data/lib/active_record/tasks/database_tasks.rb +194 -25
  166. data/lib/active_record/tasks/mysql_database_tasks.rb +5 -5
  167. data/lib/active_record/tasks/postgresql_database_tasks.rb +5 -7
  168. data/lib/active_record/tasks/sqlite_database_tasks.rb +2 -8
  169. data/lib/active_record/test_databases.rb +23 -0
  170. data/lib/active_record/test_fixtures.rb +225 -0
  171. data/lib/active_record/timestamp.rb +39 -25
  172. data/lib/active_record/touch_later.rb +4 -2
  173. data/lib/active_record/transactions.rb +57 -66
  174. data/lib/active_record/translation.rb +1 -1
  175. data/lib/active_record/type.rb +3 -4
  176. data/lib/active_record/type/adapter_specific_registry.rb +1 -8
  177. data/lib/active_record/type_caster/connection.rb +15 -14
  178. data/lib/active_record/type_caster/map.rb +1 -4
  179. data/lib/active_record/validations.rb +1 -0
  180. data/lib/active_record/validations/uniqueness.rb +15 -27
  181. data/lib/arel.rb +58 -0
  182. data/lib/arel/alias_predication.rb +9 -0
  183. data/lib/arel/attributes.rb +22 -0
  184. data/lib/arel/attributes/attribute.rb +37 -0
  185. data/lib/arel/collectors/bind.rb +24 -0
  186. data/lib/arel/collectors/composite.rb +31 -0
  187. data/lib/arel/collectors/plain_string.rb +20 -0
  188. data/lib/arel/collectors/sql_string.rb +20 -0
  189. data/lib/arel/collectors/substitute_binds.rb +28 -0
  190. data/lib/arel/crud.rb +42 -0
  191. data/lib/arel/delete_manager.rb +18 -0
  192. data/lib/arel/errors.rb +9 -0
  193. data/lib/arel/expressions.rb +29 -0
  194. data/lib/arel/factory_methods.rb +49 -0
  195. data/lib/arel/insert_manager.rb +49 -0
  196. data/lib/arel/math.rb +45 -0
  197. data/lib/arel/nodes.rb +68 -0
  198. data/lib/arel/nodes/and.rb +32 -0
  199. data/lib/arel/nodes/ascending.rb +23 -0
  200. data/lib/arel/nodes/binary.rb +52 -0
  201. data/lib/arel/nodes/bind_param.rb +36 -0
  202. data/lib/arel/nodes/case.rb +55 -0
  203. data/lib/arel/nodes/casted.rb +50 -0
  204. data/lib/arel/nodes/comment.rb +29 -0
  205. data/lib/arel/nodes/count.rb +12 -0
  206. data/lib/arel/nodes/delete_statement.rb +45 -0
  207. data/lib/arel/nodes/descending.rb +23 -0
  208. data/lib/arel/nodes/equality.rb +18 -0
  209. data/lib/arel/nodes/extract.rb +24 -0
  210. data/lib/arel/nodes/false.rb +16 -0
  211. data/lib/arel/nodes/full_outer_join.rb +8 -0
  212. data/lib/arel/nodes/function.rb +44 -0
  213. data/lib/arel/nodes/grouping.rb +8 -0
  214. data/lib/arel/nodes/in.rb +8 -0
  215. data/lib/arel/nodes/infix_operation.rb +80 -0
  216. data/lib/arel/nodes/inner_join.rb +8 -0
  217. data/lib/arel/nodes/insert_statement.rb +37 -0
  218. data/lib/arel/nodes/join_source.rb +20 -0
  219. data/lib/arel/nodes/matches.rb +18 -0
  220. data/lib/arel/nodes/named_function.rb +23 -0
  221. data/lib/arel/nodes/node.rb +50 -0
  222. data/lib/arel/nodes/node_expression.rb +13 -0
  223. data/lib/arel/nodes/outer_join.rb +8 -0
  224. data/lib/arel/nodes/over.rb +15 -0
  225. data/lib/arel/nodes/regexp.rb +16 -0
  226. data/lib/arel/nodes/right_outer_join.rb +8 -0
  227. data/lib/arel/nodes/select_core.rb +67 -0
  228. data/lib/arel/nodes/select_statement.rb +41 -0
  229. data/lib/arel/nodes/sql_literal.rb +16 -0
  230. data/lib/arel/nodes/string_join.rb +11 -0
  231. data/lib/arel/nodes/table_alias.rb +27 -0
  232. data/lib/arel/nodes/terminal.rb +16 -0
  233. data/lib/arel/nodes/true.rb +16 -0
  234. data/lib/arel/nodes/unary.rb +45 -0
  235. data/lib/arel/nodes/unary_operation.rb +20 -0
  236. data/lib/arel/nodes/unqualified_column.rb +22 -0
  237. data/lib/arel/nodes/update_statement.rb +41 -0
  238. data/lib/arel/nodes/values_list.rb +9 -0
  239. data/lib/arel/nodes/window.rb +126 -0
  240. data/lib/arel/nodes/with.rb +11 -0
  241. data/lib/arel/order_predications.rb +13 -0
  242. data/lib/arel/predications.rb +257 -0
  243. data/lib/arel/select_manager.rb +271 -0
  244. data/lib/arel/table.rb +110 -0
  245. data/lib/arel/tree_manager.rb +72 -0
  246. data/lib/arel/update_manager.rb +34 -0
  247. data/lib/arel/visitors.rb +20 -0
  248. data/lib/arel/visitors/depth_first.rb +204 -0
  249. data/lib/arel/visitors/dot.rb +297 -0
  250. data/lib/arel/visitors/ibm_db.rb +34 -0
  251. data/lib/arel/visitors/informix.rb +62 -0
  252. data/lib/arel/visitors/mssql.rb +157 -0
  253. data/lib/arel/visitors/mysql.rb +83 -0
  254. data/lib/arel/visitors/oracle.rb +159 -0
  255. data/lib/arel/visitors/oracle12.rb +66 -0
  256. data/lib/arel/visitors/postgresql.rb +110 -0
  257. data/lib/arel/visitors/sqlite.rb +39 -0
  258. data/lib/arel/visitors/to_sql.rb +889 -0
  259. data/lib/arel/visitors/visitor.rb +46 -0
  260. data/lib/arel/visitors/where_sql.rb +23 -0
  261. data/lib/arel/window_predications.rb +9 -0
  262. data/lib/rails/generators/active_record/migration.rb +14 -1
  263. data/lib/rails/generators/active_record/migration/migration_generator.rb +2 -5
  264. data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +1 -1
  265. data/lib/rails/generators/active_record/migration/templates/migration.rb.tt +4 -2
  266. data/lib/rails/generators/active_record/model/model_generator.rb +1 -0
  267. data/lib/rails/generators/active_record/model/templates/model.rb.tt +10 -1
  268. metadata +111 -26
  269. data/lib/active_record/collection_cache_key.rb +0 -53
@@ -0,0 +1,46 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Arel # :nodoc: all
4
+ module Visitors
5
+ class Visitor
6
+ def initialize
7
+ @dispatch = get_dispatch_cache
8
+ end
9
+
10
+ def accept(object, collector = nil)
11
+ visit object, collector
12
+ end
13
+
14
+ private
15
+
16
+ attr_reader :dispatch
17
+
18
+ def self.dispatch_cache
19
+ @dispatch_cache ||= Hash.new do |hash, klass|
20
+ hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
21
+ end
22
+ end
23
+
24
+ def get_dispatch_cache
25
+ self.class.dispatch_cache
26
+ end
27
+
28
+ def visit(object, collector = nil)
29
+ dispatch_method = dispatch[object.class]
30
+ if collector
31
+ send dispatch_method, object, collector
32
+ else
33
+ send dispatch_method, object
34
+ end
35
+ rescue NoMethodError => e
36
+ raise e if respond_to?(dispatch_method, true)
37
+ superklass = object.class.ancestors.find { |klass|
38
+ respond_to?(dispatch[klass], true)
39
+ }
40
+ raise(TypeError, "Cannot visit #{object.class}") unless superklass
41
+ dispatch[object.class] = dispatch[superklass]
42
+ retry
43
+ end
44
+ end
45
+ end
46
+ end
@@ -0,0 +1,23 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Arel # :nodoc: all
4
+ module Visitors
5
+ class WhereSql < Arel::Visitors::ToSql
6
+ def initialize(inner_visitor, *args, &block)
7
+ @inner_visitor = inner_visitor
8
+ super(*args, &block)
9
+ end
10
+
11
+ private
12
+
13
+ def visit_Arel_Nodes_SelectCore(o, collector)
14
+ collector << "WHERE "
15
+ wheres = o.wheres.map do |where|
16
+ Nodes::SqlLiteral.new(@inner_visitor.accept(where, collector.class.new).value)
17
+ end
18
+
19
+ inject_join wheres, collector, " AND "
20
+ end
21
+ end
22
+ end
23
+ end
@@ -0,0 +1,9 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Arel # :nodoc: all
4
+ module WindowPredications
5
+ def over(expr = nil)
6
+ Nodes::Over.new(self, expr)
7
+ end
8
+ end
9
+ end
@@ -25,11 +25,24 @@ module ActiveRecord
25
25
 
26
26
  def db_migrate_path
27
27
  if defined?(Rails.application) && Rails.application
28
- Rails.application.config.paths["db/migrate"].to_ary.first
28
+ configured_migrate_path || default_migrate_path
29
29
  else
30
30
  "db/migrate"
31
31
  end
32
32
  end
33
+
34
+ def default_migrate_path
35
+ Rails.application.config.paths["db/migrate"].to_ary.first
36
+ end
37
+
38
+ def configured_migrate_path
39
+ return unless database = options[:database]
40
+ config = ActiveRecord::Base.configurations.configs_for(
41
+ env_name: Rails.env,
42
+ spec_name: database,
43
+ )
44
+ config&.migrations_paths
45
+ end
33
46
  end
34
47
  end
35
48
  end
@@ -8,6 +8,7 @@ module ActiveRecord
8
8
  argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
9
9
 
10
10
  class_option :primary_key_type, type: :string, desc: "The type for primary key"
11
+ class_option :database, type: :string, aliases: %i(--db), desc: "The database for your migration. By default, the current environment's primary database is used."
11
12
 
12
13
  def create_migration_file
13
14
  set_local_assigns!
@@ -15,12 +16,8 @@ module ActiveRecord
15
16
  migration_template @migration_template, File.join(db_migrate_path, "#{file_name}.rb")
16
17
  end
17
18
 
18
- # TODO Change this to private once we've dropped Ruby 2.2 support.
19
- # Workaround for Ruby 2.2 "private attribute?" warning.
20
- protected
21
- attr_reader :migration_action, :join_tables
22
-
23
19
  private
20
+ attr_reader :migration_action, :join_tables
24
21
 
25
22
  # Sets the default migration template that is being used for the generation of the migration.
26
23
  # Depending on command line arguments, the migration template and the table name instance
@@ -6,7 +6,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
6
6
  t.string :password_digest<%= attribute.inject_options %>
7
7
  <% elsif attribute.token? -%>
8
8
  t.string :<%= attribute.name %><%= attribute.inject_options %>
9
- <% else -%>
9
+ <% elsif !attribute.virtual? -%>
10
10
  t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
11
11
  <% end -%>
12
12
  <% end -%>
@@ -7,7 +7,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
7
7
  <%- elsif attribute.token? -%>
8
8
  add_column :<%= table_name %>, :<%= attribute.name %>, :string<%= attribute.inject_options %>
9
9
  add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>, unique: true
10
- <%- else -%>
10
+ <%- elsif !attribute.virtual? -%>
11
11
  add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
12
12
  <%- if attribute.has_index? -%>
13
13
  add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
@@ -21,7 +21,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
21
21
  <%- attributes.each do |attribute| -%>
22
22
  <%- if attribute.reference? -%>
23
23
  t.references :<%= attribute.name %><%= attribute.inject_options %>
24
- <%- else -%>
24
+ <%- elsif !attribute.virtual? -%>
25
25
  <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
26
26
  <%- end -%>
27
27
  <%- end -%>
@@ -37,7 +37,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
37
37
  <%- if attribute.has_index? -%>
38
38
  remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
39
39
  <%- end -%>
40
+ <%- if !attribute.virtual? %>
40
41
  remove_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
42
+ <%- end -%>
41
43
  <%- end -%>
42
44
  <%- end -%>
43
45
  <%- end -%>
@@ -14,6 +14,7 @@ module ActiveRecord
14
14
  class_option :parent, type: :string, desc: "The parent class for the generated model"
15
15
  class_option :indexes, type: :boolean, default: true, desc: "Add indexes for references and belongs_to columns"
16
16
  class_option :primary_key_type, type: :string, desc: "The type for primary key"
17
+ class_option :database, type: :string, aliases: %i(--db), desc: "The database for your model's migration. By default, the current environment's primary database is used."
17
18
 
18
19
  # creates the migration file for the model.
19
20
  def create_migration_file
@@ -1,7 +1,16 @@
1
1
  <% module_namespacing do -%>
2
2
  class <%= class_name %> < <%= parent_class_name.classify %>
3
3
  <% attributes.select(&:reference?).each do |attribute| -%>
4
- belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %>
4
+ belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
5
+ <% end -%>
6
+ <% attributes.select(&:rich_text?).each do |attribute| -%>
7
+ has_rich_text :<%= attribute.name %>
8
+ <% end -%>
9
+ <% attributes.select(&:attachment?).each do |attribute| -%>
10
+ has_one_attached :<%= attribute.name %>
11
+ <% end -%>
12
+ <% attributes.select(&:attachments?).each do |attribute| -%>
13
+ has_many_attached :<%= attribute.name %>
5
14
  <% end -%>
6
15
  <% attributes.select(&:token?).each do |attribute| -%>
7
16
  has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activerecord
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.2.2.1
4
+ version: 6.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Heinemeier Hansson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-13 00:00:00.000000000 Z
11
+ date: 2019-12-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,42 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 5.2.2.1
19
+ version: 6.0.2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 5.2.2.1
26
+ version: 6.0.2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activemodel
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 5.2.2.1
33
+ version: 6.0.2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 5.2.2.1
41
- - !ruby/object:Gem::Dependency
42
- name: arel
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - ">="
46
- - !ruby/object:Gem::Version
47
- version: '9.0'
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - ">="
53
- - !ruby/object:Gem::Version
54
- version: '9.0'
40
+ version: 6.0.2
55
41
  description: Databases on Rails. Build a persistent domain model by mapping database
56
42
  tables to Ruby classes. Strong conventions for associations, validations, aggregations,
57
43
  migrations, and testing come baked-in.
@@ -115,7 +101,6 @@ files:
115
101
  - lib/active_record/callbacks.rb
116
102
  - lib/active_record/coders/json.rb
117
103
  - lib/active_record/coders/yaml_column.rb
118
- - lib/active_record/collection_cache_key.rb
119
104
  - lib/active_record/connection_adapters/abstract/connection_pool.rb
120
105
  - lib/active_record/connection_adapters/abstract/database_limits.rb
121
106
  - lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -179,6 +164,7 @@ files:
179
164
  - lib/active_record/connection_adapters/postgresql_adapter.rb
180
165
  - lib/active_record/connection_adapters/schema_cache.rb
181
166
  - lib/active_record/connection_adapters/sql_type_metadata.rb
167
+ - lib/active_record/connection_adapters/sqlite3/database_statements.rb
182
168
  - lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb
183
169
  - lib/active_record/connection_adapters/sqlite3/quoting.rb
184
170
  - lib/active_record/connection_adapters/sqlite3/schema_creation.rb
@@ -190,6 +176,10 @@ files:
190
176
  - lib/active_record/connection_handling.rb
191
177
  - lib/active_record/core.rb
192
178
  - lib/active_record/counter_cache.rb
179
+ - lib/active_record/database_configurations.rb
180
+ - lib/active_record/database_configurations/database_config.rb
181
+ - lib/active_record/database_configurations/hash_config.rb
182
+ - lib/active_record/database_configurations/url_config.rb
193
183
  - lib/active_record/define_callbacks.rb
194
184
  - lib/active_record/dynamic_matchers.rb
195
185
  - lib/active_record/enum.rb
@@ -198,9 +188,14 @@ files:
198
188
  - lib/active_record/explain_registry.rb
199
189
  - lib/active_record/explain_subscriber.rb
200
190
  - lib/active_record/fixture_set/file.rb
191
+ - lib/active_record/fixture_set/model_metadata.rb
192
+ - lib/active_record/fixture_set/render_context.rb
193
+ - lib/active_record/fixture_set/table_row.rb
194
+ - lib/active_record/fixture_set/table_rows.rb
201
195
  - lib/active_record/fixtures.rb
202
196
  - lib/active_record/gem_version.rb
203
197
  - lib/active_record/inheritance.rb
198
+ - lib/active_record/insert_all.rb
204
199
  - lib/active_record/integration.rb
205
200
  - lib/active_record/internal_metadata.rb
206
201
  - lib/active_record/legacy_yaml_adapter.rb
@@ -208,6 +203,9 @@ files:
208
203
  - lib/active_record/locking/optimistic.rb
209
204
  - lib/active_record/locking/pessimistic.rb
210
205
  - lib/active_record/log_subscriber.rb
206
+ - lib/active_record/middleware/database_selector.rb
207
+ - lib/active_record/middleware/database_selector/resolver.rb
208
+ - lib/active_record/middleware/database_selector/resolver/session.rb
211
209
  - lib/active_record/migration.rb
212
210
  - lib/active_record/migration/command_recorder.rb
213
211
  - lib/active_record/migration/compatibility.rb
@@ -220,6 +218,7 @@ files:
220
218
  - lib/active_record/query_cache.rb
221
219
  - lib/active_record/querying.rb
222
220
  - lib/active_record/railtie.rb
221
+ - lib/active_record/railties/collection_cache_association_loading.rb
223
222
  - lib/active_record/railties/console_sandbox.rb
224
223
  - lib/active_record/railties/controller_runtime.rb
225
224
  - lib/active_record/railties/databases.rake
@@ -266,6 +265,8 @@ files:
266
265
  - lib/active_record/tasks/mysql_database_tasks.rb
267
266
  - lib/active_record/tasks/postgresql_database_tasks.rb
268
267
  - lib/active_record/tasks/sqlite_database_tasks.rb
268
+ - lib/active_record/test_databases.rb
269
+ - lib/active_record/test_fixtures.rb
269
270
  - lib/active_record/timestamp.rb
270
271
  - lib/active_record/touch_later.rb
271
272
  - lib/active_record/transactions.rb
@@ -293,6 +294,87 @@ files:
293
294
  - lib/active_record/validations/presence.rb
294
295
  - lib/active_record/validations/uniqueness.rb
295
296
  - lib/active_record/version.rb
297
+ - lib/arel.rb
298
+ - lib/arel/alias_predication.rb
299
+ - lib/arel/attributes.rb
300
+ - lib/arel/attributes/attribute.rb
301
+ - lib/arel/collectors/bind.rb
302
+ - lib/arel/collectors/composite.rb
303
+ - lib/arel/collectors/plain_string.rb
304
+ - lib/arel/collectors/sql_string.rb
305
+ - lib/arel/collectors/substitute_binds.rb
306
+ - lib/arel/crud.rb
307
+ - lib/arel/delete_manager.rb
308
+ - lib/arel/errors.rb
309
+ - lib/arel/expressions.rb
310
+ - lib/arel/factory_methods.rb
311
+ - lib/arel/insert_manager.rb
312
+ - lib/arel/math.rb
313
+ - lib/arel/nodes.rb
314
+ - lib/arel/nodes/and.rb
315
+ - lib/arel/nodes/ascending.rb
316
+ - lib/arel/nodes/binary.rb
317
+ - lib/arel/nodes/bind_param.rb
318
+ - lib/arel/nodes/case.rb
319
+ - lib/arel/nodes/casted.rb
320
+ - lib/arel/nodes/comment.rb
321
+ - lib/arel/nodes/count.rb
322
+ - lib/arel/nodes/delete_statement.rb
323
+ - lib/arel/nodes/descending.rb
324
+ - lib/arel/nodes/equality.rb
325
+ - lib/arel/nodes/extract.rb
326
+ - lib/arel/nodes/false.rb
327
+ - lib/arel/nodes/full_outer_join.rb
328
+ - lib/arel/nodes/function.rb
329
+ - lib/arel/nodes/grouping.rb
330
+ - lib/arel/nodes/in.rb
331
+ - lib/arel/nodes/infix_operation.rb
332
+ - lib/arel/nodes/inner_join.rb
333
+ - lib/arel/nodes/insert_statement.rb
334
+ - lib/arel/nodes/join_source.rb
335
+ - lib/arel/nodes/matches.rb
336
+ - lib/arel/nodes/named_function.rb
337
+ - lib/arel/nodes/node.rb
338
+ - lib/arel/nodes/node_expression.rb
339
+ - lib/arel/nodes/outer_join.rb
340
+ - lib/arel/nodes/over.rb
341
+ - lib/arel/nodes/regexp.rb
342
+ - lib/arel/nodes/right_outer_join.rb
343
+ - lib/arel/nodes/select_core.rb
344
+ - lib/arel/nodes/select_statement.rb
345
+ - lib/arel/nodes/sql_literal.rb
346
+ - lib/arel/nodes/string_join.rb
347
+ - lib/arel/nodes/table_alias.rb
348
+ - lib/arel/nodes/terminal.rb
349
+ - lib/arel/nodes/true.rb
350
+ - lib/arel/nodes/unary.rb
351
+ - lib/arel/nodes/unary_operation.rb
352
+ - lib/arel/nodes/unqualified_column.rb
353
+ - lib/arel/nodes/update_statement.rb
354
+ - lib/arel/nodes/values_list.rb
355
+ - lib/arel/nodes/window.rb
356
+ - lib/arel/nodes/with.rb
357
+ - lib/arel/order_predications.rb
358
+ - lib/arel/predications.rb
359
+ - lib/arel/select_manager.rb
360
+ - lib/arel/table.rb
361
+ - lib/arel/tree_manager.rb
362
+ - lib/arel/update_manager.rb
363
+ - lib/arel/visitors.rb
364
+ - lib/arel/visitors/depth_first.rb
365
+ - lib/arel/visitors/dot.rb
366
+ - lib/arel/visitors/ibm_db.rb
367
+ - lib/arel/visitors/informix.rb
368
+ - lib/arel/visitors/mssql.rb
369
+ - lib/arel/visitors/mysql.rb
370
+ - lib/arel/visitors/oracle.rb
371
+ - lib/arel/visitors/oracle12.rb
372
+ - lib/arel/visitors/postgresql.rb
373
+ - lib/arel/visitors/sqlite.rb
374
+ - lib/arel/visitors/to_sql.rb
375
+ - lib/arel/visitors/visitor.rb
376
+ - lib/arel/visitors/where_sql.rb
377
+ - lib/arel/window_predications.rb
296
378
  - lib/rails/generators/active_record.rb
297
379
  - lib/rails/generators/active_record/application_record/application_record_generator.rb
298
380
  - lib/rails/generators/active_record/application_record/templates/application_record.rb.tt
@@ -303,12 +385,15 @@ files:
303
385
  - lib/rails/generators/active_record/model/model_generator.rb
304
386
  - lib/rails/generators/active_record/model/templates/model.rb.tt
305
387
  - lib/rails/generators/active_record/model/templates/module.rb.tt
306
- homepage: http://rubyonrails.org
388
+ homepage: https://rubyonrails.org
307
389
  licenses:
308
390
  - MIT
309
391
  metadata:
310
- source_code_uri: https://github.com/rails/rails/tree/v5.2.2.1/activerecord
311
- changelog_uri: https://github.com/rails/rails/blob/v5.2.2.1/activerecord/CHANGELOG.md
392
+ bug_tracker_uri: https://github.com/rails/rails/issues
393
+ changelog_uri: https://github.com/rails/rails/blob/v6.0.2/activerecord/CHANGELOG.md
394
+ documentation_uri: https://api.rubyonrails.org/v6.0.2/
395
+ mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
396
+ source_code_uri: https://github.com/rails/rails/tree/v6.0.2/activerecord
312
397
  post_install_message:
313
398
  rdoc_options:
314
399
  - "--main"
@@ -319,14 +404,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
319
404
  requirements:
320
405
  - - ">="
321
406
  - !ruby/object:Gem::Version
322
- version: 2.2.2
407
+ version: 2.5.0
323
408
  required_rubygems_version: !ruby/object:Gem::Requirement
324
409
  requirements:
325
410
  - - ">="
326
411
  - !ruby/object:Gem::Version
327
412
  version: '0'
328
413
  requirements: []
329
- rubygems_version: 3.0.1
414
+ rubygems_version: 3.0.3
330
415
  signing_key:
331
416
  specification_version: 4
332
417
  summary: Object-relational mapper framework (part of Rails).
@@ -1,53 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module ActiveRecord
4
- module CollectionCacheKey
5
- def collection_cache_key(collection = all, timestamp_column = :updated_at) # :nodoc:
6
- query_signature = ActiveSupport::Digest.hexdigest(collection.to_sql)
7
- key = "#{collection.model_name.cache_key}/query-#{query_signature}"
8
-
9
- if collection.loaded? || collection.distinct_value
10
- size = collection.records.size
11
- if size > 0
12
- timestamp = collection.max_by(&timestamp_column)._read_attribute(timestamp_column)
13
- end
14
- else
15
- if collection.eager_loading?
16
- collection = collection.send(:apply_join_dependency)
17
- end
18
- column_type = type_for_attribute(timestamp_column)
19
- column = connection.column_name_from_arel_node(collection.arel_attribute(timestamp_column))
20
- select_values = "COUNT(*) AS #{connection.quote_column_name("size")}, MAX(%s) AS timestamp"
21
-
22
- if collection.has_limit_or_offset?
23
- query = collection.select("#{column} AS collection_cache_key_timestamp")
24
- subquery_alias = "subquery_for_cache_key"
25
- subquery_column = "#{subquery_alias}.collection_cache_key_timestamp"
26
- subquery = query.arel.as(subquery_alias)
27
- arel = Arel::SelectManager.new(subquery).project(select_values % subquery_column)
28
- else
29
- query = collection.unscope(:order)
30
- query.select_values = [select_values % column]
31
- arel = query.arel
32
- end
33
-
34
- result = connection.select_one(arel, nil)
35
-
36
- if result.blank?
37
- size = 0
38
- timestamp = nil
39
- else
40
- size = result["size"]
41
- timestamp = column_type.deserialize(result["timestamp"])
42
- end
43
-
44
- end
45
-
46
- if timestamp
47
- "#{key}-#{size}-#{timestamp.utc.to_s(cache_timestamp_format)}"
48
- else
49
- "#{key}-#{size}"
50
- end
51
- end
52
- end
53
- end