api/alembic/versions/sql/0002_functions.sql

@@ -4086,13 +4086,26 @@ $function$
 
 -- DROP FUNCTION v3.v_form1_smeta(int4, int4);
 
-CREATE OR REPLACE FUNCTION v3.v_form1_smeta(p_year integer, p_org_unit_id integer)
+
- RETURNS TABLE(row_type character varying, depth integer, section_code character varying, name character varying, supp_plan_q1 numeric, supp_plan_q2 numeric, supp_plan_q3 numeric, supp_plan_q4 numeric, supp_plan_year numeric, dev_plan_q1 numeric, dev_plan_q2 numeric, dev_plan_q3 numeric, dev_plan_q4 numeric, dev_plan_year numeric, total_plan_year numeric, supp_appr_q1 numeric, supp_appr_q2 numeric, supp_appr_q3 numeric, supp_appr_q4 numeric, supp_appr_year numeric, dev_appr_q1 numeric, dev_appr_q2 numeric, dev_appr_q3 numeric, dev_appr_q4 numeric, dev_appr_year numeric, total_appr_year numeric, supp_act_q1 numeric, supp_act_q2 numeric, supp_act_q3 numeric, supp_act_q4 numeric, supp_act_year numeric, dev_act_q1 numeric, dev_act_q2 numeric, dev_act_q3 numeric, dev_act_q4 numeric, dev_act_year numeric, total_act_year 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)
+CREATE OR REPLACE FUNCTION v3.v_form1_smeta(p_year INT, p_org_unit_id INT)
- LANGUAGE plpgsql
+RETURNS TABLE (
- STABLE
+  row_type        VARCHAR,
- SET search_path TO 'v3', 'pg_catalog'
+  depth           INT,
+  section_code    VARCHAR,
+  name            VARCHAR,
+  supp_plan_q1 NUMERIC, supp_plan_q2 NUMERIC, supp_plan_q3 NUMERIC, supp_plan_q4 NUMERIC, supp_plan_year NUMERIC,
+  dev_plan_q1  NUMERIC, dev_plan_q2  NUMERIC, dev_plan_q3  NUMERIC, dev_plan_q4  NUMERIC, dev_plan_year  NUMERIC,
+  total_plan_year NUMERIC,
+  supp_appr_q1 NUMERIC, supp_appr_q2 NUMERIC, supp_appr_q3 NUMERIC, supp_appr_q4 NUMERIC, supp_appr_year NUMERIC,
+  dev_appr_q1  NUMERIC, dev_appr_q2  NUMERIC, dev_appr_q3  NUMERIC, dev_appr_q4  NUMERIC, dev_appr_year  NUMERIC,
+  total_appr_year NUMERIC,
+  supp_act_q1 NUMERIC, supp_act_q2 NUMERIC, supp_act_q3 NUMERIC, supp_act_q4 NUMERIC, supp_act_year NUMERIC,
+  dev_act_q1  NUMERIC, dev_act_q2  NUMERIC, dev_act_q3  NUMERIC, dev_act_q4  NUMERIC, dev_act_year  NUMERIC,
+  total_act_year 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
+)
 AS $function$
-#variable_conflict use_column
 DECLARE
   v_ahr INT; v_cap INT; v_oper INT;
   v_sections TEXT[] := ARRAY['plan','approved','q1','q2','q3','q4'];
@@ -4222,7 +4235,9 @@ BEGIN
   ORDER BY m.sc;
 END;
 $function$
+LANGUAGE plpgsql STABLE SET search_path = v3, pg_catalog
 ;
+
 -- DROP FUNCTION v3.v_form2_sheet_sections(int4, varchar, _text);
 
 CREATE OR REPLACE FUNCTION v3.v_form2_sheet_sections(p_form_id integer, p_sheet character varying, p_sections text[] DEFAULT NULL::text[])

api/tests/sqls/fixture.sql

@@ -26,7 +26,7 @@ SELECT setval('v3.budget_line_id_seq', 1);
 INSERT INTO v3.form_phase (budget_form_id,sheet,phase_code,"role",column_keys,opens_at,closes_at) VALUES
 	 (1,'AHR','test','DFIP','{{plan.q1}}','2026-05-05 03:00:00+03','2026-06-06 03:00:00+03');
 
-INSERT INTO v3.vsp (id,branch_id,reg_number,address,format,opened_at,placement_type,staff_count,total_area,closed_at,is_active,updated_at,is_deleted,created_at,created_by,system_code,updated_by,vsp_type,notes,location_form,rent_contract_num,rent_end_date) VALUES
+INSERT INTO v3.vsp (id,branch_id,reg_number,address,format,opened_at,placement_type,staff_count,total_area,closed_at,is_active,updated_at,is_deleted,created_at,created_by,system_code,updated_by,vsp_type,notes,location_form,numbers,rent_contract_num,rent_end_date) VALUES
-	 (1,2,'Тестовый всп 1','Тестовая 12','укукк','2026-05-07','ывс',2026,230,'2026-06-16',false,'2026-06-18 15:46:38.611903',false,'2026-06-04 14:36:59.737727',1,'1233',91,'','','встроенное помещение','',NULL),
+	 (1,2,'Тестовый всп 1','Тестовая 12','укукк','2026-05-07','ывс',2026,230,'2026-06-16',false,'2026-06-18 15:46:38.611903',false,'2026-06-04 14:36:59.737727',1,'1233',91,'','','встроенное помещение',NULL,'',NULL),
-     (2,2,'Test12 -----','Тестовая 125','формат 15 ','2026-06-08',NULL,NULL,58,NULL,true,'2026-06-16 18:53:17.986651',false,'2026-06-09 09:04:33.29858',91,'123-1234',91,'субаренда','Работает ','аренда','12-45','2026-10-02');
+     (2,2,'Test12 -----','Тестовая 125','формат 15 ','2026-06-08',NULL,NULL,58,NULL,true,'2026-06-16 18:53:17.986651',false,'2026-06-09 09:04:33.29858',91,'123-1234',91,'субаренда','Работает ','аренда',155,'12-45','2026-10-02');
 SELECT setval('v3.vsp_id_seq', 2);