Author: snoopdave
Date: Sat Oct 29 13:27:46 2011
New Revision: 1194887
URL: http://svn.apache.org/viewvc?rev=1194887&view=rev
Log:
Complete 5.0 to 5.1 migration script now in place
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
roller/trunk/weblogger-business/src/main/resources/sql/dbscripts.properties
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?rev=1194887&r1=1194886&r2=1194887&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
Sat Oct 29 13:27:46 2011
@@ -250,6 +250,10 @@ public class DatabaseInstaller {
upgradeTo500(con, runScripts);
dbversion = 500;
}
+ if(dbversion < 510) {
+ upgradeTo510(con, runScripts);
+ dbversion = 510;
+ }
// make sure the database version is the exact version
// we are upgrading too.
@@ -1144,7 +1148,28 @@ public class DatabaseInstaller {
}
}
-
+ private void upgradeTo510(Connection con, boolean runScripts) throws
StartupException {
+
+ // first we need to run upgrade scripts
+ SQLScriptRunner runner = null;
+ try {
+ if (runScripts) {
+ String handle = getDatabaseHandle(con);
+ String scriptPath = handle + "/500-to-510-migration.sql";
+ successMessage("Running database upgrade script:
"+scriptPath);
+ runner = new
SQLScriptRunner(scripts.getDatabaseScript(scriptPath));
+ runner.runScript(con, true);
+ messages.addAll(runner.getMessages());
+ }
+ } catch(Exception ex) {
+ log.error("ERROR running 510 database upgrade script", ex);
+ if (runner != null) messages.addAll(runner.getMessages());
+
+ errorMessage("Problem upgrading database to version 510", ex);
+ throw new StartupException("Problem upgrading database to version
510", ex);
+ }
+ }
+
/**
* Use database product name to get the database script directory name.
*/
@@ -1292,5 +1317,5 @@ public class DatabaseInstaller {
throw new StartupException("Error setting database version.", se);
}
}
-
+
}
Modified:
roller/trunk/weblogger-business/src/main/resources/sql/dbscripts.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/sql/dbscripts.properties?rev=1194887&r1=1194886&r2=1194887&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/sql/dbscripts.properties
(original)
+++ roller/trunk/weblogger-business/src/main/resources/sql/dbscripts.properties
Sat Oct 29 13:27:46 2011
@@ -7,5 +7,5 @@ databases=db2 derby hsqldb mssql mysql o
# list all db templates to generate, separated by spaces
templates=createdb 200-to-210-migration 210-to-230-migration \
230-to-240-migration 240-to-300-migration 300-to-310-migration \
-310-to-400-migration 400-to-500-migration, 500-to-510-migration
+310-to-400-migration 400-to-500-migration 500-to-510-migration
