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 2005/09/25 21:01:44 UTC
svn commit: r291459 -
/incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java
Author: snoopdave
Date: Sun Sep 25 12:01:40 2005
New Revision: 291459
URL: http://svn.apache.org/viewcvs?rev=291459&view=rev
Log:
Fix in database upgrade logic
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java
Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java?rev=291459&r1=291458&r2=291459&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java Sun Sep 25 12:01:40 2005
@@ -175,7 +175,7 @@
PreparedStatement entryUpdate = con.prepareStatement(
"update weblogentry set userid=?, status=?, "
+ "pubtime=pubtime, updatetime=updatetime "
- + "where publishentry=?");
+ + "where publishentry=? and websiteid=?");
PreparedStatement permsInsert = con.prepareStatement(
"insert roller_user_permissions "
+ "(id, website_id, user_id, permission_mask, pending) "
@@ -200,6 +200,7 @@
entryUpdate.setString( 1, userid);
entryUpdate.setString( 2, "PUBLISHED");
entryUpdate.setBoolean(3, true);
+ entryUpdate.setString( 4, websiteid);
entryUpdate.executeUpdate();
// update all of draft entries to include userid and status
@@ -207,6 +208,7 @@
entryUpdate.setString( 1, userid);
entryUpdate.setString( 2, "DRAFT");
entryUpdate.setBoolean(3, false);
+ entryUpdate.setString( 4, websiteid);
entryUpdate.executeUpdate();
// add permission for user in website