| 63 | 63 | ) |
| 64 | 64 | other = Value(other, output_field=output_field) |
| 65 | 65 | |
| 66 | # Check for temporal subtraction between datetime fields | |
| 67 | if connector == self.SUB: | |
| 68 | # Get the output fields of both expressions | |
| 69 | self_output_field = getattr(self, 'output_field', None) | |
| 70 | other_output_field = getattr(other, 'output_field', None) | |
| 71 | ||
| 72 | # Check if both are datetime fields | |
| 73 | datetime_fields = {'DateField', 'DateTimeField', 'TimeField'} | |
| 74 | if (self_output_field and other_output_field and | |
| 75 | self_output_field.__class__.__name__ in datetime_fields and | |
| 76 | other_output_field.__class__.__name__ in datetime_fields): | |
| 77 | # Create TemporalSubtraction instead of CombinedExpression | |
| 78 | if reversed: | |
| 79 | return TemporalSubtraction(other, self) | |
| 80 | return TemporalSubtraction(self, other) | |
| 81 | ||
| 82 | # Handle the case where we're adding a DurationField to a CombinedExpression from temporal subtraction | |
| 83 | if connector == self.ADD and isinstance(other, Value) and isinstance(other.value, datetime.timedelta): | |
| 84 | # If self is a CombinedExpression from subtraction, assume it's a temporal subtraction | |
| 85 | if isinstance(self, CombinedExpression) and self.connector == self.SUB: | |
| 86 | return CombinedExpression(self, connector, other, output_field=fields.DurationField()) | |
| 87 | ||
| 66 | 88 | if reversed: |
| 67 | 89 | return CombinedExpression(other, connector, self) |
| 68 | 90 | return CombinedExpression(self, connector, other) |
| 478 | 500 | c.is_summary = summarize |
| 479 | 501 | c.lhs = c.lhs.resolve_expression(query, allow_joins, reuse, summarize, for_save) |
| 480 | 502 | c.rhs = c.rhs.resolve_expression(query, allow_joins, reuse, summarize, for_save) |
| 503 | ||
| 504 | # Check for temporal subtraction between datetime fields and set output_field | |
| 505 | if (c.output_field is None and c.connector == c.SUB): | |
| 506 | try: | |
| 507 | lhs_type = c.lhs.output_field.get_internal_type() | |
| 508 | rhs_type = c.rhs.output_field.get_internal_type() | |
| 509 | datetime_fields = {'DateField', 'DateTimeField', 'TimeField'} | |
| 510 | if lhs_type in datetime_fields and lhs_type == rhs_type: | |
| 511 | c.output_field = fields.DurationField() | |
| 512 | except (FieldError, AttributeError): | |
| 513 | # If we can't determine the field types, don't set output_field | |
| 514 | pass | |
| 515 | ||
| 481 | 516 | return c |
| 482 | 517 | |
| 483 | 518 |
| 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_complex_expressions (expressions.tests.ExpressionsNumericTests) | Fail |
test_in_lookup_allows_F_expressions_and_expressions_for_integers (expressions.tests.IterableLookupInnerExpressionsTests) | Fail |
test_range_lookup_allows_F_expressions_and_expressions_for_integers (expressions.tests.IterableLookupInnerExpressionsTests) | Fail |
test_lefthand_subtraction (expressions.tests.ExpressionOperatorTests) | Fail |
test_right_hand_subtraction (expressions.tests.ExpressionOperatorTests) | Fail |
test_date_comparison (expressions.tests.FTimeDeltaTests) | Fail |
test_date_minus_duration (expressions.tests.FTimeDeltaTests) | Fail |
test_datetime_subtraction (expressions.tests.FTimeDeltaTests) | Fail |
test_delta_add (expressions.tests.FTimeDeltaTests) | Fail |
test_delta_subtract (expressions.tests.FTimeDeltaTests) | Fail |
test_delta_update (expressions.tests.FTimeDeltaTests) | Fail |
test_duration_with_datetime_microseconds (expressions.tests.FTimeDeltaTests) | Fail |
test_durationfield_add (expressions.tests.FTimeDeltaTests) | Fail |
test_exclude (expressions.tests.FTimeDeltaTests) | Fail |
test_invalid_operator (expressions.tests.FTimeDeltaTests) | Fail |
test_mixed_comparisons2 (expressions.tests.FTimeDeltaTests) | Fail |
test_multiple_query_compilation (expressions.tests.FTimeDeltaTests) | Fail |
test_negative_timedelta_update (expressions.tests.FTimeDeltaTests) | Fail |
test_query_clone (expressions.tests.FTimeDeltaTests) | Fail |
test_annotate_values_aggregate (expressions.tests.BasicExpressionsTests) | Fail |
test_annotation_with_outerref (expressions.tests.BasicExpressionsTests) | Fail |
test_outerref_with_operator (expressions.tests.BasicExpressionsTests) | 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_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_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_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_righthand_power (expressions.tests.ExpressionOperatorTests) | Pass |
test_duration_expressions (expressions.tests.FTimeDeltaTests) | Pass |
test_duration_with_datetime (expressions.tests.FTimeDeltaTests) | Pass |
test_aggregate_subquery_annotation (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_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_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.