Rev: 4340

2 files changed, 11 insertions, 2 deletions

diff --git a/mayor-orig/update/pre004320-1-intezmeny.sql b/mayor-orig/update/pre004320-1-intezmeny.sql
index 3bae3cfd..d8206983 100644
--- a/mayor-orig/update/pre004320-1-intezmeny.sql
+++ b/mayor-orig/update/pre004320-1-intezmeny.sql
@@ -5,7 +5,8 @@ CREATE PROCEDURE upgrade_database_4320()
 BEGIN
 SET NAMES utf8 COLLATE utf8_hungarian_ci;
 
-IF NOT EXISTS (SELECT * FROM information_schema.statistics WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='diak' AND INDEX_NAME='diak_ibfk_6') THEN
+IF NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS WHERE CONSTRAINT_NAME='diak_ibfk_6') THEN
+    UPDATE diak LEFT JOIN szulo ON (neveloId=szuloId) SET diak.neveloId=NULL WHERE diak.neveloId IS NOT NULL AND szulo.szuloId IS NULL;
     ALTER TABLE diak ADD CONSTRAINT `diak_ibfk_6` FOREIGN KEY (`neveloId`) REFERENCES `szulo` (`szuloId`) ON DELETE SET NULL ON UPDATE SET NULL;
 END IF;
 
@@ -15,7 +16,8 @@ IF NOT EXISTS (
     ALTER TABLE `diak` ADD `beiratoId` int(10) unsigned DEFAULT NULL AFTER neveloId;
 END IF;
 
-IF NOT EXISTS (SELECT * FROM information_schema.statistics WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='diak' AND INDEX_NAME='diak_ibfk_7') THEN
+IF NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS WHERE CONSTRAINT_NAME='diak_ibfk_7') THEN
+    UPDATE diak LEFT JOIN szulo ON (beiratoId=szuloId) SET diak.beiratoId=NULL WHERE diak.beiratoId IS NOT NULL AND szulo.szuloId IS NULL;
     ALTER TABLE diak ADD CONSTRAINT `diak_ibfk_7` FOREIGN KEY (`beiratoId`) REFERENCES `szulo` (`szuloId`) ON DELETE SET NULL ON UPDATE SET NULL;
 END IF;
 
diff --git a/mayor-orig/update/pre004337-1-intezmeny.sql b/mayor-orig/update/pre004337-1-intezmeny.sql
new file mode 100644
index 00000000..4949c0ec
--- /dev/null
+++ b/mayor-orig/update/pre004337-1-intezmeny.sql
@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS `tanarTelephely` (
+  `tanarId` int(10) unsigned NOT NULL,
+  `telephelyId` tinyint(3) unsigned NOT NULL,
+  PRIMARY KEY (`tanarId`,`telephelyId`),
+  KEY `tanarTelephely_ibfk_1` (`tanarId`),
+  CONSTRAINT `tanarTelephely_ibfk_1` FOREIGN KEY (`tanarId`) REFERENCES `tanar` (`tanarId`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;