From 0dbe993164bbed68737668014ba96f699f19f1f1 Mon Sep 17 00:00:00 2001
From: Artem Konenko <yadummer@gmail.com>
Date: Fri, 4 Sep 2015 11:45:59 +0300
Subject: [PATCH] Fix: add forgiven lines from dbfix 01.09.15 to main sqls
---
db/constraints/base.sql | 3 ++-
db/structure/base.sql | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/db/constraints/base.sql b/db/constraints/base.sql
index a1aa6706a..a06dc655c 100644
--- a/db/constraints/base.sql
+++ b/db/constraints/base.sql
@@ -31,7 +31,8 @@ ALTER TABLE `disciplines`
ADD CONSTRAINT `disciplines_ibfk_2` FOREIGN KEY (`SemesterID`) REFERENCES `semesters` (`ID`),
ADD CONSTRAINT `disciplines_ibfk_3` FOREIGN KEY (`AuthorID`) REFERENCES `teachers` (`ID`),
ADD CONSTRAINT `disciplines_ibfk_4` FOREIGN KEY (`FacultyID`) REFERENCES `faculties` (`ID`),
- ADD CONSTRAINT `disciplines_ibfk_5` FOREIGN KEY (`GradeID`) REFERENCES `grades` (`ID`);
+ ADD CONSTRAINT `disciplines_ibfk_5` FOREIGN KEY (`GradeID`) REFERENCES `grades` (`ID`),
+ ADD CONSTRAINT `disciplines_ibfk_6` FOREIGN KEY (`CompoundDiscID`) REFERENCES `compound_disciplines` (`ID`);
--
-- Ограничения внешнего ключа таблицы `disciplines_groups`
diff --git a/db/structure/base.sql b/db/structure/base.sql
index 7f8a30a15..04ab6480f 100644
--- a/db/structure/base.sql
+++ b/db/structure/base.sql
@@ -103,12 +103,14 @@ CREATE TABLE IF NOT EXISTS `disciplines` (
`Milestone` INT(1) NOT NULL DEFAULT '0',
`MilestoneDate` DATE NULL DEFAULT NULL,
`Subtype` enum('scientific_coursework', 'disciplinary_coursework' ) NULL DEFAULT NULL,
+ `CompoundDiscID` INT(11) NULL DEFAULT NULL,
PRIMARY KEY (`ID`),
KEY `GradeID` (`GradeID`),
KEY `SubjectID` (`SubjectID`),
KEY `TeacherID` (`AuthorID`),
KEY `SemesterID` (`SemesterID`),
- KEY `FacultyID` (`FacultyID`)
+ KEY `FacultyID` (`FacultyID`),
+ KEY `CompoundDiscID` (`CompoundDiscID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
GitLab