diff --git a/db/Views.sql b/db/Views.sql index e0c3824fbd648ffe9044105dfa6c4b8ee0aca693..79660a667c8b26141fde932e31555df7b6d85756 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 63197346132c92668dd81f9032dc29e59de737ab..ea690545a3e6c0ee3b8262b98a56bfb576f5eba7 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 ;