[Mapbender-commits] r4319 - branches/2.6/resources/db
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Jul 7 15:44:48 EDT 2009
Author: tbaschetti
Date: 2009-07-07 15:44:47 -0400 (Tue, 07 Jul 2009)
New Revision: 4319
Modified:
branches/2.6/resources/db/install_2.6.bat
branches/2.6/resources/db/install_2.6.sh
Log:
added Options for host and port
Modified: branches/2.6/resources/db/install_2.6.bat
===================================================================
--- branches/2.6/resources/db/install_2.6.bat 2009-07-07 14:38:47 UTC (rev 4318)
+++ branches/2.6/resources/db/install_2.6.bat 2009-07-07 19:44:47 UTC (rev 4319)
@@ -1,5 +1,4 @@
@echo off
-rem $id: $
REM Script to install Mapbender 2.6 database
REM
setlocal
@@ -62,8 +61,18 @@
:DB_ISO
IF %USEDBENC%x==x set USEDBENC=ISO-8859-1
+echo.
+set /p DBHOST="Database host (localhost if running on local maschine):"
+echo.
+
echo.
+set /p DBPORT="Database port (e.g. 5432 for postgres, 3306 for mysql):"
+echo.
+
+
+
+echo.
set /p DBUSER="Database user:"
echo.
@@ -78,7 +87,9 @@
echo.
echo Your Choices:
echo Databasetype: %DBTYPE% - %USEDBTYPE%
-echo Encoding: %DBENC% - %USEDBENC%
+echo Encoding: %DBENC% - %USEDBENC%
+echo Database Host: %DBHOST%
+echo Database Port: %DBPORT%
echo Database Name: %DBNAME%
echo Database User: %DBUSER%
echo Database Password: %DBPASSWORD% (not shown)
@@ -101,46 +112,54 @@
set /p DBTEMPLATE="database template to use (just hit return for default):"
IF %DBTEMPLATE%x==x set DBTEMPLATE=template0
+IF %DBHOST%x==x set DBHOST=localhost
+IF %DBPORT%x==x set DBPORT=5432
echo creating db
-createdb -U %DBUSER% -E %USEDBENC% -T %DBTEMPLATE% %DBNAME% "Mapbender Database Version 2.6"
+createdb -U %DBUSER% -E %USEDBENC% -h %DBHOST% -p %DBPORT% -T %DBTEMPLATE% %DBNAME% "Mapbender Database Version 2.6"
echo creating schema
-psql -U %DBUSER% -f pgsql/pgsql_schema_2.5.sql %DBNAME% 1>log_schema.txt 2> err_schema.txt
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/pgsql_schema_2.5.sql %DBNAME% 1>log_schema.txt 2> err_schema.txt
echo importing data
-psql -U %DBUSER% -f pgsql/%USEDBENC%/pgsql_data_2.5.sql %DBNAME% 1>log_data.txt 2> err_data.txt
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/pgsql_data_2.5.sql %DBNAME% 1>log_data.txt 2> err_data.txt
echo setting sequences
-psql -U %DBUSER% -f pgsql/pgsql_serial_set_sequences_2.5.sql %DBNAME% 1>log_sequences.txt 2> err_sequences.txt
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/pgsql_serial_set_sequences_2.5.sql %DBNAME% 1>log_sequences.txt 2> err_sequences.txt
echo performing updates
echo to 2.5.1rc1
-psql -U %DBUSER% -f pgsql/%USEDBENC%/update/update_2.5_to_2.5.1rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>log_update.txt 2> err_update.txt
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.5_to_2.5.1rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>log_update.txt 2> err_update.txt
echo to 2.5.1
-psql -U %DBUSER% -f pgsql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
echo to 2.6rc1
-psql -U %DBUSER% -f pgsql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
echo to 2.6rc2
-psql -U %DBUSER% -f pgsql/%USEDBENC%/update/update_2.6rc1_to_2.6rc2_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6rc1_to_2.6rc2_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
goto END
-:INSTMYSQL
+:INSTMYSQL
+# Update to 2.6 is missing...
+echo Sorry, Mysql is not fully supported, exiting...
+goto END:
+IF %DBHOST%x==x set DBHOST=localhost
+IF %DBPORT%x==x set DBPORT=3306
+
mysql --version 2> nul 1> nul
if not %ERRORLEVEL% == 0 goto MYSQLNOTFOUND
echo creating database
-if %USEDBENC% == ISO-8859-1 mysql -u %DBUSER% -e "create database %DBNAME% character set latin1 COLLATE latin1_german1_ci;" -p
-if %USEDBENC% == UTF-8 mysql -e "create database %DBNAME% character set utf8 COLLATE utf8_general__ci;" -p
+if %USEDBENC% == ISO-8859-1 mysql -h %DBHOST% -P %DBPORT% -u %DBUSER% -e "create database %DBNAME% character set latin1 COLLATE latin1_german1_ci;" -p
+if %USEDBENC% == UTF-8 mysql -h %DBHOST% -P %DBPORT% -e "create database %DBNAME% character set utf8 COLLATE utf8_general__ci;" -p
echo creating schema
-mysql %DBNAME% -p -u %DBUSER% < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
echo loading data
-mysql %DBNAME% -p -u %DBUSER% < mysql/%USEDBENC%/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
echo update to 2.5.1rc1
-mysql %DBNAME% -p -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5_to_2.5.1rc1_mysql_%USEDBENC%.sql > log_update.txt 2> err_update.txt
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5_to_2.5.1rc1_mysql_%USEDBENC%.sql > log_update.txt 2> err_update.txt
echo update to 2.5.1
-mysql %DBNAME% -p -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
rem echo update to 2.6
-rem mysql %DBNAME% -p -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
+rem mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
rem update .po files
Modified: branches/2.6/resources/db/install_2.6.sh
===================================================================
--- branches/2.6/resources/db/install_2.6.sh 2009-07-07 14:38:47 UTC (rev 4318)
+++ branches/2.6/resources/db/install_2.6.sh 2009-07-07 19:44:47 UTC (rev 4319)
@@ -78,7 +78,16 @@
fi
echo ""
- echo "database User?"
+ echo "database host (e.g. localhost)?"
+ read DBHOST
+
+ echo ""
+ echo "database port (e.g. 5432 for postgres, 3306 for mysql)?"
+ read DBPORT
+
+
+ echo ""
+ echo "database user?"
read DBUSER
#using a password via commandline oder as shell var could lead to security problems, so we don't do it
@@ -100,6 +109,8 @@
then
echo "postgres template:" $DBTEMPLATE
fi
+ echo "db host:" $DBHOST
+ echo "db port:" $DBPORT
echo "dbname:" $DBNAME
echo "user:" $DBUSER
echo ""
@@ -125,15 +136,15 @@
else
mysql -e "create database $DBNAME CHARACTER SET utf8 COLLATE utf8_general_ci;" -p$DBPASSWORD
fi
- mysql $DBNAME -p$DBPASSWORD < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
- mysql $DBNAME -p$DBPASSWORD < mysql/$DBENCODING/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
- mysql $DBNAME -p$DBPASSWORD < mysql/$DBENCODING/update/update_2.5_to_2.5.1rc1_mysql_$DBENCODING.sql > log_update.txt 2> err_update.txt
- mysql $DBNAME -p$DBPASSWORD < mysql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
- mysql $DBNAME -p$DBPASSWORD < mysql/$DBENCODING/update/update_2.5.1_to_2.6rc1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
+ mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
+ mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
+ mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5_to_2.5.1rc1_mysql_$DBENCODING.sql > log_update.txt 2> err_update.txt
+ mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
+ mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5.1_to_2.6rc1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
}
-#Datenbank erzeugen
+#Create Database (Postgres)
function create_pgsql_db(){
which psql createdb > /dev/null
if [ $? -ne 0 ]
@@ -145,21 +156,21 @@
fi
echo "Your password will be asked several times, this is normal (unless .pgpass is used)"
echo "creating database"
- createdb -U $DBUSER -E $DBENCODING $DBNAME -T $DBTEMPLATE
+ createdb -U $DBUSER -h $DBHOST -p $DBPORT -E $DBENCODING $DBNAME -T $DBTEMPLATE
echo "creating schema"
- psql -U $DBUSER -f pgsql/pgsql_schema_2.5.sql $DBNAME > log_schema.txt 2> err_schema.txt
+ psql -U $DBUSER -h $DBHOST -p $DBPORT -f pgsql/pgsql_schema_2.5.sql $DBNAME > log_schema.txt 2> err_schema.txt
echo "loading data"
- psql -U $DBUSER -f pgsql/$DBENCODING/pgsql_data_2.5.sql $DBNAME > log_data.txt 2> err_data.txt
+ psql -U $DBUSER -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/pgsql_data_2.5.sql $DBNAME > log_data.txt 2> err_data.txt
echo "setting sequences"
- psql -U $DBUSER -f pgsql/pgsql_serial_set_sequences_2.5.sql $DBNAME > log_sequences.txt 2> err_squences.txt
+ psql -U $DBUSER -h $DBHOST -p $DBPORT -f pgsql/pgsql_serial_set_sequences_2.5.sql $DBNAME > log_sequences.txt 2> err_squences.txt
echo "update to 2.5.1rc1"
- psql -U $DBUSER -f pgsql/$DBENCODING/update/update_2.5_to_2.5.1rc1_pgsql_$DBENCODING.sql $DBNAME > log_update.txt 2> err_update.txt
+ psql -U $DBUSER -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.5_to_2.5.1rc1_pgsql_$DBENCODING.sql $DBNAME > log_update.txt 2> err_update.txt
echo "update to 2.5.1"
- psql -U $DBUSER -f pgsql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
+ psql -U $DBUSER -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
echo "update to 2.6rc1"
- psql -U $DBUSER -f pgsql/$DBENCODING/update/update_2.5.1_to_2.6rc1_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
+ psql -U $DBUSER -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.5.1_to_2.6rc1_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
echo "update to 2.6rc2"
- psql -U $DBUSER -f pgsql/$DBENCODING/update/update_2.6rc1_to_2.6rc2_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
+ psql -U $DBUSER -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.6rc1_to_2.6rc2_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
}
More information about the Mapbender_commits
mailing list