From 535b30cf4e91f85e6bf5762d47b34f42d3574641 Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Sun, 24 Aug 2014 19:43:16 +0400
Subject: [PATCH] Degree -> JobPosition...

---
 db/Sample.sql           |  6 +++---
 db/StoredProcedures.sql | 33 +++++++++++++++------------------
 db/Structure.sql        |  6 +++---
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/db/Sample.sql b/db/Sample.sql
index 95bd8d678..2e3151a99 100644
--- a/db/Sample.sql
+++ b/db/Sample.sql
@@ -29,10 +29,10 @@ INSERT INTO `accounts` (`ID`, `Login`, `Password`, `EMail`, `UserRoleID`, `Activ
 (7, NULL, NULL, NULL, 1, 'code2', 1, NULL);
 
 --
--- Дамп данных таблицы `degrees`
+-- Дамп данных таблицы `job_positions`
 --
 
-INSERT INTO `degrees` (`ID`, `Name`) VALUES
+INSERT INTO `job_positions` (`ID`, `Name`) VALUES
 (1, 'Аспирант'),
 (2, 'Ассистент'),
 (3, 'Ведущий научный сотрудник'),
@@ -117,7 +117,7 @@ INSERT INTO `subjects` (`ID`, `Name`, `Abbr`) VALUES
 -- Дамп данных таблицы `teachers`
 --
 
-INSERT INTO `teachers` (`ID`, `LastName`, `FirstName`, `SecondName`, `DegreeID`, `DepartmentID`, `AccountID`) VALUES
+INSERT INTO `teachers` (`ID`, `LastName`, `FirstName`, `SecondName`, `JobPositionID`, `DepartmentID`, `AccountID`) VALUES
 (1, 'Колобок', 'Фазиль', 'Евреивич', 9, 1, 6);
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index f022863de..c849530d9 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -301,12 +301,12 @@ BEGIN
 			teachers.LastName 		AS 'TeacherLast', 
 			teachers.FirstName 		AS 'TeacherFirst', 
 			teachers.SecondName		AS 'TeacherSecond', 
-			degrees.Name 			AS 'DegreeName', 
+			job_positions.Name 		AS 'JobPositionName', 
 			departments.ID 			AS 'DepID',
 			departments.Name 		AS 'DepName'
 	FROM `teachers`
 	INNER JOIN `departments` ON departments.ID = teachers.DepartmentID
-	INNER JOIN `degrees` ON degrees.ID = teachers.DegreeID
+	INNER JOIN `job_positions` ON job_positions.ID = teachers.JobPositionID
 	WHERE departments.FacultyID = FacultyID;
 
 END //
@@ -321,12 +321,12 @@ BEGIN
 			teachers.LastName 		AS 'TeacherLast', 
 			teachers.FirstName 		AS 'TeacherFirst', 
 			teachers.SecondName		AS 'TeacherSecond',  
-			degrees.Name 			AS 'DegreeName', 
+			job_positions.Name 		AS 'JobPositionName', 
 			departments.ID 			AS 'DepartmentID',
 			departments.Name 		AS 'DepartmentName'
 	FROM `teachers`
 	INNER JOIN `departments` ON departments.ID = teachers.DepartmentID
-	INNER JOIN `degrees` ON degrees.ID = teachers.DegreeID
+	INNER JOIN `job_positions` ON job_positions.ID = teachers.JobPositionID
 	WHERE departments.FacultyID = FacultyID;
 
 END //
@@ -405,9 +405,6 @@ END //
 
 
 -- Desc: - UserID => FirstName, SecondName, LastName, StudyGroup (вся информация, в т.ч. и специализация (ПМ, ИТ, etc.)) (в зав. от AccountType)
--- Note: 	1) если аккаунт существует, то всегда можно получить UserID, AccountType, LastName, FirstName
---				иначе UserID = NULL (как и все остальные)
---			2) Degree у преподавателя и LastName могут быть NULL 
 DROP PROCEDURE IF EXISTS GetPersonalInfoByID//
 CREATE PROCEDURE `GetPersonalInfoByID`	(	IN `UserID` INT 
 										)
@@ -449,7 +446,7 @@ BEGIN
 				teachers.LastName 		AS 'Last', 
 				teachers.FirstName 		AS 'First', 
 				teachers.SecondName 	AS 'Second', 
-				degrees.Name 			AS 'DegreeName', 
+				job_positions.Name 		AS 'JobPositionName', 
 				departments.ID 			AS 'DepID',
 				departments.Name 		AS 'DepName',
 				faculties.ID 			AS 'FacultyID', 
@@ -458,7 +455,7 @@ BEGIN
 		FROM `teachers`
 		INNER JOIN `departments` ON departments.ID = teachers.DepartmentID
 		INNER JOIN `faculties` ON departments.FacultyID = faculties.ID
-		INNER JOIN `degrees` ON degrees.ID = teachers.DegreeID
+		INNER JOIN `job_positions` ON job_positions.ID = teachers.JobPositionID
 		WHERE teachers.AccountID = UserID;
 
 	END IF;
@@ -693,7 +690,7 @@ DROP FUNCTION IF EXISTS CreateTeacher//
 CREATE FUNCTION `CreateTeacher`(	`Last` 			VARCHAR(30) CHARSET utf8, 
 									`First` 		VARCHAR(30) CHARSET utf8, 
 									`Second` 		VARCHAR(30) CHARSET utf8, 
-									`DegreeID` 	   	INT, 
+									`JobPositionID` INT, 
 									`DepartmentID` 	INT, 
 									`Code` 			VARCHAR(40) CHARSET utf8 
 								) 	RETURNS int(11)
@@ -712,10 +709,10 @@ BEGIN
 	END IF;
 
 	SET checker = -1;
-	SELECT degrees.ID 
+	SELECT job_positions.ID 
 	INTO checker
-	FROM `degrees`
-	WHERE degrees.ID = DegreeID
+	FROM `job_positions`
+	WHERE job_positions.ID = JobPositionID
 	LIMIT 1;
 	IF NOT (checker > 0) THEN
 		RETURN -1;
@@ -737,9 +734,9 @@ BEGIN
 								teachers.LastName, 
 								teachers.FirstName, 
 								teachers.SecondName, 
-								teachers.DegreeID, 
+								teachers.JobPositionID, 
 								teachers.DepartmentID)
-	VALUES 				   (curID, Last, First, Second, DegreeID, DepartmentID);
+	VALUES 				   (curID, Last, First, Second, JobPositionID, DepartmentID);
 	
 	RETURN 0;
 
@@ -926,8 +923,8 @@ BEGIN
 				teachers.LastName 		AS 'TeacherLast', 
 				teachers.FirstName 		AS 'TeacherFirst', 
 				teachers.SecondName 	AS 'TeacherSecond', 
-				degrees.ID 				AS 'DegreeID',
-				degrees.Name 			AS 'Degree', 
+				job_positions.ID 		AS 'JobPositionID',
+				job_positions.Name 		AS 'JobPositionName', 
 				departments.ID 			AS 'DepartmentID',
 				departments.Name 		AS 'DepartmentName',
 				faculties.ID 			AS 'FacultyID', 
@@ -937,7 +934,7 @@ BEGIN
 		INNER JOIN `teachers` ON teachers.ID = disciplines_teachers.TeacherID
 		INNER JOIN `departments` ON departments.ID = teachers.DepartmentID
 		INNER JOIN `faculties` ON departments.FacultyID = faculties.ID
-		INNER JOIN `degrees` ON degrees.ID = teachers.DegreeID
+		INNER JOIN `job_positions` ON job_positions.ID = teachers.JobPositionID
 		WHERE disciplines_teachers.DisciplineID = DiscID;
 END //
 
diff --git a/db/Structure.sql b/db/Structure.sql
index 53c7da499..03ce1f70e 100644
--- a/db/Structure.sql
+++ b/db/Structure.sql
@@ -43,10 +43,10 @@ CREATE TABLE IF NOT EXISTS `accounts` (
 -- --------------------------------------------------------
 
 --
--- Структура таблицы `degrees`
+-- Структура таблицы `job_positions`
 --
 
-CREATE TABLE IF NOT EXISTS `degrees` (
+CREATE TABLE IF NOT EXISTS `job_positions` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
   `Name` varchar(200) NOT NULL,
   PRIMARY KEY (`ID`)
@@ -350,7 +350,7 @@ CREATE TABLE IF NOT EXISTS `teachers` (
   `LastName` varchar(30) NOT NULL,
   `FirstName` varchar(30) NOT NULL,
   `SecondName` varchar(30) DEFAULT NULL,
-  `DegreeID` int(11) NOT NULL,
+  `JobPositionID` int(11) NOT NULL,
   `DepartmentID` int(11) NOT NULL,
   `AccountID` int(11) NOT NULL,
   PRIMARY KEY (`ID`),
-- 
GitLab