From 753c165a2be08d8855e45be47691629e11f8e6fc Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Thu, 28 Aug 2014 01:02:36 +0400
Subject: [PATCH] fix
---
db/StoredProcedures.sql | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 3bb192650..19a9e6449 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -981,9 +981,7 @@ END //
DROP PROCEDURE IF EXISTS GetDisciplineInfoByID//
-CREATE PROCEDURE `GetDisciplineInfoByID`( IN `DiscID` INT,
- IN `DepID` INT,
- IN `FacultyID` INT )
+CREATE PROCEDURE `GetDisciplineInfoByID`( IN `DiscID` INT )
NO SQL
BEGIN
@@ -995,15 +993,14 @@ BEGIN
disciplines.SemesterID,
subjects.ID AS 'SubjectID',
subjects.Name AS 'SubjectName',
- subjects.Abbr AS 'SubjectAbbr'
-
-
+ subjects.Abbr AS 'SubjectAbbr',
+ departments.ID AS 'DepID',
+ departments.Name AS 'DepName',
+ departments.FacultyID AS 'FacultyID'
FROM `disciplines`
INNER JOIN `subjects` ON subjects.ID = disciplines.SubjectID
INNER JOIN `departments` ON departments.ID = disciplines.DepartmentID
- WHERE ( DiscID = 0 OR disciplines.ID = DiscID) AND
- ( DepartmentID = 0 OR disciplines.DepartmentID = DepartmentID ) AND
- ( FacultyID = 0 OR departments.FacultyID = FacultyID);
+ WHERE disciplines.ID = DiscID;
END //
--
GitLab