appdb/ tables/create_tables unit_test/run_test ...

[WineHQ]

ChangeSet ID:	31275
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	wineowner(a)winehq.org	2007/07/24 16:49:23

Modified files:
	tables         : create_tables 
	unit_test      : run_tests 
Added files:
	tables         : create_apidb_base.sql create_user.sql 

Log message:
	Chris Morgan <cmorgan(a)alum.wpi.edu>
	Clean up database creation to create the mysql interface user and grant permissions. Group
	database setup together so the user is prompted for only a couple of times during
	initialization.

Patch: http://cvs.winehq.org/patch.py?id=31275

Old revision  New revision  Changes     Path
 1.10          1.11          +9 -37      appdb/tables/create_tables
 Added         1.1           +0 -0       appdb/tables/create_apidb_base.sql
 Added         1.1           +0 -0       appdb/tables/create_user.sql
 1.1           1.2           +1 -1       appdb/unit_test/run_tests

Index: appdb/tables/create_tables
diff -u -p appdb/tables/create_tables:1.10 appdb/tables/create_tables:1.11
--- appdb/tables/create_tables:1.10	24 Jul 2007 21:49:23 -0000
+++ appdb/tables/create_tables	24 Jul 2007 21:49:23 -0000
@@ -1,40 +1,12 @@
 #! /bin/sh
 
-echo Creating appdb tables
-mysql -p -u root < appdb_tables.sql
+echo Create the base user
+mysql -p -u root < create_user.sql
 
-echo Creating preferences list
-mysql -p -u root < prefs_list.sql
-
-echo Creating user list
-mysql -p -u root < user_list.sql
-
-echo Creating user preferences
-mysql -p -u root < user_prefs.sql
-
-echo Creating user privileges
-mysql -p -u root < user_privs.sql
-
-echo Creating session table
-mysql -p -u root < session_list.sql
-
-echo Adding categories
-mysql -p -u root < app_category.sql
-
-echo Adding maintainers
-mysql -p -u root < maintainers.sql
-
-echo Adding bug links
-mysql -p -u root < buglinks.sql
-
-echo Adding monitors
-mysql -p -u root < monitors.sql
-
-echo Creating error logging tables
-mysql -p -u root < error_log.sql
-
-echo Adding distributions
-mysql -p -u root < distributions.sql
-
-echo Adding test data tables
-mysql -p -u root < testResults.sql
+echo Create the apidb database, and tables
+cat create_apidb_base.sql appdb_tables.sql \
+    prefs_list.sql user_list.sql user_prefs.sql \
+    user_privs.sql session_list.sql app_category.sql \
+    maintainers.sql buglinks.sql monitors.sql \
+    error_log.sql distributions.sql testResults.sql \
+ | mysql -p -u root
Index: appdb/tables/create_apidb_base.sql
diff -u -p /dev/null appdb/tables/create_apidb_base.sql:1.1
--- /dev/null	24 Jul 2007 21:49:23 -0000
+++ appdb/tables/create_apidb_base.sql	24 Jul 2007 21:49:23 -0000
@@ -0,0 +1,2 @@
+create database if not exists apidb;
+grant all on apidb.* to wineowner;
Index: appdb/tables/create_user.sql
diff -u -p /dev/null appdb/tables/create_user.sql:1.1
--- /dev/null	24 Jul 2007 21:49:23 -0000
+++ appdb/tables/create_user.sql	24 Jul 2007 21:49:23 -0000
@@ -0,0 +1,2 @@
+create user wineowner identified by 'lemonade';
+
Index: appdb/unit_test/run_tests
diff -u -p appdb/unit_test/run_tests:1.1 appdb/unit_test/run_tests:1.2
--- appdb/unit_test/run_tests:1.1	24 Jul 2007 21:49:23 -0000
+++ appdb/unit_test/run_tests	24 Jul 2007 21:49:23 -0000
@@ -1 +1 @@
-php -f run_tests.php
+php -dmagic_quotes_gpc=0 -f run_tests.php