[Mapbender-commits] r7550 - in branches/2.7/resources/db: . pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: kmq
Date: 2011-02-10 03:08:15 -0800 (Thu, 10 Feb 2011)
New Revision: 7550

Modified:
   branches/2.7/resources/db/install.sh
   branches/2.7/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql
   branches/2.7/resources/db/update.bat
   branches/2.7/resources/db/update.sh
Log:
update to install/update scripts merged from trunk

Modified: branches/2.7/resources/db/install.sh
===================================================================
--- branches/2.7/resources/db/install.sh	2011-02-10 11:03:54 UTC (rev 7549)
+++ branches/2.7/resources/db/install.sh	2011-02-10 11:08:15 UTC (rev 7550)
@@ -137,7 +137,7 @@
       pgsql/$DBENCODING/update/update_2.6_to_2.6.1_pgsql_$DBENCODING.sql \
       pgsql/$DBENCODING/update/update_2.6.1_to_2.6.2_pgsql_$DBENCODING.sql \
       pgsql/$DBENCODING/update/update_2.6.2_to_2.7rc1_pgsql_$DBENCODING.sql \
-      pgsql/$DBENCODING/update/update_2.7rc1_to_2.7rc2_pgsql_$DBENCODING.sql \
+      pgsql/$DBENCODING/update/update_2.7rc_to_2.7rc2_pgsql_$DBENCODING.sql \
       pgsql/pgsql_serial_set_sequences_2.7.sql \
 	> _install.sql
     echo "inserting data (this might take a while longer)"


Property changes on: branches/2.7/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql:4021-4487
   + /branches/kmq_dev/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql:4021-4487
/trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql:7549

Modified: branches/2.7/resources/db/update.bat
===================================================================
--- branches/2.7/resources/db/update.bat	2011-02-10 11:03:54 UTC (rev 7549)
+++ branches/2.7/resources/db/update.bat	2011-02-10 11:08:15 UTC (rev 7550)
@@ -110,8 +110,10 @@
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6.2_to_2.7rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
 echo   update to 2.7rc2
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.7rc1_to_2.7rc2_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
-echo   update sequences
+echo   update to 2.7
 psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/pgsql_serial_set_sequences_2.7.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
+
+
 goto END:
 
 :PGNOTFOUND

Modified: branches/2.7/resources/db/update.sh
===================================================================
--- branches/2.7/resources/db/update.sh	2011-02-10 11:03:54 UTC (rev 7549)
+++ branches/2.7/resources/db/update.sh	2011-02-10 11:08:15 UTC (rev 7550)
@@ -99,11 +99,11 @@
 	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.6.1_to_2.6.2_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
 	echo "update to 2.7rc1"
 	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.6.2_to_2.7rc1_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
-	echo "update to 2.7rc2"
+    echo "update to 2.7rc2"
 	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.7rc1_to_2.7rc2_pgsql_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
-     
     echo "update sequences"
     psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/pgsql_serial_set_sequences_2.7.sql $DBNAME >> log_update.txt 2>> err_update.txt
+
 }
 
 #magic starts here