RSHB/DFiP_Budget_planing
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'mig2-fix: поправил sql' (#17) from mig2-fix into test

Browse Source 
Reviewed-on: #17
Reviewed-by: Raykov-MS <RaykovMS@avt.rshb.ru>
This commit is contained in:
tsygankoviva 2026-06-30 11:22:56 +03:00
commit e91c5e1846
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/alembic/versions/sql/0002_functions.sql
View File

@ -4087,7 +4087,7 @@ $function$
-- DROP FUNCTION v3.v_form1_smeta(int4, int4); -- DROP FUNCTION v3.v_form1_smeta(int4, int4);
CREATE FUNCTION v3.v_form1_smeta(p_year INT, p_org_unit_id INT) CREATE OR REPLACE FUNCTION v3.v_form1_smeta(p_year INT, p_org_unit_id INT)
RETURNS TABLE ( RETURNS TABLE (
row_type VARCHAR, row_type VARCHAR,
depth INT, depth INT,
@ -4105,8 +4105,7 @@ RETURNS TABLE (
supp_corr_q2 NUMERIC, supp_corr_q3 NUMERIC, supp_corr_q4 NUMERIC, supp_corr_q2 NUMERIC, supp_corr_q3 NUMERIC, supp_corr_q4 NUMERIC,
dev_corr_q2 NUMERIC, dev_corr_q3 NUMERIC, dev_corr_q4 NUMERIC dev_corr_q2 NUMERIC, dev_corr_q3 NUMERIC, dev_corr_q4 NUMERIC
) )
AS $$ AS $function$
#variable_conflict use_column
DECLARE DECLARE
v_ahr INT; v_cap INT; v_oper INT; v_ahr INT; v_cap INT; v_oper INT;
v_sections TEXT[] := ARRAY['plan','approved','q1','q2','q3','q4']; v_sections TEXT[] := ARRAY['plan','approved','q1','q2','q3','q4'];
@ -4235,7 +4234,9 @@ BEGIN
FROM merged m FROM merged m
ORDER BY m.sc; ORDER BY m.sc;
END; END;
$$ LANGUAGE plpgsql STABLE SET search_path = v3, pg_catalog; $function$
LANGUAGE plpgsql STABLE SET search_path = v3, pg_catalog
;
-- DROP FUNCTION v3.v_form2_sheet_sections(int4, varchar, _text); -- DROP FUNCTION v3.v_form2_sheet_sections(int4, varchar, _text);