Rev: 4535rev4535

2 files changed, 14 insertions, 0 deletions

diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
index ad7ad3aa..bc766bbd 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
@@ -949,6 +949,12 @@ CREATE TABLE `diakNyelvvizsga` (
   CONSTRAINT `diakNyelvvizsga_ibfk_2` FOREIGN KEY (`targyId`) REFERENCES `targy` (`targyId`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
 
+CREATE TABLE `cimke` (
+  `cimkeId` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cimkeLeiras` varchar(16) NOT NULL,
+  PRIMARY KEY (`cimkeId`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
  DELIMITER //  
  DROP FUNCTION IF EXISTS diakNaploSorszam //                                                                                                                                                                                            
  CREATE function diakNaploSorszam ( thisDiakId INT, thisTanev INT, thisOsztalyId INT ) returns INT                                                                                                         
diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
index eaf74280..138e8c86 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
@@ -727,6 +727,14 @@ CREATE TABLE `jegyzetTankor` (
   CONSTRAINT `jegyzetTankor_ibfk_2` FOREIGN KEY (`tankorId`) REFERENCES `%DB%`.`tankor` (`tankorId`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
 
+ CREATE TABLE `oraCimke` (
+  `oraId` int(10) unsigned NOT NULL,
+  `cimkeId` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`oraId`,`cimkeId`),
+  CONSTRAINT `oraCimke_ibfk_1` FOREIGN KEY (`oraId`) REFERENCES `ora` (`oraId`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `oraCimke_ibfk_2` FOREIGN KEY (`cimkeId`) REFERENCES `%DB%`.`cimke` (`cimkeId`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
 DROP FUNCTION IF EXISTS getNev;
 DROP FUNCTION IF EXISTS getOraIgTime;
 DROP FUNCTION IF EXISTS getOraTolTime;