activerecord 5.0.7 → 5.1.7
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.
- checksums.yaml +5 -5
- data/CHANGELOG.md +657 -2080
- data/MIT-LICENSE +1 -1
- data/README.rdoc +1 -1
- data/examples/performance.rb +28 -28
- data/examples/simple.rb +3 -3
- data/lib/active_record/aggregations.rb +244 -244
- data/lib/active_record/association_relation.rb +5 -5
- data/lib/active_record/associations/alias_tracker.rb +10 -11
- data/lib/active_record/associations/association.rb +23 -5
- data/lib/active_record/associations/association_scope.rb +95 -81
- data/lib/active_record/associations/belongs_to_association.rb +7 -4
- data/lib/active_record/associations/builder/belongs_to.rb +30 -16
- data/lib/active_record/associations/builder/collection_association.rb +1 -2
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +27 -27
- data/lib/active_record/associations/collection_association.rb +36 -205
- data/lib/active_record/associations/collection_proxy.rb +132 -63
- data/lib/active_record/associations/has_many_association.rb +10 -19
- data/lib/active_record/associations/has_many_through_association.rb +12 -4
- data/lib/active_record/associations/has_one_association.rb +24 -28
- data/lib/active_record/associations/has_one_through_association.rb +5 -1
- data/lib/active_record/associations/join_dependency/join_association.rb +4 -28
- data/lib/active_record/associations/join_dependency/join_base.rb +1 -1
- data/lib/active_record/associations/join_dependency/join_part.rb +1 -1
- data/lib/active_record/associations/join_dependency.rb +121 -118
- data/lib/active_record/associations/preloader/association.rb +64 -64
- data/lib/active_record/associations/preloader/belongs_to.rb +0 -2
- data/lib/active_record/associations/preloader/collection_association.rb +6 -6
- data/lib/active_record/associations/preloader/has_many.rb +0 -2
- data/lib/active_record/associations/preloader/singular_association.rb +6 -8
- data/lib/active_record/associations/preloader/through_association.rb +41 -41
- data/lib/active_record/associations/preloader.rb +94 -94
- data/lib/active_record/associations/singular_association.rb +8 -25
- data/lib/active_record/associations/through_association.rb +2 -5
- data/lib/active_record/associations.rb +1591 -1562
- data/lib/active_record/attribute/user_provided_default.rb +4 -2
- data/lib/active_record/attribute.rb +98 -71
- data/lib/active_record/attribute_assignment.rb +61 -61
- data/lib/active_record/attribute_decorators.rb +35 -13
- data/lib/active_record/attribute_methods/before_type_cast.rb +7 -7
- data/lib/active_record/attribute_methods/dirty.rb +229 -46
- data/lib/active_record/attribute_methods/primary_key.rb +74 -73
- data/lib/active_record/attribute_methods/read.rb +39 -35
- data/lib/active_record/attribute_methods/serialization.rb +7 -7
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +35 -58
- data/lib/active_record/attribute_methods/write.rb +30 -33
- data/lib/active_record/attribute_methods.rb +56 -65
- data/lib/active_record/attribute_mutation_tracker.rb +63 -11
- data/lib/active_record/attribute_set/builder.rb +27 -33
- data/lib/active_record/attribute_set/yaml_encoder.rb +41 -0
- data/lib/active_record/attribute_set.rb +9 -6
- data/lib/active_record/attributes.rb +22 -22
- data/lib/active_record/autosave_association.rb +18 -13
- data/lib/active_record/base.rb +24 -22
- data/lib/active_record/callbacks.rb +56 -14
- data/lib/active_record/coders/yaml_column.rb +9 -11
- data/lib/active_record/collection_cache_key.rb +3 -4
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +330 -284
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +1 -3
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +39 -37
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +32 -27
- data/lib/active_record/connection_adapters/abstract/quoting.rb +62 -51
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +10 -20
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +74 -79
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +53 -41
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +120 -100
- data/lib/active_record/connection_adapters/abstract/transaction.rb +49 -43
- data/lib/active_record/connection_adapters/abstract_adapter.rb +165 -135
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +404 -424
- data/lib/active_record/connection_adapters/column.rb +26 -4
- data/lib/active_record/connection_adapters/connection_specification.rb +128 -118
- data/lib/active_record/connection_adapters/mysql/column.rb +6 -31
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +36 -49
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +22 -22
- data/lib/active_record/connection_adapters/mysql/quoting.rb +6 -12
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +49 -45
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +16 -19
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +54 -28
- data/lib/active_record/connection_adapters/mysql/schema_statements.rb +43 -0
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +7 -6
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +23 -27
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +32 -53
- data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb +3 -3
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +19 -9
- data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +5 -3
- data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +1 -1
- data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +3 -3
- data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +16 -16
- data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +0 -10
- data/lib/active_record/connection_adapters/postgresql/oid/{rails_5_1_point.rb → legacy_point.rb} +9 -16
- data/lib/active_record/connection_adapters/postgresql/oid/money.rb +2 -2
- data/lib/active_record/connection_adapters/postgresql/oid/oid.rb +13 -0
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +28 -8
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +32 -30
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +2 -1
- data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +51 -51
- data/lib/active_record/connection_adapters/postgresql/oid.rb +22 -21
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +40 -35
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +15 -0
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +37 -24
- data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +19 -23
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +182 -222
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +6 -4
- data/lib/active_record/connection_adapters/postgresql/utils.rb +7 -5
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +198 -167
- data/lib/active_record/connection_adapters/schema_cache.rb +16 -7
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +3 -3
- data/lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb +1 -1
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +16 -19
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +1 -8
- data/lib/active_record/connection_adapters/sqlite3/schema_definitions.rb +28 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb +17 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +32 -0
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +184 -167
- data/lib/active_record/connection_adapters/statement_pool.rb +7 -7
- data/lib/active_record/connection_handling.rb +14 -26
- data/lib/active_record/core.rb +109 -93
- data/lib/active_record/counter_cache.rb +60 -13
- data/lib/active_record/define_callbacks.rb +20 -0
- data/lib/active_record/dynamic_matchers.rb +80 -79
- data/lib/active_record/enum.rb +8 -6
- data/lib/active_record/errors.rb +64 -15
- data/lib/active_record/explain.rb +1 -2
- data/lib/active_record/explain_registry.rb +1 -1
- data/lib/active_record/explain_subscriber.rb +7 -4
- data/lib/active_record/fixture_set/file.rb +11 -8
- data/lib/active_record/fixtures.rb +66 -53
- data/lib/active_record/gem_version.rb +1 -1
- data/lib/active_record/inheritance.rb +93 -79
- data/lib/active_record/integration.rb +7 -7
- data/lib/active_record/internal_metadata.rb +3 -16
- data/lib/active_record/legacy_yaml_adapter.rb +1 -1
- data/lib/active_record/locking/optimistic.rb +69 -74
- data/lib/active_record/locking/pessimistic.rb +10 -1
- data/lib/active_record/log_subscriber.rb +23 -28
- data/lib/active_record/migration/command_recorder.rb +94 -94
- data/lib/active_record/migration/compatibility.rb +100 -47
- data/lib/active_record/migration/join_table.rb +6 -6
- data/lib/active_record/migration.rb +153 -155
- data/lib/active_record/model_schema.rb +94 -107
- data/lib/active_record/nested_attributes.rb +200 -199
- data/lib/active_record/null_relation.rb +11 -34
- data/lib/active_record/persistence.rb +65 -50
- data/lib/active_record/query_cache.rb +2 -6
- data/lib/active_record/querying.rb +3 -4
- data/lib/active_record/railtie.rb +16 -17
- data/lib/active_record/railties/controller_runtime.rb +6 -2
- data/lib/active_record/railties/databases.rake +105 -133
- data/lib/active_record/railties/jdbcmysql_error.rb +1 -1
- data/lib/active_record/readonly_attributes.rb +2 -2
- data/lib/active_record/reflection.rb +154 -108
- data/lib/active_record/relation/batches/batch_enumerator.rb +1 -1
- data/lib/active_record/relation/batches.rb +80 -51
- data/lib/active_record/relation/calculations.rb +169 -162
- data/lib/active_record/relation/delegation.rb +32 -31
- data/lib/active_record/relation/finder_methods.rb +197 -231
- data/lib/active_record/relation/merger.rb +58 -62
- data/lib/active_record/relation/predicate_builder/array_handler.rb +7 -5
- data/lib/active_record/relation/predicate_builder/association_query_handler.rb +23 -23
- data/lib/active_record/relation/predicate_builder/base_handler.rb +3 -1
- data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +0 -8
- data/lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb +12 -10
- data/lib/active_record/relation/predicate_builder/range_handler.rb +0 -8
- data/lib/active_record/relation/predicate_builder.rb +92 -89
- data/lib/active_record/relation/query_attribute.rb +1 -1
- data/lib/active_record/relation/query_methods.rb +255 -293
- data/lib/active_record/relation/record_fetch_warning.rb +3 -3
- data/lib/active_record/relation/spawn_methods.rb +4 -5
- data/lib/active_record/relation/where_clause.rb +80 -65
- data/lib/active_record/relation/where_clause_factory.rb +47 -8
- data/lib/active_record/relation.rb +93 -119
- data/lib/active_record/result.rb +41 -32
- data/lib/active_record/runtime_registry.rb +3 -3
- data/lib/active_record/sanitization.rb +176 -192
- data/lib/active_record/schema.rb +3 -3
- data/lib/active_record/schema_dumper.rb +15 -38
- data/lib/active_record/schema_migration.rb +8 -4
- data/lib/active_record/scoping/default.rb +90 -90
- data/lib/active_record/scoping/named.rb +11 -11
- data/lib/active_record/scoping.rb +6 -6
- data/lib/active_record/secure_token.rb +2 -2
- data/lib/active_record/statement_cache.rb +13 -15
- data/lib/active_record/store.rb +31 -32
- data/lib/active_record/suppressor.rb +2 -1
- data/lib/active_record/table_metadata.rb +9 -5
- data/lib/active_record/tasks/database_tasks.rb +65 -55
- data/lib/active_record/tasks/mysql_database_tasks.rb +76 -73
- data/lib/active_record/tasks/postgresql_database_tasks.rb +72 -47
- data/lib/active_record/tasks/sqlite_database_tasks.rb +18 -16
- data/lib/active_record/timestamp.rb +46 -25
- data/lib/active_record/touch_later.rb +1 -2
- data/lib/active_record/transactions.rb +97 -109
- data/lib/active_record/type/adapter_specific_registry.rb +46 -42
- data/lib/active_record/type/decimal_without_scale.rb +13 -0
- data/lib/active_record/type/hash_lookup_type_map.rb +3 -3
- data/lib/active_record/type/internal/abstract_json.rb +4 -0
- data/lib/active_record/type/serialized.rb +14 -8
- data/lib/active_record/type/text.rb +9 -0
- data/lib/active_record/type/time.rb +0 -1
- data/lib/active_record/type/type_map.rb +11 -15
- data/lib/active_record/type/unsigned_integer.rb +15 -0
- data/lib/active_record/type.rb +17 -13
- data/lib/active_record/type_caster/connection.rb +8 -6
- data/lib/active_record/type_caster/map.rb +3 -1
- data/lib/active_record/type_caster.rb +2 -2
- data/lib/active_record/validations/associated.rb +1 -1
- data/lib/active_record/validations/presence.rb +2 -2
- data/lib/active_record/validations/uniqueness.rb +8 -39
- data/lib/active_record/validations.rb +4 -4
- data/lib/active_record/version.rb +1 -1
- data/lib/active_record.rb +20 -20
- data/lib/rails/generators/active_record/migration/migration_generator.rb +37 -34
- data/lib/rails/generators/active_record/migration.rb +1 -1
- data/lib/rails/generators/active_record/model/model_generator.rb +9 -9
- data/lib/rails/generators/active_record.rb +4 -4
- metadata +24 -13
- data/lib/active_record/relation/predicate_builder/class_handler.rb +0 -27
@@ -37,6 +37,7 @@ module ActiveRecord
|
|
37
37
|
# Note: not all valid {Relation#select}[rdoc-ref:QueryMethods#select] expressions are valid #count expressions. The specifics differ
|
38
38
|
# between databases. In invalid cases, an error from the database is thrown.
|
39
39
|
def count(column_name = nil)
|
40
|
+
return super() if block_given?
|
40
41
|
calculate(:count, column_name)
|
41
42
|
end
|
42
43
|
|
@@ -71,8 +72,8 @@ module ActiveRecord
|
|
71
72
|
# #calculate for examples with options.
|
72
73
|
#
|
73
74
|
# Person.sum(:age) # => 4562
|
74
|
-
def sum(column_name = nil
|
75
|
-
return super(
|
75
|
+
def sum(column_name = nil)
|
76
|
+
return super() if block_given?
|
76
77
|
calculate(:sum, column_name)
|
77
78
|
end
|
78
79
|
|
@@ -108,13 +109,16 @@ module ActiveRecord
|
|
108
109
|
# ...
|
109
110
|
# end
|
110
111
|
def calculate(operation, column_name)
|
111
|
-
if column_name.is_a?(Symbol) && attribute_alias?(column_name)
|
112
|
-
column_name = attribute_alias(column_name)
|
113
|
-
end
|
114
|
-
|
115
112
|
if has_include?(column_name)
|
116
113
|
relation = construct_relation_for_association_calculations
|
117
|
-
|
114
|
+
|
115
|
+
if operation.to_s.downcase == "count"
|
116
|
+
relation.distinct!
|
117
|
+
# PostgreSQL: ORDER BY expressions must appear in SELECT list when using DISTINCT
|
118
|
+
if (column_name == :all || column_name.nil?) && select_values.empty?
|
119
|
+
relation.order_values = []
|
120
|
+
end
|
121
|
+
end
|
118
122
|
|
119
123
|
relation.calculate(operation, column_name)
|
120
124
|
else
|
@@ -184,202 +188,205 @@ module ActiveRecord
|
|
184
188
|
|
185
189
|
private
|
186
190
|
|
187
|
-
|
188
|
-
|
189
|
-
|
191
|
+
def has_include?(column_name)
|
192
|
+
eager_loading? || (includes_values.present? && column_name && column_name != :all)
|
193
|
+
end
|
190
194
|
|
191
|
-
|
192
|
-
|
195
|
+
def perform_calculation(operation, column_name)
|
196
|
+
operation = operation.to_s.downcase
|
193
197
|
|
194
|
-
|
195
|
-
|
196
|
-
|
198
|
+
# If #count is used with #distinct (i.e. `relation.distinct.count`) it is
|
199
|
+
# considered distinct.
|
200
|
+
distinct = distinct_value
|
197
201
|
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
202
|
+
if operation == "count"
|
203
|
+
column_name ||= select_for_count
|
204
|
+
if column_name == :all
|
205
|
+
if distinct && (group_values.any? || select_values.empty? && order_values.empty?)
|
206
|
+
column_name = primary_key
|
207
|
+
end
|
208
|
+
elsif column_name =~ /\s*DISTINCT[\s(]+/i
|
209
|
+
distinct = nil
|
210
|
+
end
|
211
|
+
end
|
203
212
|
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
213
|
+
if group_values.any?
|
214
|
+
execute_grouped_calculation(operation, column_name, distinct)
|
215
|
+
else
|
216
|
+
execute_simple_calculation(operation, column_name, distinct)
|
217
|
+
end
|
208
218
|
end
|
209
|
-
end
|
210
219
|
|
211
|
-
|
212
|
-
|
220
|
+
def aggregate_column(column_name)
|
221
|
+
return column_name if Arel::Expressions === column_name
|
213
222
|
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
223
|
+
if @klass.has_attribute?(column_name.to_s) || @klass.attribute_alias?(column_name.to_s)
|
224
|
+
@klass.arel_attribute(column_name)
|
225
|
+
else
|
226
|
+
Arel.sql(column_name == :all ? "*" : column_name.to_s)
|
227
|
+
end
|
218
228
|
end
|
219
|
-
end
|
220
|
-
|
221
|
-
def operation_over_aggregate_column(column, operation, distinct)
|
222
|
-
operation == 'count' ? column.count(distinct) : column.send(operation)
|
223
|
-
end
|
224
|
-
|
225
|
-
def execute_simple_calculation(operation, column_name, distinct) #:nodoc:
|
226
|
-
# PostgreSQL doesn't like ORDER BY when there are no GROUP BY
|
227
|
-
relation = unscope(:order)
|
228
229
|
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
# Shortcut when limit is zero.
|
233
|
-
return 0 if relation.limit_value == 0
|
230
|
+
def operation_over_aggregate_column(column, operation, distinct)
|
231
|
+
operation == "count" ? column.count(distinct) : column.send(operation)
|
232
|
+
end
|
234
233
|
|
235
|
-
|
236
|
-
|
237
|
-
column = aggregate_column(column_name)
|
234
|
+
def execute_simple_calculation(operation, column_name, distinct) #:nodoc:
|
235
|
+
column_alias = column_name
|
238
236
|
|
239
|
-
|
237
|
+
if operation == "count" && (column_name == :all && distinct || has_limit_or_offset?)
|
238
|
+
# Shortcut when limit is zero.
|
239
|
+
return 0 if limit_value == 0
|
240
240
|
|
241
|
-
|
242
|
-
|
243
|
-
|
241
|
+
query_builder = build_count_subquery(spawn, column_name, distinct)
|
242
|
+
else
|
243
|
+
# PostgreSQL doesn't like ORDER BY when there are no GROUP BY
|
244
|
+
relation = unscope(:order).distinct!(false)
|
244
245
|
|
245
|
-
|
246
|
-
column_alias ||= @klass.connection.column_name_for_operation(operation, select_value)
|
247
|
-
relation.select_values = [select_value]
|
246
|
+
column = aggregate_column(column_name)
|
248
247
|
|
249
|
-
|
250
|
-
|
248
|
+
select_value = operation_over_aggregate_column(column, operation, distinct)
|
249
|
+
if operation == "sum" && distinct
|
250
|
+
select_value.distinct = true
|
251
|
+
end
|
251
252
|
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
column = result.column_types.fetch(column_alias) do
|
256
|
-
type_for(column_name)
|
257
|
-
end
|
253
|
+
column_alias = select_value.alias
|
254
|
+
column_alias ||= @klass.connection.column_name_for_operation(operation, select_value)
|
255
|
+
relation.select_values = [select_value]
|
258
256
|
|
259
|
-
|
260
|
-
|
257
|
+
query_builder = relation.arel
|
258
|
+
end
|
261
259
|
|
262
|
-
|
263
|
-
|
260
|
+
result = @klass.connection.select_all(query_builder, nil, bound_attributes)
|
261
|
+
row = result.first
|
262
|
+
value = row && row.values.first
|
263
|
+
type = result.column_types.fetch(column_alias) do
|
264
|
+
type_for(column_name)
|
265
|
+
end
|
264
266
|
|
265
|
-
|
266
|
-
association = @klass._reflect_on_association(group_attrs.first)
|
267
|
-
associated = group_attrs.size == 1 && association && association.belongs_to? # only count belongs_to associations
|
268
|
-
group_fields = Array(associated ? association.foreign_key : group_attrs)
|
269
|
-
else
|
270
|
-
group_fields = group_attrs
|
267
|
+
type_cast_calculated_value(value, type, operation)
|
271
268
|
end
|
272
|
-
group_fields = arel_columns(group_fields)
|
273
269
|
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
if operation == 'count' && column_name == :all
|
278
|
-
aggregate_alias = 'count_all'
|
279
|
-
else
|
280
|
-
aggregate_alias = column_alias_for([operation, column_name].join(' '))
|
281
|
-
end
|
270
|
+
def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
|
271
|
+
group_attrs = group_values
|
282
272
|
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
distinct).as(aggregate_alias)
|
288
|
-
]
|
289
|
-
select_values += self.select_values unless having_clause.empty?
|
290
|
-
|
291
|
-
select_values.concat group_columns.map { |aliaz, field|
|
292
|
-
if field.respond_to?(:as)
|
293
|
-
field.as(aliaz)
|
273
|
+
if group_attrs.first.respond_to?(:to_sym)
|
274
|
+
association = @klass._reflect_on_association(group_attrs.first)
|
275
|
+
associated = group_attrs.size == 1 && association && association.belongs_to? # only count belongs_to associations
|
276
|
+
group_fields = Array(associated ? association.foreign_key : group_attrs)
|
294
277
|
else
|
295
|
-
|
278
|
+
group_fields = group_attrs
|
296
279
|
end
|
297
|
-
|
298
|
-
|
299
|
-
relation = except(:group)
|
300
|
-
relation.group_values = group_fields
|
301
|
-
relation.select_values = select_values
|
280
|
+
group_fields = arel_columns(group_fields)
|
302
281
|
|
303
|
-
|
282
|
+
group_aliases = group_fields.map { |field| column_alias_for(field) }
|
283
|
+
group_columns = group_aliases.zip(group_fields)
|
304
284
|
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
285
|
+
if operation == "count" && column_name == :all
|
286
|
+
aggregate_alias = "count_all"
|
287
|
+
else
|
288
|
+
aggregate_alias = column_alias_for([operation, column_name].join(" "))
|
289
|
+
end
|
310
290
|
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
291
|
+
select_values = [
|
292
|
+
operation_over_aggregate_column(
|
293
|
+
aggregate_column(column_name),
|
294
|
+
operation,
|
295
|
+
distinct).as(aggregate_alias)
|
296
|
+
]
|
297
|
+
select_values += self.select_values unless having_clause.empty?
|
298
|
+
|
299
|
+
select_values.concat group_columns.map { |aliaz, field|
|
300
|
+
if field.respond_to?(:as)
|
301
|
+
field.as(aliaz)
|
302
|
+
else
|
303
|
+
"#{field} AS #{aliaz}"
|
317
304
|
end
|
318
|
-
type_cast_calculated_value(row[aliaz], column)
|
319
305
|
}
|
320
|
-
key = key.first if key.size == 1
|
321
|
-
key = key_records[key] if associated
|
322
306
|
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
end
|
307
|
+
relation = except(:group).distinct!(false)
|
308
|
+
relation.group_values = group_fields
|
309
|
+
relation.select_values = select_values
|
327
310
|
|
328
|
-
|
329
|
-
|
330
|
-
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
311
|
+
calculated_data = @klass.connection.select_all(relation, nil, relation.bound_attributes)
|
312
|
+
|
313
|
+
if association
|
314
|
+
key_ids = calculated_data.collect { |row| row[group_aliases.first] }
|
315
|
+
key_records = association.klass.base_class.where(association.klass.base_class.primary_key => key_ids)
|
316
|
+
key_records = Hash[key_records.map { |r| [r.id, r] }]
|
317
|
+
end
|
318
|
+
|
319
|
+
Hash[calculated_data.map do |row|
|
320
|
+
key = group_columns.map { |aliaz, col_name|
|
321
|
+
type = type_for(col_name) do
|
322
|
+
calculated_data.column_types.fetch(aliaz, Type.default_value)
|
323
|
+
end
|
324
|
+
type_cast_calculated_value(row[aliaz], type)
|
325
|
+
}
|
326
|
+
key = key.first if key.size == 1
|
327
|
+
key = key_records[key] if associated
|
328
|
+
|
329
|
+
type = calculated_data.column_types.fetch(aggregate_alias) { type_for(column_name) }
|
330
|
+
[key, type_cast_calculated_value(row[aggregate_alias], type, operation)]
|
331
|
+
end]
|
338
332
|
end
|
339
333
|
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
334
|
+
# Converts the given keys to the value that the database adapter returns as
|
335
|
+
# a usable column name:
|
336
|
+
#
|
337
|
+
# column_alias_for("users.id") # => "users_id"
|
338
|
+
# column_alias_for("sum(id)") # => "sum_id"
|
339
|
+
# column_alias_for("count(distinct users.id)") # => "count_distinct_users_id"
|
340
|
+
# column_alias_for("count(*)") # => "count_all"
|
341
|
+
def column_alias_for(keys)
|
342
|
+
if keys.respond_to? :name
|
343
|
+
keys = "#{keys.relation.name}.#{keys.name}"
|
344
|
+
end
|
345
345
|
|
346
|
-
|
347
|
-
|
346
|
+
table_name = keys.to_s.downcase
|
347
|
+
table_name.gsub!(/\*/, "all")
|
348
|
+
table_name.gsub!(/\W+/, " ")
|
349
|
+
table_name.strip!
|
350
|
+
table_name.gsub!(/ +/, "_")
|
348
351
|
|
349
|
-
|
350
|
-
|
351
|
-
@klass.type_for_attribute(field_name, &block)
|
352
|
-
end
|
352
|
+
@klass.connection.table_alias_for(table_name)
|
353
|
+
end
|
353
354
|
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
355
|
+
def type_for(field, &block)
|
356
|
+
field_name = field.respond_to?(:name) ? field.name.to_s : field.to_s.split(".").last
|
357
|
+
@klass.type_for_attribute(field_name, &block)
|
358
|
+
end
|
359
|
+
|
360
|
+
def type_cast_calculated_value(value, type, operation = nil)
|
361
|
+
case operation
|
362
|
+
when "count" then value.to_i
|
363
|
+
when "sum" then type.deserialize(value || 0)
|
364
|
+
when "average" then value.respond_to?(:to_d) ? value.to_d : value
|
359
365
|
else type.deserialize(value)
|
366
|
+
end
|
360
367
|
end
|
361
|
-
end
|
362
368
|
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
+
def select_for_count
|
370
|
+
if select_values.present?
|
371
|
+
return select_values.first if select_values.one?
|
372
|
+
select_values.join(", ")
|
373
|
+
else
|
374
|
+
:all
|
375
|
+
end
|
369
376
|
end
|
370
|
-
end
|
371
377
|
|
372
|
-
|
373
|
-
|
374
|
-
|
378
|
+
def build_count_subquery(relation, column_name, distinct)
|
379
|
+
if column_name == :all
|
380
|
+
relation.select_values = [ Arel.sql(FinderMethods::ONE_AS_ONE) ] unless distinct
|
381
|
+
else
|
382
|
+
column_alias = Arel.sql("count_column")
|
383
|
+
relation.select_values = [ aggregate_column(column_name).as(column_alias) ]
|
384
|
+
end
|
375
385
|
|
376
|
-
|
377
|
-
|
378
|
-
subquery = relation.arel.as(subquery_alias)
|
386
|
+
subquery = relation.arel.as(Arel.sql("subquery_for_count"))
|
387
|
+
select_value = operation_over_aggregate_column(column_alias || Arel.star, "count", false)
|
379
388
|
|
380
|
-
|
381
|
-
|
382
|
-
sm.project(select_value).from(subquery)
|
383
|
-
end
|
389
|
+
Arel::SelectManager.new(subquery).project(select_value)
|
390
|
+
end
|
384
391
|
end
|
385
392
|
end
|
@@ -1,5 +1,3 @@
|
|
1
|
-
require 'active_support/concern'
|
2
|
-
|
3
1
|
module ActiveRecord
|
4
2
|
module Delegation # :nodoc:
|
5
3
|
module DelegateCache # :nodoc:
|
@@ -17,7 +15,10 @@ module ActiveRecord
|
|
17
15
|
delegate = Class.new(klass) {
|
18
16
|
include ClassSpecificRelation
|
19
17
|
}
|
20
|
-
|
18
|
+
mangled_name = klass.name.gsub("::".freeze, "_".freeze)
|
19
|
+
const_set mangled_name, delegate
|
20
|
+
private_constant mangled_name
|
21
|
+
|
21
22
|
cache[klass] = delegate
|
22
23
|
end
|
23
24
|
end
|
@@ -35,13 +36,13 @@ module ActiveRecord
|
|
35
36
|
# may vary depending on the klass of a relation, so we create a subclass of Relation
|
36
37
|
# for each different klass, and the delegations are compiled into that subclass only.
|
37
38
|
|
38
|
-
delegate :to_xml, :encode_with, :length, :
|
39
|
+
delegate :to_xml, :encode_with, :length, :each, :uniq, :to_ary, :join,
|
39
40
|
:[], :&, :|, :+, :-, :sample, :reverse, :compact, :in_groups, :in_groups_of,
|
40
|
-
:to_sentence, :to_formatted_s,
|
41
|
+
:to_sentence, :to_formatted_s, :as_json,
|
41
42
|
:shuffle, :split, :index, to: :records
|
42
43
|
|
43
44
|
delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key,
|
44
|
-
:connection, :columns_hash, :
|
45
|
+
:connection, :columns_hash, to: :klass
|
45
46
|
|
46
47
|
module ClassSpecificRelation # :nodoc:
|
47
48
|
extend ActiveSupport::Concern
|
@@ -59,7 +60,7 @@ module ActiveRecord
|
|
59
60
|
@delegation_mutex.synchronize do
|
60
61
|
return if method_defined?(method)
|
61
62
|
|
62
|
-
if
|
63
|
+
if /\A[a-zA-Z_]\w*[!?]?\z/.match?(method)
|
63
64
|
module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
64
65
|
def #{method}(*args, &block)
|
65
66
|
scoping { @klass.#{method}(*args, &block) }
|
@@ -81,19 +82,19 @@ module ActiveRecord
|
|
81
82
|
end
|
82
83
|
end
|
83
84
|
|
84
|
-
|
85
|
+
private
|
85
86
|
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
87
|
+
def method_missing(method, *args, &block)
|
88
|
+
if @klass.respond_to?(method)
|
89
|
+
self.class.delegate_to_scoped_klass(method)
|
90
|
+
scoping { @klass.public_send(method, *args, &block) }
|
91
|
+
elsif arel.respond_to?(method)
|
92
|
+
self.class.delegate method, to: :arel
|
93
|
+
arel.public_send(method, *args, &block)
|
94
|
+
else
|
95
|
+
super
|
96
|
+
end
|
95
97
|
end
|
96
|
-
end
|
97
98
|
end
|
98
99
|
|
99
100
|
module ClassMethods # :nodoc:
|
@@ -103,26 +104,26 @@ module ActiveRecord
|
|
103
104
|
|
104
105
|
private
|
105
106
|
|
106
|
-
|
107
|
-
|
108
|
-
|
107
|
+
def relation_class_for(klass)
|
108
|
+
klass.relation_delegate_class(self)
|
109
|
+
end
|
109
110
|
end
|
110
111
|
|
111
|
-
def
|
112
|
+
def respond_to_missing?(method, include_private = false)
|
112
113
|
super || @klass.respond_to?(method, include_private) ||
|
113
114
|
arel.respond_to?(method, include_private)
|
114
115
|
end
|
115
116
|
|
116
|
-
|
117
|
+
private
|
117
118
|
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
119
|
+
def method_missing(method, *args, &block)
|
120
|
+
if @klass.respond_to?(method)
|
121
|
+
scoping { @klass.public_send(method, *args, &block) }
|
122
|
+
elsif arel.respond_to?(method)
|
123
|
+
arel.public_send(method, *args, &block)
|
124
|
+
else
|
125
|
+
super
|
126
|
+
end
|
125
127
|
end
|
126
|
-
end
|
127
128
|
end
|
128
129
|
end
|