FIX: Discipline_GetSubgroups # 299

db/postgresql/add_subgroups_01_12_18.sql

@@ -107,7 +107,7 @@ WHERE subgroups.id = psubgroupid;
 $function$;
 
 CREATE OR REPLACE FUNCTION public.Discipline_GetSubgroups(pdisciplineid integer)
-  RETURNS TABLE("ID" integer, "Title" character varying, "TeacherID" integer)
+  RETURNS TABLE("ID" integer, "Title" character varying, "TeacherID" integer, "DisciplineID" integer)
 LANGUAGE sql
 AS $function$
 SELECT subgroups.id AS "ID",
@@ -133,12 +133,12 @@ begin
   -- TODO: удалить студента из другой подгруппы, если он уже прикреплен
   select subgroup_id into vOldSubgroupID
   from subgroups join students_subgroups
-  on subgroups.id = students_subgroups.subgroup_id
+      on subgroups.id = students_subgroups.subgroup_id
   where students_subgroups.student_id = pstudentid and subgroups.discipline_id = vDisciplineID;
 
   if vOldSubgroupID > 0 then
-     delete from students_subgroups
-     where students_subgroups.student_id = pstudentid and students_subgroups.subgroup_id = vOldSubgroupID;
+    delete from students_subgroups
+    where students_subgroups.student_id = pstudentid and students_subgroups.subgroup_id = vOldSubgroupID;
   end if;
 
   insert into students_subgroups(student_id, subgroup_id)
@@ -201,7 +201,7 @@ begin
   --values(pteacherid, psubgroupid)  returning id into vID;
   --RETURN vID;
   update subgroups
-    set teacher_id = pteacherid
+  set teacher_id = pteacherid
   where id = psubgroupid returning teacher_id into vID;
   return vID;
 end