From f93fa1d9674b20b12bb4872dc37fb8c532ce68b1 Mon Sep 17 00:00:00 2001
From: Anton Bagliy <taccessviolation@gmail.com>
Date: Sat, 10 Nov 2018 16:37:38 +0300
Subject: [PATCH] FIX: teacher_create stored procedure for #328

---
 db/postgresql/functions.sql | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/db/postgresql/functions.sql b/db/postgresql/functions.sql
index 452112e8d..082fc72bd 100644
--- a/db/postgresql/functions.sql
+++ b/db/postgresql/functions.sql
@@ -1,4 +1,8 @@
- DROP TRIGGER IF EXISTS  tr_i_submodule ON submodules CASCADE; 
+-- noinspection LossyEncodingForFile
+
+-- noinspection LossyEncodingForFile
+
+DROP TRIGGER IF EXISTS  tr_i_submodule ON submodules CASCADE;
 
  DROP TRIGGER IF EXISTS  tr_u_submodule ON submodules CASCADE; 
 
@@ -5132,7 +5136,7 @@ END
        "name" = pSubjectName,
        Abbr = COALESCE(pSubjectAbbr, subjects.Abbr),
        ExternalID = COALESCE(pExternalID, subjects.ExternalID)
-   returning id into vSubjectID; -- должно вернуть или новый ID или ID измененной записи
+   returning id into vSubjectID; -- должно вернуть или новый ID или ID РёР·РС?ененной записи
    BEGIN --handler block
 
      INSERT INTO subjects_faculties (SubjectID, FacultyID) VALUES (vSubjectID, pFacultyID)
@@ -5435,15 +5439,15 @@ begin
 --	:pactivationcode 	-- put the pactivationcode parameter value instead of 'pactivationcode' (varchar)
 --);
 
-      vAccountID := CreateAccount(pActivationCode, GetUserRole('teacher'));
+      vAccountID := CreateAccount(pLastName, pFirstName, pSecondName, pActivationCode, GetUserRole('teacher'));
    -- add new teacher
-    INSERT INTO teachers (AccountID, LastName, FirstName, SecondName, JobPositionID, DepartmentID) VALUES
-        (vAccountID, pLastName, pFirstName, pSecondName, pJobPositionID, pDepartmentID) returning vID;
+    INSERT INTO teachers (AccountID, JobPositionID, FacultyID) VALUES
+        (vAccountID, pJobPositionID, pDepartmentID) returning ID into vID;
     RETURN vID;
-  EXCEPTION 
-  when others then
-  RETURN -1;
-   
+  --EXCEPTION
+  --when others then
+  --RETURN -1;
+
 END;
 $function$;
 
-- 
GitLab