[Hejes-devel] [966] created new DB dump from rebuilt DB; DB: created new column alt_type_themcat__others.uralkodohazak; made dbdict/ Makefile less painful to use
hejes-devel at nytud.hu
hejes-devel at nytud.hu
Tue Oct 8 15:45:41 CEST 2013
Revision: 966
Author: mihaltz
Date: 2013-10-08 15:45:40 +0200 (Tue, 08 Oct 2013)
Log Message:
-----------
created new DB dump from rebuilt DB; DB: created new column alt_type_themcat__others.uralkodohazak; made dbdict/Makefile less painful to use
Modified Paths:
--------------
trunk/install/create_dbdict_user.sql
trunk/install/dump_dbdict.sql.zip
trunk/misc/dbdict/Makefile
trunk/misc/dbdict/dbdict_create_tables.sql
trunk/misc/dbdict/dbdict_reset_auto_increments.sql
trunk/misc/dbdict/fsv.info.txt
trunk/misc/dbdict/fsv.log
Modified: trunk/install/create_dbdict_user.sql
===================================================================
--- trunk/install/create_dbdict_user.sql 2013-10-04 16:50:40 UTC (rev 965)
+++ trunk/install/create_dbdict_user.sql 2013-10-08 13:45:40 UTC (rev 966)
@@ -1,4 +1,4 @@
-#DROP USER dbdicter;
+DROP USER dbdicter;
CREATE USER 'dbdicter'@'localhost' IDENTIFIED BY PASSWORD '*93AAB36C15B9F354CE87A71D52E763A83B1E666D';;
GRANT FILE ON *.* TO 'dbdicter'@'%' IDENTIFIED BY PASSWORD '*93AAB36C15B9F354CE87A71D52E763A83B1E666D';
GRANT ALL PRIVILEGES ON `dbdict`.* TO 'dbdicter'@'%';
Modified: trunk/install/dump_dbdict.sql.zip
===================================================================
(Binary files differ)
Modified: trunk/misc/dbdict/Makefile
===================================================================
--- trunk/misc/dbdict/Makefile 2013-10-04 16:50:40 UTC (rev 965)
+++ trunk/misc/dbdict/Makefile 2013-10-08 13:45:40 UTC (rev 966)
@@ -12,21 +12,21 @@
# 1. drop DB
drop_db:
- echo "DROP DATABASE dbdict;" | mysql -u root -p
+ echo "DROP DATABASE dbdict;" | mysql -u dbdicter --password=dbdicter123
# 2. create DB
create_db:
- mysql -u root -p < dbdict_create_database.sql
+ mysql -u dbdicter --password=dbdicter123 < dbdict_create_database.sql
# 3. create tables
create_tables:
- mysql -u root -p dbdict < dbdict_create_tables.sql
+ mysql -u dbdicter --password=dbdicter123 dbdict < dbdict_create_tables.sql
# 4. reset auto_increments
# do this after (re)creating the tables via dbdict_create_tables.sql but before running the data importing scripts (that use INSERT statements), e.g. fsv.pl etc.
reset_auto_increments:
grep 'CREATE TABLE' ./dbdict_create_tables.sql | sed "s/CREATE/ALTER/" | sed -r "s/\(/AUTO_INCREMENT = 1;/" > dbdict_reset_auto_increments.sql
- mysql -u root -p dbdict < dbdict_reset_auto_increments.sql
+ mysql -u dbdicter --password=dbdicter123 dbdict < dbdict_reset_auto_increments.sql
# 5. call data import scripts:
# 5.1. fsv.pl
@@ -68,6 +68,7 @@
# Misc:
+# If you added a new column: run this before rebuild_db!!!
dump_create_tables:
mysqldump -u dbdicter --password=dbdicter123 --no-data dbdict > dbdict_create_tables.sql
Modified: trunk/misc/dbdict/dbdict_create_tables.sql
===================================================================
--- trunk/misc/dbdict/dbdict_create_tables.sql 2013-10-04 16:50:40 UTC (rev 965)
+++ trunk/misc/dbdict/dbdict_create_tables.sql 2013-10-08 13:45:40 UTC (rev 966)
@@ -27,7 +27,7 @@
`actual` varchar(64) COLLATE utf8_hungarian_ci NOT NULL,
PRIMARY KEY (`id`),
KEY `actual` (`actual`)
-) ENGINE=MyISAM AUTO_INCREMENT=350637 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+) ENGINE=MyISAM AUTO_INCREMENT=350874 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -44,7 +44,7 @@
PRIMARY KEY (`id`),
KEY `actual` (`actual`),
KEY `norm` (`norm`)
-) ENGINE=MyISAM AUTO_INCREMENT=350633 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+) ENGINE=MyISAM AUTO_INCREMENT=350874 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -147,7 +147,7 @@
KEY `tulnev_betuszo` (`tulnev_betuszo`),
KEY `morfologiai` (`morfologiai`),
KEY `tagadoszo` (`tagadoszo`)
-) ENGINE=MyISAM AUTO_INCREMENT=350637 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+) ENGINE=MyISAM AUTO_INCREMENT=350777 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -215,7 +215,7 @@
KEY `compound` (`compound`),
KEY `flx` (`flx`),
KEY `igekoto` (`igekoto`)
-) ENGINE=MyISAM AUTO_INCREMENT=314959 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+) ENGINE=MyISAM AUTO_INCREMENT=315018 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -263,7 +263,7 @@
KEY `FNESZ` (`FNESZ`),
KEY `humor` (`humor`),
KEY `vilagatlasz` (`vilagatlasz`)
-) ENGINE=MyISAM AUTO_INCREMENT=314959 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+) ENGINE=MyISAM AUTO_INCREMENT=315018 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -365,6 +365,7 @@
`fonevi_jelzos_szerk_alaptag` tinyint(1) DEFAULT NULL,
`egyhazi_foglalkozas` tinyint(1) DEFAULT NULL,
`allatok` tinyint(1) DEFAULT NULL,
+ `uralkodohazak` tinyint(1) DEFAULT NULL,
PRIMARY KEY (`tid`),
KEY `tarolok` (`tarolok`),
KEY `foglalkozasok` (`foglalkozasok`),
@@ -423,7 +424,7 @@
PRIMARY KEY (`id`),
KEY `actual` (`actual`),
KEY `norm` (`norm`)
-) ENGINE=MyISAM AUTO_INCREMENT=125300 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+) ENGINE=MyISAM AUTO_INCREMENT=125309 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -438,7 +439,7 @@
`actual` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
PRIMARY KEY (`id`),
KEY `actual` (`actual`)
-) ENGINE=MyISAM AUTO_INCREMENT=422 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+) ENGINE=MyISAM AUTO_INCREMENT=856 DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -471,6 +472,21 @@
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `uralkodohazak_import`
+--
+
+DROP TABLE IF EXISTS `uralkodohazak_import`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `uralkodohazak_import` (
+ `actual` varchar(64) COLLATE utf8_hungarian_ci NOT NULL,
+ `actual_tid` int(11) DEFAULT NULL,
+ KEY `actual_tid` (`actual_tid`),
+ KEY `actual` (`actual`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -481,4 +497,4 @@
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2013-04-30 2:13:19
+-- Dump completed on 2013-10-08 15:20:24
Modified: trunk/misc/dbdict/dbdict_reset_auto_increments.sql
===================================================================
--- trunk/misc/dbdict/dbdict_reset_auto_increments.sql 2013-10-04 16:50:40 UTC (rev 965)
+++ trunk/misc/dbdict/dbdict_reset_auto_increments.sql 2013-10-08 13:45:40 UTC (rev 966)
@@ -17,3 +17,4 @@
ALTER TABLE `sugg_types` AUTO_INCREMENT = 1;
ALTER TABLE `sugg_types_paronyms` AUTO_INCREMENT = 1;
ALTER TABLE `sugg_types_slang` AUTO_INCREMENT = 1;
+ALTER TABLE `uralkodohazak_import` AUTO_INCREMENT = 1;
Modified: trunk/misc/dbdict/fsv.info.txt
===================================================================
--- trunk/misc/dbdict/fsv.info.txt 2013-10-04 16:50:40 UTC (rev 965)
+++ trunk/misc/dbdict/fsv.info.txt 2013-10-08 13:45:40 UTC (rev 966)
@@ -79,7 +79,7 @@
Ivan_Zsofi toismetles_egybe 3 DatasetList
Ivan_Zsofi toismetles_kotojel 14 DatasetList
Ivan_Zsofi jelentessurito 213 DatasetList
-Ivan_Zsofi fekete_feher_kis_nagy_egybe 466 DatasetList
+Ivan_Zsofi fekete_feher_kis_nagy_egybe 467 DatasetList
Ivan_Zsofi fekete_feher_kis_nagy_kulon 330 DatasetList
Ivan_Zsofi minosegjelzos_hagyomany 24 DatasetList
Ivan_Zsofi befejezett_melleknevi_igenev 6 DatasetList
@@ -102,6 +102,7 @@
Ivan_Zsofi egyhazi_foglalkozas 18 DatasetList
Ivan_Zsofi egyhazi_foglalkozas_kivetel 3 DatasetList
Ivan_Zsofi allatok 272 DatasetList
-Ivan_Zsofi ketertelmu 939 DatasetTSV
+Ivan_Zsofi ketertelmu 940 DatasetTSV
Ivan_Zsofi 6_3_kivetel 11 DatasetList
Ivan_Zsofi tulnev_betuszo 261 DatasetList
+Ivan_Zsofi uralkodohazak 158 DatasetList
Modified: trunk/misc/dbdict/fsv.log
===================================================================
--- trunk/misc/dbdict/fsv.log 2013-10-04 16:50:40 UTC (rev 965)
+++ trunk/misc/dbdict/fsv.log 2013-10-08 13:45:40 UTC (rev 966)
@@ -1087,3 +1087,15 @@
Running sql UPDATE `tulnev_betuszo_import` i INNER JOIN `alt_types` t ON t....
Running sql INSERT INTO `alt_types_exceptions` (`tid`, `tulnev_betuszo`) SEL...
Running sql DROP TABLE IF EXISTS `tulnev_betuszo_import`;...
+Ivan_Zsofi/uralkodohazak
+Running sql DROP TABLE IF EXISTS `uralkodohazak_import`;...
+Running sql CREATE TABLE `uralkodohazak_import` ( `actual` varchar(64) colla...
+Running sql LOAD DATA INFILE '/home/projects/helyesiras/resource/dbdict/tmp/...
+Running sql ALTER TABLE `uralkodohazak_import` ADD `actual_tid` int(11) defa...
+Running sql ALTER TABLE `uralkodohazak_import` ADD INDEX (`actual_tid`);...
+Running sql ALTER TABLE `uralkodohazak_import` ADD INDEX (`actual`);...
+Running sql UPDATE `uralkodohazak_import` i INNER JOIN `alt_types` t ON t.`...
+Running sql INSERT INTO `alt_types` (`actual`) ( SELECT `actual` FROM `uralk...
+Running sql UPDATE `uralkodohazak_import` i INNER JOIN `alt_types` t ON t.`...
+Running sql INSERT INTO `alt_types_themcat__others` (`tid`, `uralkodohazak`)...
+Running sql DROP TABLE IF EXISTS `uralkodohazak_import`;...
More information about the Hejes-devel
mailing list