From 21af4296c21dd750a7b745bcde5c30f177fabf84 Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Sun, 24 Aug 2014 13:43:44 +0400
Subject: [PATCH] fix #6
---
db/StoredProcedures.sql | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index e7e3778f8..f022863de 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -963,11 +963,12 @@ BEGIN
study_groups.Grade AS 'StudyGroupGrade',
study_groups.Name AS 'StudyGroupName'
FROM `disciplines_groups`
- INNER JOIN `disciplines` ON disciplines_groups.DisciplineID = disciplines.ID
+ RIGHT JOIN `disciplines` ON disciplines_groups.DisciplineID = disciplines.ID OR
+ disciplines_groups.DisciplineID IS NULL
INNER JOIN `disciplines_teachers` ON disciplines.ID = disciplines_teachers.DisciplineID AND
disciplines_teachers.TeacherID = TeacherID
INNER JOIN `subjects` ON subjects.ID = disciplines.SubjectID
- INNER JOIN `study_groups` ON study_groups.ID = disciplines_groups.StudyGroupID
+ LEFT JOIN `study_groups` ON study_groups.ID = disciplines_groups.StudyGroupID
WHERE disciplines.SemesterID = semID
ORDER BY disciplines.Grade ASC,
subjects.Name ASC,
@@ -977,8 +978,6 @@ END //
-
-
DROP PROCEDURE IF EXISTS GetStudentsForDiscipline//
CREATE PROCEDURE `GetStudentsForDiscipline` ( IN `TeacherID` INT,
IN `DisciplineID` INT
--
GitLab