FIX: remove isStudyLeave; Fix: username in makefile

db/Makefile

@@ -3,7 +3,7 @@ $(subst .sql, , $(wildcard $1/*.sql))
 endef
 
 
-USER := $(shell bash -c 'read -p "Username: " pwd; echo $$username')
+USER := $(shell bash -c 'read -p "Username: " username; echo $$username')
 PASS := $(shell bash -c 'read -s -p "Password: " pwd; echo $$pwd')
 DB := mmcs_rating
 
@@ -20,6 +20,6 @@ deploy: $(call GET_NAMES, stored)
 
 
 %:
-	mysql -u $(USER) $(PASS) $(DB) < $@.sql
+	mysql -u $(USER) --password=$(PASS) $(DB) < $@.sql
 
 

db/stored/functions.sql

@@ -104,7 +104,7 @@ BEGIN
                                             disciplines_groups.GroupID = students_groups.GroupID
         WHERE   students_groups.StudentID = pStudentID AND
                 students_groups.SemesterID = pSemesterID AND
-                students_groups.IsStudyLeave = FALSE
+                students_groups.State != 'expulsion'
         LIMIT 1
     );
 END //
@@ -360,7 +360,7 @@ BEGIN
         FROM `students_groups`
         WHERE   students_groups.StudentID = pStudentID AND
                 students_groups.SemesterID = pSemesterID AND
-                students_groups.IsStudyLeave = FALSE
+                students_groups.State != 'expulsion'
         LIMIT 1;
 
     RETURN vGroupID;