[Hejes-devel] [982] added new dbhelyesblog dump; moved db-related targets from trunk/ install/Makefile to trunk/misc/dbdict/Makefile

[hejes-devel at nytud.hu]

Revision: 982
Author:   mihaltz
Date:     2013-10-09 00:06:25 +0200 (Wed, 09 Oct 2013)
Log Message:
-----------
added new dbhelyesblog dump; moved db-related targets from trunk/install/Makefile to trunk/misc/dbdict/Makefile

Modified Paths:
--------------
    trunk/install/Makefile
    trunk/misc/dbblog/dump_dbhelyesblog.sql.zip
    trunk/misc/dbdict/Makefile

Added Paths:
-----------
    trunk/misc/dbdict/create_dbdict.sql
    trunk/misc/dbdict/create_dbdict_user.sql
    trunk/misc/dbdict/dump_dbdict.sql.zip

Removed Paths:
-------------
    trunk/install/create_dbdict.sql
    trunk/install/create_dbdict_user.sql
    trunk/install/dump_dbdict.sql.zip
    trunk/misc/dbdict/dbdict_create_database.sql

Modified: trunk/install/Makefile
===================================================================
--- trunk/install/Makefile	2013-10-08 15:37:39 UTC (rev 981)
+++ trunk/install/Makefile	2013-10-08 22:06:25 UTC (rev 982)
@@ -3,31 +3,8 @@
 all:
 	
 
-# Dump the dbdict database on this local machine to sql files
-dump_db:
-	mysqldump -u dbdicter --password=dbdicter123 dbdict > dump_dbdict.sql
-	zip dump_dbdict.sql.zip dump_dbdict.sql
-	echo "DROP DATABASE IF EXISTS dbdict" > create_dbdict.sql.tmp
-	echo "SHOW CREATE DATABASE dbdict;" | mysql --skip-column-names --batch -u dbdicter --password=dbdicter123 dbdict | cut -f 2- >> create_dbdict.sql.tmp
-	echo "DROP USER dbdicter" > create_dbdict_user.sql.tmp
-	echo "CREATE USER 'dbdicter'@'localhost' IDENTIFIED BY PASSWORD '*93AAB36C15B9F354CE87A71D52E763A83B1E666D';" >> create_dbdict_user.sql.tmp
-	echo "show grants for dbdicter;" | mysql --skip-column-names --batch -u dbdicter --password=dbdicter123 dbdict | cut -f 2- >> create_dbdict_user.sql.tmp
-	sed "s/$$/;/" create_dbdict.sql.tmp > create_dbdict.sql
-	sed "s/$$/;/" create_dbdict_user.sql.tmp > create_dbdict_user.sql
-	rm ./create_dbdict.sql.tmp
-	rm ./create_dbdict_user.sql.tmp
+# Note: database dump/restore targets were moved to ../misc/dbdict/Makefile
 
-# Drop, re-create and import the database to this localhost's MySQL server from sql files in this directory (see dump_db)
-restore_db:
-	unzip -o dump_dbdict.sql.zip
-	mysql -u root -p < create_dbdict.sql
-#	mysql -u root -p < create_dbdict_user.sql
-	mysql -u root -p dbdict < dump_dbdict.sql
-
-# Test if DB was set up correctly
-test_db:
-	echo "SELECT * FROM sugg_types WHERE actual='gólya';" | mysql -u dbdicter --password=dbdicter123 dbdict
-
 # Install pyhypen
 install_pyhyphen:
 	-unzip -o PyHyphen-1.0beta1.zip ; \

Deleted: trunk/install/create_dbdict.sql
===================================================================
--- trunk/install/create_dbdict.sql	2013-10-08 15:37:39 UTC (rev 981)
+++ trunk/install/create_dbdict.sql	2013-10-08 22:06:25 UTC (rev 982)
@@ -1,2 +0,0 @@
-DROP DATABASE IF EXISTS dbdict;
-CREATE DATABASE `dbdict` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_hungarian_ci */;

Deleted: trunk/install/create_dbdict_user.sql
===================================================================
--- trunk/install/create_dbdict_user.sql	2013-10-08 15:37:39 UTC (rev 981)
+++ trunk/install/create_dbdict_user.sql	2013-10-08 22:06:25 UTC (rev 982)
@@ -1,4 +0,0 @@
-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'@'%';

Deleted: trunk/install/dump_dbdict.sql.zip
===================================================================
(Binary files differ)

Modified: trunk/misc/dbblog/dump_dbhelyesblog.sql.zip
===================================================================
(Binary files differ)

