From 485f7b5582d62100b69f01777fe746c4553dbdc5 Mon Sep 17 00:00:00 2001
From: "dmitry.sviridkin" <sv.l1@mail.ru>
Date: Tue, 14 Jul 2015 12:18:20 +0300
Subject: [PATCH] fixed bug

---
 db/Views.sql |  2 +-
 db/fix.sql   | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/db/Views.sql b/db/Views.sql
index e0c3824fb..79660a667 100644
--- a/db/Views.sql
+++ b/db/Views.sql
@@ -81,7 +81,7 @@ CREATE OR REPLACE VIEW `view_disciplines` AS
         INNER JOIN `subjects` ON subjects.ID = disciplines.SubjectID
         INNER JOIN `faculties` ON faculties.ID = disciplines.FacultyID
         INNER JOIN `grades` ON grades.ID = disciplines.GradeID
-        INNER JOIN `compound_disciplines` ON compound_disciplines.ID = disciplines.CompoundDiscID;
+        LEFT JOIN `compound_disciplines` ON compound_disciplines.ID = disciplines.CompoundDiscID;
 
 
 
diff --git a/db/fix.sql b/db/fix.sql
index 631973461..ea690545a 100644
--- a/db/fix.sql
+++ b/db/fix.sql
@@ -1,9 +1,13 @@
 DELIMITER //
 
+DROP TABLE IF EXISTS `compound_disciplines`//
+
 CREATE TABLE IF NOT EXISTS `compound_disciplines` (
     `ID` int(11) NOT NULL AUTO_INCREMENT,
     `Name` varchar(200) CHARACTER SET utf8 NULL DEFAULT 'Курс по выбору',
-    PRIMARY KEY (`ID`)
+    `GradeID` int(11) NOT NULL,
+    PRIMARY KEY (`ID`),
+    KEY `GradeID` (`GradeID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 //
 
 
@@ -14,6 +18,10 @@ ALTER TABLE `disciplines`
 ALTER TABLE `disciplines`
   ADD CONSTRAINT `disciplines_ibfk_6` FOREIGN KEY (`CompoundDiscID`) REFERENCES `compound_disciplines` (`ID`) //
 
+ALTER TABLE `compound_disciplines`
+  ADD CONSTRAINT `compound_disciplines_ibfk_1` FOREIGN KEY (`GradeID`) REFERENCES `grades` (`ID`) //
+
+
 DELIMITER ;
 
 
-- 
GitLab