You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tdk-dev@turbine.apache.org by Eric Dobbs <er...@dobbse.net> on 2001/03/29 02:40:53 UTC
[PATCH] create-database scripts
Hi All.
Patches follow to fix a bug when building TDK-1.1a12 peer app on
Windows. Here's what happens in the create-database task of
build-project init:
>build-project init
[snip]
create-database:
D:\tdk\webapps\modelx\WEB-INF\src\sql\create-database.bat
[exec]
[exec] D:\tdk\webapps\modelx\WEB-INF\build>REM - Batch file to
automatically create
[exec]
[exec] D:\tdk\webapps\modelx\WEB-INF\build>REM - MySQL database
from Windows machines :-)
[exec]
[exec] D:\tdk\webapps\modelx\WEB-INF\build>mysqladmin -u turbine
-p-p turbine -h$databaseHost --force drop modelx
[exec] mysqladmin: connect to server at 'localhost' failed
[exec] error: 'Access denied for user: 'turbine@localhost' (Using
password: YES)'
[exec]
[exec] D:\tdk\webapps\modelx\WEB-INF\build>mysqladmin -u turbine
-p-p turbine -h$databaseHost --force create modelx
[exec] mysqladmin: connect to server at 'localhost' failed
[exec] error: 'Access denied for user: 'turbine@localhost' (Using
password: YES)'
[exec] Result: 1
Notice that the -p occurs twice in the mysqladmin lines.
The patches below fix that bug for windows. It wasn't a
problem in the unix script. While I was there I also
added code to skip the host directive if it doesn't exist.
-Eric
Unix Version:
--- share\conf\torque\templates\sql\db-init\mysql\unix.vm.orig Thu Mar
29 00:55:38 2001
+++ share\conf\torque\templates\sql\db-init\mysql\unix.vm Thu Mar
29 00:23:32 2001
@@ -12,5 +12,11 @@
#set ($password = "")
#end
-echo y | mysqladmin $user $password -h$databaseHost drop $project
-echo y | mysqladmin $user $password -h$databaseHost create $project
+#if ($databaseHost)
+ #set ($host = "-h $databaseHost")
+#else
+ #set ($host = "")
+#end
+
+echo y | mysqladmin $user $password $host drop $project
+echo y | mysqladmin $user $password $host create $project
Windows Version
--- share\conf\torque\templates\sql\db-init\mysql\windows.vm.orig Thu
Mar 29 00:55:38 2001
+++ share\conf\torque\templates\sql\db-init\mysql\windows.vm Thu Mar
29 00:24:04 2001
@@ -13,5 +13,11 @@
#set ($password = "")
#end
-mysqladmin $!user -p$!password -h$databaseHost --force drop $project
-mysqladmin $!user -p$!password -h$databaseHost --force create $project
+#if ($databaseHost)
+ #set ($host = "-h $databaseHost")
+#else
+ #set ($host = "")
+#end
+
+mysqladmin $!user $!password $!host --force drop $project
+mysqladmin $!user $!password $!host --force create $project
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-tdk-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-tdk-dev-help@jakarta.apache.org
Re: [PATCH] create-database scripts
Posted by Eric Dobbs <er...@dobbse.net>.
Whoops. Little too quick to send those. Also need to
remove some spaces. Sorry about the redundant post.
The windows one is tested and the build-project init
completes successfully (on W2K). I haven't tested the
unix patch.
-Eric
Unix Version:
--- share\conf\torque\templates\sql\db-init\mysql\unix.vm.orig Thu Mar
29 00:55:38 2001
+++ share\conf\torque\templates\sql\db-init\mysql\unix.vm Thu Mar
29 00:51:17 2001
@@ -1,16 +1,22 @@
#!/bin/sh
#if ($databaseUser)
- #set ($user = "-u $databaseUser")
+ #set ($user = "-u$databaseUser")
#else
#set ($user = "")
#end
#if ($databasePassword)
- #set ($password = "-p $databasePassword")
+ #set ($password = "-p$databasePassword")
#else
#set ($password = "")
#end
-echo y | mysqladmin $user $password -h$databaseHost drop $project
-echo y | mysqladmin $user $password -h$databaseHost create $project
+#if ($databaseHost)
+ #set ($host = "-h$databaseHost")
+#else
+ #set ($host = "")
+#end
+
+echo y | mysqladmin $user $password $host drop $project
+echo y | mysqladmin $user $password $host create $project
Windows Version:
--- share\conf\torque\templates\sql\db-init\mysql\windows.vm.orig
Thu Mar 29 00:55:38 2001
+++ share\conf\torque\templates\sql\db-init\mysql\windows.vm Thu Mar
29 00:51:18 2001
@@ -2,16 +2,22 @@
REM - MySQL database from Windows machines :-)
#if ($databaseUser)
- #set ($user = "-u $databaseUser")
+ #set ($user = "-u$databaseUser")
#else
#set ($user = "")
#end
#if ($databasePassword)
- #set ($password = "-p $databasePassword")
+ #set ($password = "-p$databasePassword")
#else
#set ($password = "")
#end
-mysqladmin $!user -p$!password -h$databaseHost --force drop $project
-mysqladmin $!user -p$!password -h$databaseHost --force create $project
+#if ($databaseHost)
+ #set ($host = "-h$databaseHost")
+#else
+ #set ($host = "")
+#end
+
+mysqladmin $!user $!password $!host --force drop $project
+mysqladmin $!user $!password $!host --force create $project
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-tdk-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-tdk-dev-help@jakarta.apache.org