You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/07/10 20:41:39 UTC
svn commit: r555033 -
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
Author: agilliland
Date: Tue Jul 10 11:41:39 2007
New Revision: 555033
URL: http://svn.apache.org/viewvc?view=rev&rev=555033
Log:
fix up database installer so that there is no longer a 3.2 release mentioned.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?view=diff&rev=555033&r1=555032&r2=555033
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java Tue Jul 10 11:41:39 2007
@@ -220,10 +220,6 @@
upgradeTo310(con, runScripts);
dbversion = 310;
}
- if(dbversion < 320) {
- upgradeTo320(con, runScripts);
- dbversion = 320;
- }
if(dbversion < 400) {
upgradeTo400(con, runScripts);
dbversion = 400;
@@ -632,25 +628,33 @@
updateDatabaseVersion(con, 310);
}
-
+
/**
- * Upgrade database for Roller 3.2.0
+ * Upgrade database for Roller 4.0.0
*/
- private void upgradeTo320(Connection con, boolean runScripts) throws StartupException {
+ private void upgradeTo400(Connection con, boolean runScripts) throws StartupException {
- successMessage("Doing upgrade to 320 ...");
+ successMessage("Doing upgrade to 400 ...");
+ // first we need to run upgrade scripts
try {
if (runScripts) {
String handle = getDatabaseHandle(con);
- String scriptPath = handle + "/310-to-320-migration.sql";
+ String scriptPath = handle + "/310-to-400-migration.sql";
successMessage("Running database upgrade script: "+scriptPath);
SQLScriptRunner runner = new SQLScriptRunner(scripts.getDatabaseScript(scriptPath));
runner.runScript(con, true);
messages.addAll(runner.getMessages());
}
-
+ } catch(Exception ex) {
+ errorMessage("Problem upgrading database to version 400", ex);
+ throw new StartupException("Problem upgrading database to version 400", ex);
+ }
+
+
+ // now upgrade hierarchical objects data model
+ try {
successMessage("Populating parentid columns for weblogcategory and folder tables");
// Populate parentid in weblogcategory and folder tables.
@@ -856,28 +860,9 @@
throw new StartupException("Problem upgrading database to version 320", e);
}
- // finally, upgrade db version string to 320
- updateDatabaseVersion(con, 320);
- }
-
-
- /**
- * Upgrade database for Roller 4.0.0
- */
- private void upgradeTo400(Connection con, boolean runScripts) throws StartupException {
-
- successMessage("Doing upgrade to 400 ...");
- try {
- if (runScripts) {
- String handle = getDatabaseHandle(con);
- String scriptPath = handle + "/320-to-400-migration.sql";
- successMessage("Running database upgrade script: "+scriptPath);
- SQLScriptRunner runner = new SQLScriptRunner(scripts.getDatabaseScript(scriptPath));
- runner.runScript(con, true);
- messages.addAll(runner.getMessages());
- }
-
+ // 4.0 changes the planet data model a bit, so we need to clean that up
+ try {
successMessage("Merging planet groups 'all' and 'external'");
// Move all subscriptions in the planet group 'external' to group 'all'