RSHB/DFiP_Budget_planing
10
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

perf(formulas): равенство по владельцу вместо IS NOT DISTINCT FROM, отказ на Infinity (AURORA-1896, M-1, M-2, M-3)

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Andrey Epifancev 2026-11-11 21:06:53 +04:00
parent e569d18624
commit e107fa418d
2 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
api/alembic/versions/sql/0060_cell_formula.sql
View File

@ -85,12 +85,20 @@ BEGIN
END IF; END IF;
IF v_expr = '' THEN IF v_expr = '' THEN
DELETE FROM v3.cell_formula cf -- равенство по владельцу в отдельных ветках: так планировщик берёт частичные уникальные индексы
WHERE cf.sheet = p_sheet IF p_budget_form_id IS NOT NULL THEN
AND cf.line_id = v_line DELETE FROM v3.cell_formula cf
AND cf.column_key = v_column WHERE cf.budget_form_id = p_budget_form_id
AND cf.budget_form_id IS NOT DISTINCT FROM p_budget_form_id AND cf.sheet = p_sheet
AND cf.rf_project_report_id IS NOT DISTINCT FROM p_report_id; AND cf.line_id = v_line
AND cf.column_key = v_column;
ELSE
DELETE FROM v3.cell_formula cf
WHERE cf.rf_project_report_id = p_report_id
AND cf.sheet = p_sheet
AND cf.line_id = v_line
AND cf.column_key = v_column;
END IF;
CONTINUE; CONTINUE;
END IF; END IF;
@ -106,7 +114,7 @@ BEGIN
EXCEPTION WHEN others THEN EXCEPTION WHEN others THEN
RAISE EXCEPTION 'invalid_formula: value'; RAISE EXCEPTION 'invalid_formula: value';
END; END;
IF v_value IS NULL OR v_value = 'NaN'::numeric THEN IF v_value IS NULL OR v_value::text IN ('NaN', 'Infinity', '-Infinity') THEN
RAISE EXCEPTION 'invalid_formula: value'; RAISE EXCEPTION 'invalid_formula: value';
END IF; END IF;
@ -117,6 +125,16 @@ BEGIN
ON CONFLICT (budget_form_id, sheet, line_id, column_key) WHERE budget_form_id IS NOT NULL ON CONFLICT (budget_form_id, sheet, line_id, column_key) WHERE budget_form_id IS NOT NULL
DO UPDATE SET expression = EXCLUDED.expression, value = EXCLUDED.value, DO UPDATE SET expression = EXCLUDED.expression, value = EXCLUDED.value,
updated_by = EXCLUDED.updated_by, updated_at = EXCLUDED.updated_at; updated_by = EXCLUDED.updated_by, updated_at = EXCLUDED.updated_at;
RETURN QUERY
SELECT cf.line_id, cf.column_key, cf.expression, cf.value, cf.updated_by,
u.full_name::text, cf.updated_at
FROM v3.cell_formula cf
LEFT JOIN v3.app_user u ON u.id = cf.updated_by
WHERE cf.budget_form_id = p_budget_form_id
AND cf.sheet = p_sheet
AND cf.line_id = v_line
AND cf.column_key = v_column;
ELSE ELSE
INSERT INTO v3.cell_formula AS cf INSERT INTO v3.cell_formula AS cf
(rf_project_report_id, sheet, line_id, column_key, expression, value, updated_by, updated_at) (rf_project_report_id, sheet, line_id, column_key, expression, value, updated_by, updated_at)
@ -124,18 +142,16 @@ BEGIN
ON CONFLICT (rf_project_report_id, sheet, line_id, column_key) WHERE rf_project_report_id IS NOT NULL ON CONFLICT (rf_project_report_id, sheet, line_id, column_key) WHERE rf_project_report_id IS NOT NULL
DO UPDATE SET expression = EXCLUDED.expression, value = EXCLUDED.value, DO UPDATE SET expression = EXCLUDED.expression, value = EXCLUDED.value,
updated_by = EXCLUDED.updated_by, updated_at = EXCLUDED.updated_at; updated_by = EXCLUDED.updated_by, updated_at = EXCLUDED.updated_at;
RETURN QUERY
SELECT cf.line_id, cf.column_key, cf.expression, cf.value, cf.updated_by,
u.full_name::text, cf.updated_at
FROM v3.cell_formula cf
LEFT JOIN v3.app_user u ON u.id = cf.updated_by
WHERE cf.rf_project_report_id = p_report_id
AND cf.sheet = p_sheet
AND cf.line_id = v_line
AND cf.column_key = v_column;
END IF; END IF;
RETURN QUERY
SELECT cf.line_id, cf.column_key, cf.expression, cf.value, cf.updated_by,
u.full_name::text, cf.updated_at
FROM v3.cell_formula cf
LEFT JOIN v3.app_user u ON u.id = cf.updated_by
WHERE cf.sheet = p_sheet
AND cf.line_id = v_line
AND cf.column_key = v_column
AND cf.budget_form_id IS NOT DISTINCT FROM p_budget_form_id
AND cf.rf_project_report_id IS NOT DISTINCT FROM p_report_id;
END LOOP; END LOOP;
END; END;
$function$; $function$;
@ -163,15 +179,25 @@ BEGIN
RAISE EXCEPTION 'invalid_formula: owner'; RAISE EXCEPTION 'invalid_formula: owner';
END IF; END IF;
RETURN QUERY IF p_budget_form_id IS NOT NULL THEN
SELECT cf.line_id, cf.column_key, cf.expression, cf.value, cf.updated_by, RETURN QUERY
u.full_name::text, cf.updated_at SELECT cf.line_id, cf.column_key, cf.expression, cf.value, cf.updated_by,
FROM v3.cell_formula cf u.full_name::text, cf.updated_at
LEFT JOIN v3.app_user u ON u.id = cf.updated_by FROM v3.cell_formula cf
WHERE cf.sheet = p_sheet LEFT JOIN v3.app_user u ON u.id = cf.updated_by
AND cf.budget_form_id IS NOT DISTINCT FROM p_budget_form_id WHERE cf.budget_form_id = p_budget_form_id
AND cf.rf_project_report_id IS NOT DISTINCT FROM p_report_id AND cf.sheet = p_sheet
ORDER BY cf.line_id, cf.column_key; ORDER BY cf.line_id, cf.column_key;
ELSE
RETURN QUERY
SELECT cf.line_id, cf.column_key, cf.expression, cf.value, cf.updated_by,
u.full_name::text, cf.updated_at
FROM v3.cell_formula cf
LEFT JOIN v3.app_user u ON u.id = cf.updated_by
WHERE cf.rf_project_report_id = p_report_id
AND cf.sheet = p_sheet
ORDER BY cf.line_id, cf.column_key;
END IF;
END; END;
$function$; $function$;

2
api/tests/integration/test_cell_formula_sql.py
View File

@ -87,7 +87,7 @@ def test_empty_after_normalization_is_no_formula(svod2_sql):
@pytest.mark.parametrize( @pytest.mark.parametrize(
"formula,value", "formula,value",
[("drop table", 1), ("1" * 501, 1), ("1+1", None), ("1+1", "abc"), ("1+1", "NaN")], [("drop table", 1), ("1" * 501, 1), ("1+1", None), ("1+1", "abc"), ("1+1", "NaN"), ("1+1", "Infinity"), ("1+1", "-Infinity")],
) )
def test_invalid_formula_raises(svod2_sql, formula, value): def test_invalid_formula_raises(svod2_sql, formula, value):
admin, line = _admin(svod2_sql), _line(svod2_sql) admin, line = _admin(svod2_sql), _line(svod2_sql)