3 files changed, 24 insertions, 7 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 1912a862..8254eb20 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
@@ -68,10 +68,10 @@ CREATE TABLE `telephely` (
 
 CREATE TABLE `szulo` (
   `szuloId` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `nevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+  `nevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
   `csaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
   `utonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
-  `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+  `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
   `szuleteskoriCsaladinev` varchar(32) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
   `szuleteskoriUtonev` varchar(32) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
   `nem` enum('fiú','lány') COLLATE utf8_hungarian_ci DEFAULT NULL,
@@ -102,10 +102,10 @@ CREATE TABLE `diak` (
   `adoazonosito` bigint(10) unsigned zerofill DEFAULT NULL,
   `szemelyiIgazolvanySzam` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
   `tartozkodasiOkiratSzam` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
-  `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+  `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
   `viseltCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
   `viseltUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
-  `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+  `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
   `szuleteskoriCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
   `szuleteskoriUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
   `szuletesiHely` varchar(32) COLLATE utf8_hungarian_ci DEFAULT NULL,
@@ -263,7 +263,7 @@ CREATE TABLE `tanar` (
   `oId` bigint(20) unsigned DEFAULT NULL,
   `beDt` date DEFAULT NULL,
   `kiDt` date DEFAULT NULL,
-  `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
   `viseltCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
   `viseltUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
   `szuletesiHely` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
@@ -271,7 +271,7 @@ CREATE TABLE `tanar` (
   `dn` varchar(128) COLLATE utf8_hungarian_ci DEFAULT NULL,
   `szuleteskoriUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
   `szuleteskoriCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
-  `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '',
+  `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '',
   `hetiMunkaora` decimal(3,1) DEFAULT '0.0',
   `NEKAzonosito` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
   `statusz` enum('határozatlan idejű','határozott idejű','tartósan távol','jogviszonya lezárva','külső óraadó') COLLATE utf8_hungarian_ci DEFAULT 'határozatlan idejű',
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index ee67738f..44f34c74 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4681
+4683
diff --git a/mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql
new file mode 100644
index 00000000..121f2c88
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql
@@ -0,0 +1,17 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4682 $$
+
+CREATE PROCEDURE upgrade_database_4682()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+ALTER TABLE `tanar` MODIFY `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `tanar` MODIFY `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `szulo` MODIFY `nevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `szulo` MODIFY `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `diak` MODIFY `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+ALTER TABLE `diak` MODIFY `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '';
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4682();