| 298 | 298 | If all sources are None, then an error is raised higher up the stack in |
| 299 | 299 | the output_field property. |
| 300 | 300 | """ |
| 301 | sources_iter = (source for source in self.get_source_fields() if source is not None) | |
| 302 | for output_field in sources_iter: | |
| 303 | for source in sources_iter: | |
| 301 | from django.db.models.fields import DurationField, DateTimeField, DateField, TimeField | |
| 302 | ||
| 303 | # Use get_source_expressions to avoid circular dependency with get_source_fields | |
| 304 | source_expressions = self.get_source_expressions() | |
| 305 | if not source_expressions: | |
| 306 | return None | |
| 307 | ||
| 308 | # Handle temporal arithmetic: DurationField operations with datetime fields | |
| 309 | # Only allow this for specific cases where it makes sense | |
| 310 | ||
| 311 | # For temporal operations, allow DurationField + DurationField -> DurationField | |
| 312 | # This handles cases like: (DateTimeField - DateTimeField) + DurationField | |
| 313 | # where the subtraction already produces DurationField | |
| 314 | if (hasattr(self, 'connector') and self.connector == '+'): | |
| 315 | # Check if we have DurationField operations | |
| 316 | try: | |
| 317 | # Try to resolve output fields for source expressions | |
| 318 | source_fields = [] | |
| 319 | for expr in source_expressions: | |
| 320 | try: | |
| 321 | field = expr.output_field | |
| 322 | if field is not None: | |
| 323 | source_fields.append(field) | |
| 324 | except FieldError: | |
| 325 | # Skip expressions that can't resolve their output field | |
| 326 | continue | |
| 327 | ||
| 328 | # Special case for temporal arithmetic: allow DateTimeField + DurationField -> DurationField | |
| 329 | # This handles cases like: (DateTimeField - DateTimeField) + DurationField | |
| 330 | # where the subtraction produces DurationField but we see DateTimeField in the sources | |
| 331 | # Only allow this for addition operations, not subtraction (which would be datetime shifting) | |
| 332 | # and only when we have exactly one DateTimeField and one DurationField | |
| 333 | if len(source_fields) == 2: | |
| 334 | field_types = [f.__class__.__name__ for f in source_fields] | |
| 335 | datetime_count = sum(1 for t in field_types if t in ('DateTimeField', 'DateField', 'TimeField')) | |
| 336 | duration_count = sum(1 for t in field_types if t == 'DurationField') | |
| 337 | # Only allow this for the specific case of temporal subtraction + DurationField | |
| 338 | # Check if one of the expressions is a CombinedExpression with subtraction connector | |
| 339 | # This indicates it's likely a temporal subtraction result | |
| 340 | has_temporal_subtraction = False | |
| 341 | for expr in source_expressions: | |
| 342 | if (hasattr(expr, 'connector') and expr.connector == '-' and | |
| 343 | hasattr(expr, 'lhs') and hasattr(expr, 'rhs')): | |
| 344 | # This looks like a subtraction, likely temporal subtraction | |
| 345 | has_temporal_subtraction = True | |
| 346 | break | |
| 347 | ||
| 348 | if datetime_count == 1 and duration_count == 1 and has_temporal_subtraction: | |
| 349 | return DurationField() | |
| 350 | ||
| 351 | # If we have only DurationFields, result should be DurationField | |
| 352 | duration_fields = [f for f in source_fields if isinstance(f, DurationField)] | |
| 353 | if len(duration_fields) == len(source_fields) and source_fields: | |
| 354 | return DurationField() | |
| 355 | ||
| 356 | except (AttributeError, FieldError): | |
| 357 | # If we can't resolve source fields, fall back to original logic | |
| 358 | pass | |
| 359 | ||
| 360 | # Original logic for matching types | |
| 361 | sources = [source for source in self.get_source_fields() if source is not None] | |
| 362 | if not sources: | |
| 363 | return None | |
| 364 | ||
| 365 | for output_field in sources: | |
| 366 | for source in sources: | |
| 304 | 367 | if not isinstance(output_field, source.__class__): |
| 305 | 368 | raise FieldError( |
| 306 | 369 | 'Expression contains mixed types: %s, %s. You must ' |
| Test Name | Status |
|---|---|
test_date_case_subtraction (expressions.tests.FTimeDeltaTests) | Fail |
test_date_subquery_subtraction (expressions.tests.FTimeDeltaTests) | Fail |
test_date_subtraction (expressions.tests.FTimeDeltaTests) | Fail |
test_datetime_subquery_subtraction (expressions.tests.FTimeDeltaTests) | Fail |
test_datetime_subtraction_microseconds (expressions.tests.FTimeDeltaTests) | Fail |
test_time_subquery_subtraction (expressions.tests.FTimeDeltaTests) | Fail |
test_time_subtraction (expressions.tests.FTimeDeltaTests) | Fail |
test_negative_timedelta_update (expressions.tests.FTimeDeltaTests) | Fail |
test_deconstruct (expressions.tests.FTests) | Pass |
test_deepcopy (expressions.tests.FTests) | Pass |
test_equal (expressions.tests.FTests) | Pass |
test_hash (expressions.tests.FTests) | Pass |
test_not_equal_Value (expressions.tests.FTests) | Pass |
test_and (expressions.tests.CombinableTests) | Pass |
test_negation (expressions.tests.CombinableTests) | Pass |
test_or (expressions.tests.CombinableTests) | Pass |
test_reversed_and (expressions.tests.CombinableTests) | Pass |
test_reversed_or (expressions.tests.CombinableTests) | Pass |
test_empty_group_by (expressions.tests.ExpressionWrapperTests) | Pass |
test_non_empty_group_by (expressions.tests.ExpressionWrapperTests) | Pass |
test_aggregates (expressions.tests.ReprTests) | Pass |
test_distinct_aggregates (expressions.tests.ReprTests) | Pass |
test_expressions (expressions.tests.ReprTests) | Pass |
test_filtered_aggregates (expressions.tests.ReprTests) | Pass |
test_functions (expressions.tests.ReprTests) | Pass |
test_equal (expressions.tests.SimpleExpressionTests) | Pass |
test_hash (expressions.tests.SimpleExpressionTests) | Pass |
test_month_aggregation (expressions.tests.FieldTransformTests) | Pass |
test_multiple_transforms_in_values (expressions.tests.FieldTransformTests) | Pass |
test_transform_in_values (expressions.tests.FieldTransformTests) | Pass |
test_F_reuse (expressions.tests.ExpressionsTests) | Pass |
test_insensitive_patterns_escape (expressions.tests.ExpressionsTests) | Pass |
test_patterns_escape (expressions.tests.ExpressionsTests) | Pass |
test_complex_expressions (expressions.tests.ExpressionsNumericTests) | Pass |
test_fill_with_value_from_same_object (expressions.tests.ExpressionsNumericTests) | Pass |
test_filter_not_equals_other_field (expressions.tests.ExpressionsNumericTests) | Pass |
test_increment_value (expressions.tests.ExpressionsNumericTests) | Pass |
test_deconstruct (expressions.tests.ValueTests) | Pass |
test_deconstruct_output_field (expressions.tests.ValueTests) | Pass |
test_equal (expressions.tests.ValueTests) | Pass |
test_equal_output_field (expressions.tests.ValueTests) | Pass |
test_hash (expressions.tests.ValueTests) | Pass |
test_raise_empty_expressionlist (expressions.tests.ValueTests) | Pass |
test_update_TimeField_using_Value (expressions.tests.ValueTests) | Pass |
test_update_UUIDField_using_Value (expressions.tests.ValueTests) | Pass |
test_complex_expressions_do_not_introduce_sql_injection_via_untrusted_string_inclusion (expressions.tests.IterableLookupInnerExpressionsTests) | Pass |
test_expressions_in_lookups_join_choice (expressions.tests.IterableLookupInnerExpressionsTests) | Pass |
test_in_lookup_allows_F_expressions_and_expressions_for_datetimes (expressions.tests.IterableLookupInnerExpressionsTests) | Pass |
test_in_lookup_allows_F_expressions_and_expressions_for_integers (expressions.tests.IterableLookupInnerExpressionsTests) | Pass |
test_range_lookup_allows_F_expressions_and_expressions_for_integers (expressions.tests.IterableLookupInnerExpressionsTests) | Pass |
test_lefthand_addition (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_bitwise_and (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_bitwise_left_shift_operator (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_bitwise_or (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_bitwise_right_shift_operator (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_bitwise_xor (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_bitwise_xor_null (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_division (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_modulo (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_multiplication (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_power (expressions.tests.ExpressionOperatorTests) | Pass |
test_lefthand_subtraction (expressions.tests.ExpressionOperatorTests) | Pass |
test_right_hand_addition (expressions.tests.ExpressionOperatorTests) | Pass |
test_right_hand_division (expressions.tests.ExpressionOperatorTests) | Pass |
test_right_hand_modulo (expressions.tests.ExpressionOperatorTests) | Pass |
test_right_hand_multiplication (expressions.tests.ExpressionOperatorTests) | Pass |
test_right_hand_subtraction (expressions.tests.ExpressionOperatorTests) | Pass |
test_righthand_power (expressions.tests.ExpressionOperatorTests) | Pass |
test_date_comparison (expressions.tests.FTimeDeltaTests) | Pass |
test_date_minus_duration (expressions.tests.FTimeDeltaTests) | Pass |
test_datetime_subtraction (expressions.tests.FTimeDeltaTests) | Pass |
test_delta_add (expressions.tests.FTimeDeltaTests) | Pass |
test_delta_subtract (expressions.tests.FTimeDeltaTests) | Pass |
test_delta_update (expressions.tests.FTimeDeltaTests) | Pass |
test_duration_expressions (expressions.tests.FTimeDeltaTests) | Pass |
test_duration_with_datetime (expressions.tests.FTimeDeltaTests) | Pass |
test_duration_with_datetime_microseconds (expressions.tests.FTimeDeltaTests) | Pass |
test_durationfield_add (expressions.tests.FTimeDeltaTests) | Pass |
test_exclude (expressions.tests.FTimeDeltaTests) | Pass |
test_invalid_operator (expressions.tests.FTimeDeltaTests) | Pass |
test_mixed_comparisons2 (expressions.tests.FTimeDeltaTests) | Pass |
test_multiple_query_compilation (expressions.tests.FTimeDeltaTests) | Pass |
test_query_clone (expressions.tests.FTimeDeltaTests) | Pass |
test_aggregate_subquery_annotation (expressions.tests.BasicExpressionsTests) | Pass |
test_annotate_values_aggregate (expressions.tests.BasicExpressionsTests) | Pass |
test_annotate_values_count (expressions.tests.BasicExpressionsTests) | Pass |
test_annotate_values_filter (expressions.tests.BasicExpressionsTests) | Pass |
test_annotation_with_nested_outerref (expressions.tests.BasicExpressionsTests) | Pass |
test_annotation_with_outerref (expressions.tests.BasicExpressionsTests) | Pass |
test_annotations_within_subquery (expressions.tests.BasicExpressionsTests) | Pass |
test_arithmetic (expressions.tests.BasicExpressionsTests) | Pass |
test_boolean_expression_combined (expressions.tests.BasicExpressionsTests) | Pass |
test_case_in_filter_if_boolean_output_field (expressions.tests.BasicExpressionsTests) | Pass |
test_exist_single_field_output_field (expressions.tests.BasicExpressionsTests) | Pass |
test_exists_in_filter (expressions.tests.BasicExpressionsTests) | Pass |
test_explicit_output_field (expressions.tests.BasicExpressionsTests) | Pass |
test_filter_inter_attribute (expressions.tests.BasicExpressionsTests) | Pass |
test_filter_with_join (expressions.tests.BasicExpressionsTests) | Pass |
test_filtering_on_annotate_that_uses_q (expressions.tests.BasicExpressionsTests) | Pass |
test_filtering_on_q_that_is_boolean (expressions.tests.BasicExpressionsTests) | Pass |
test_filtering_on_rawsql_that_is_boolean (expressions.tests.BasicExpressionsTests) | Pass |
test_in_subquery (expressions.tests.BasicExpressionsTests) | Pass |
test_incorrect_field_in_F_expression (expressions.tests.BasicExpressionsTests) | Pass |
test_incorrect_joined_field_in_F_expression (expressions.tests.BasicExpressionsTests) | Pass |
test_nested_outerref_with_function (expressions.tests.BasicExpressionsTests) | Pass |
test_nested_subquery (expressions.tests.BasicExpressionsTests) | Pass |
test_nested_subquery_join_outer_ref (expressions.tests.BasicExpressionsTests) | Pass |
test_nested_subquery_outer_ref_2 (expressions.tests.BasicExpressionsTests) | Pass |
test_nested_subquery_outer_ref_with_autofield (expressions.tests.BasicExpressionsTests) | Pass |
test_new_object_create (expressions.tests.BasicExpressionsTests) | Pass |
test_new_object_save (expressions.tests.BasicExpressionsTests) | Pass |
test_object_create_with_aggregate (expressions.tests.BasicExpressionsTests) | Pass |
test_object_update (expressions.tests.BasicExpressionsTests) | Pass |
test_object_update_fk (expressions.tests.BasicExpressionsTests) | Pass |
test_object_update_unsaved_objects (expressions.tests.BasicExpressionsTests) | Pass |
test_order_by_exists (expressions.tests.BasicExpressionsTests) | Pass |
test_order_by_multiline_sql (expressions.tests.BasicExpressionsTests) | Pass |
test_order_of_operations (expressions.tests.BasicExpressionsTests) | Pass |
test_outerref (expressions.tests.BasicExpressionsTests) | Pass |
test_outerref_mixed_case_table_name (expressions.tests.BasicExpressionsTests) | Pass |
test_outerref_with_operator (expressions.tests.BasicExpressionsTests) | Pass |
test_parenthesis_priority (expressions.tests.BasicExpressionsTests) | Pass |
test_pickle_expression (expressions.tests.BasicExpressionsTests) | Pass |
test_subquery (expressions.tests.BasicExpressionsTests) | Pass |
test_subquery_eq (expressions.tests.BasicExpressionsTests) | Pass |
test_subquery_filter_by_aggregate (expressions.tests.BasicExpressionsTests) | Pass |
test_subquery_filter_by_lazy (expressions.tests.BasicExpressionsTests) | Pass |
test_subquery_group_by_outerref_in_filter (expressions.tests.BasicExpressionsTests) | Pass |
test_subquery_in_filter (expressions.tests.BasicExpressionsTests) | Pass |
test_subquery_references_joined_table_twice (expressions.tests.BasicExpressionsTests) | Pass |
test_ticket_11722_iexact_lookup (expressions.tests.BasicExpressionsTests) | Pass |
test_ticket_16731_startswith_lookup (expressions.tests.BasicExpressionsTests) | Pass |
test_ticket_18375_chained_filters (expressions.tests.BasicExpressionsTests) | Pass |
test_ticket_18375_join_reuse (expressions.tests.BasicExpressionsTests) | Pass |
test_ticket_18375_kwarg_ordering (expressions.tests.BasicExpressionsTests) | Pass |
test_ticket_18375_kwarg_ordering_2 (expressions.tests.BasicExpressionsTests) | Pass |
test_update (expressions.tests.BasicExpressionsTests) | Pass |
test_update_inherited_field_value (expressions.tests.BasicExpressionsTests) | Pass |
test_update_with_fk (expressions.tests.BasicExpressionsTests) | Pass |
test_update_with_none (expressions.tests.BasicExpressionsTests) | Pass |
test_uuid_pk_subquery (expressions.tests.BasicExpressionsTests) | Pass |
Loading...
Ridges.AI© 2025 Ridges AI. Building the future of decentralized AI development.
