You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2008/05/17 00:18:45 UTC
svn commit: r657229 - in /roller/trunk/apps/weblogger: build.properties
src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
src/sql/400-to-410-migration.vm
Author: snoopdave
Date: Fri May 16 15:18:43 2008
New Revision: 657229
URL: http://svn.apache.org/viewvc?rev=657229&view=rev
Log:
Hooking in 4.1 upgrade script, making it work with MySQL
Modified:
roller/trunk/apps/weblogger/build.properties
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
roller/trunk/apps/weblogger/src/sql/400-to-410-migration.vm
Modified: roller/trunk/apps/weblogger/build.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.properties?rev=657229&r1=657228&r2=657229&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/build.properties (original)
+++ roller/trunk/apps/weblogger/build.properties Fri May 16 15:18:43 2008
@@ -3,7 +3,7 @@
basedir=.
# what version is this?
-ro.version=4.0
+ro.version=4.1-dev
# compile time settings
build.debug=true
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?rev=657229&r1=657228&r2=657229&view=diff
==============================================================================
--- 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 Fri May 16 15:18:43 2008
@@ -1123,8 +1123,24 @@
*/
private void upgradeTo410(Connection con, boolean runScripts) throws StartupException {
- // nothing to do here yet...
-
+ // first we need to run upgrade scripts
+ SQLScriptRunner runner = null;
+ try {
+ if (runScripts) {
+ String handle = getDatabaseHandle(con);
+ String scriptPath = handle + "/400-to-410-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 410 database upgrade script", ex);
+ if (runner != null) messages.addAll(runner.getMessages());
+
+ errorMessage("Problem upgrading database to version 410", ex);
+ throw new StartupException("Problem upgrading database to version 410", ex);
+ }
}
Modified: roller/trunk/apps/weblogger/src/sql/400-to-410-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/sql/400-to-410-migration.vm?rev=657229&r1=657228&r2=657229&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/sql/400-to-410-migration.vm (original)
+++ roller/trunk/apps/weblogger/src/sql/400-to-410-migration.vm Fri May 16 15:18:43 2008
@@ -19,17 +19,17 @@
);
insert into roller_permission (id,username,actions,objectid,objecttype,pending,datecreated)
- select w.id||u.username, u.username, 'edit_draft', w.handle, 'Weblog', 0, current_timestamp
+ select concat(w.id,u.username), u.username, 'edit_draft', w.handle, 'Weblog', 0, current_timestamp
from rolleruser as u, website as w, roller_user_permissions as p
where p.user_id = u.id and p.website_id = w.id and permission_mask = 1;
insert into roller_permission (id,username,actions,objectid,objecttype,pending,datecreated)
- select w.id||u.username, u.username, 'author', w.handle, 'Weblog', 0, current_timestamp
+ select concat(w.id,u.username), u.username, 'author', w.handle, 'Weblog', 0, current_timestamp
from rolleruser as u, website as w, roller_user_permissions as p
where p.user_id = u.id and p.website_id = w.id and permission_mask = 2;
insert into roller_permission (id,username,actions,objectid,objecttype,pending,datecreated)
- select w.id||u.username, u.username, 'admin', w.handle, 'Weblog', 0, current_timestamp
+ select concat(w.id,u.username), u.username, 'admin', w.handle, 'Weblog', 0, current_timestamp
from rolleruser as u, website as w, roller_user_permissions as p
where p.user_id = u.id and p.website_id = w.id and permission_mask = 3;