Modified: trunk/misc/dbdict/Makefile
===================================================================
--- trunk/misc/dbdict/Makefile	2013-10-08 15:37:39 UTC (rev 981)
+++ trunk/misc/dbdict/Makefile	2013-10-08 22:06:25 UTC (rev 982)
@@ -4,6 +4,37 @@
 
 all:
 
+# Dump the dbdict database on this local machine to sql files:
+# create_dbdict.sql (=create database), create_dbdict_user.sql (=create user), dump_dbdict.sql (=drop tables + create tables + inserts)
+# + dbdict_create_tables.sql (=create tables) via target dump_create_tables
+dump_db: dump_create_tables
+	mysqldump -u dbdicter --password=dbdicter123 dbdict > dump_dbdict.sql
+	zip dump_dbdict.sql.zip dump_dbdict.sql
+	echo "DROP DATABASE IF EXISTS dbdict" > create_dbdict.sql.tmp
+	echo "SHOW CREATE DATABASE dbdict;" | mysql --skip-column-names --batch -u dbdicter --password=dbdicter123 dbdict | cut -f 2- >> create_dbdict.sql.tmp
+	echo "DROP USER dbdicter" > create_dbdict_user.sql.tmp
+	echo "CREATE USER 'dbdicter'@'localhost' IDENTIFIED BY PASSWORD '*93AAB36C15B9F354CE87A71D52E763A83B1E666D';" >> create_dbdict_user.sql.tmp
+	echo "show grants for dbdicter;" | mysql --skip-column-names --batch -u dbdicter --password=dbdicter123 dbdict | cut -f 2- >> create_dbdict_user.sql.tmp
+	sed "s/$$/;/" create_dbdict.sql.tmp > create_dbdict.sql
+	sed "s/$$/;/" create_dbdict_user.sql.tmp > create_dbdict_user.sql
+	rm ./create_dbdict.sql.tmp
+	rm ./create_dbdict_user.sql.tmp
+
+# Drop, re-create and import the database to this localhost's MySQL server from sql files in this directory (see dump_db)
+restore_db:
+	unzip -o dump_dbdict.sql.zip
+	mysql -u root -p < create_dbdict.sql
+#	mysql -u root -p < create_dbdict_user.sql
+	mysql -u root -p dbdict < dump_dbdict.sql
+
+# Test if DB was set up correctly
+test_db:
+	echo "SELECT * FROM sugg_types WHERE actual='gólya';" | mysql -u dbdicter --password=dbdicter123 dbdict
+
+# 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
+
 # ------------------------------------------------------------------
 # Do the following steps to re-build the MySQL database from sources
 # Note: if you added altered the DB structure since the last time this script was run, first do make dump_create_tables
@@ -16,7 +47,7 @@
 
 # 2. create DB
 create_db:
-	mysql -u dbdicter --password=dbdicter123 < dbdict_create_database.sql
+	mysql -u dbdicter --password=dbdicter123 < create_dbdict.sql
 
 # 3. create tables
 create_tables:
@@ -65,13 +96,8 @@
 # (End MySQL DB rebuild steps)
 # ----------------------------
 
-
 # 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
-
 reset_testdb:
 	echo "DROP database if exists dbdict_test;" | mysql -u root -p
 	mysql -u root -p < dbdict_test_create_database.sql

Copied: trunk/misc/dbdict/create_dbdict.sql (from rev 981, trunk/install/create_dbdict.sql)
===================================================================
--- trunk/misc/dbdict/create_dbdict.sql	                        (rev 0)
+++ trunk/misc/dbdict/create_dbdict.sql	2013-10-08 22:06:25 UTC (rev 982)
@@ -0,0 +1,2 @@
+DROP DATABASE IF EXISTS dbdict;
+CREATE DATABASE `dbdict` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_hungarian_ci */;

Copied: trunk/misc/dbdict/create_dbdict_user.sql (from rev 981, trunk/install/create_dbdict_user.sql)
===================================================================
--- trunk/misc/dbdict/create_dbdict_user.sql	                        (rev 0)
+++ trunk/misc/dbdict/create_dbdict_user.sql	2013-10-08 22:06:25 UTC (rev 982)
@@ -0,0 +1,4 @@
+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'@'%';

Deleted: trunk/misc/dbdict/dbdict_create_database.sql
===================================================================
--- trunk/misc/dbdict/dbdict_create_database.sql	2013-10-08 15:37:39 UTC (rev 981)
+++ trunk/misc/dbdict/dbdict_create_database.sql	2013-10-08 22:06:25 UTC (rev 982)
@@ -1 +0,0 @@
-CREATE DATABASE `dbdict` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_hungarian_ci */

Copied: trunk/misc/dbdict/dump_dbdict.sql.zip (from rev 981, trunk/install/dump_dbdict.sql.zip)
===================================================================
(Binary files differ)