Commit 2ca5b99f authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gaston

Removed inMemory from some queries since that column does not exist anymore.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@539 b35dd754-fafc-0310-a699-88a17e54d16e
parent 84205a4d
...@@ -62,12 +62,12 @@ public class MUCPersistenceManager { ...@@ -62,12 +62,12 @@ public class MUCPersistenceManager {
"UPDATE mucRoom SET modificationDate=?, naturalName=?, description=?, " + "UPDATE mucRoom SET modificationDate=?, naturalName=?, description=?, " +
"canChangeSubject=?, maxUsers=?, publicRoom=?, moderated=?, invitationRequired=?, " + "canChangeSubject=?, maxUsers=?, publicRoom=?, moderated=?, invitationRequired=?, " +
"canInvite=?, password=?, canDiscoverJID=?, logEnabled=?, rolesToBroadcast=?, " + "canInvite=?, password=?, canDiscoverJID=?, logEnabled=?, rolesToBroadcast=?, " +
"inMemory=? WHERE roomID=?"; "WHERE roomID=?";
private static final String ADD_ROOM = private static final String ADD_ROOM =
"INSERT INTO mucRoom (roomID, creationDate, modificationDate, name, naturalName, " + "INSERT INTO mucRoom (roomID, creationDate, modificationDate, name, naturalName, " +
"description, canChangeSubject, maxUsers, publicRoom, moderated, invitationRequired, " + "description, canChangeSubject, maxUsers, publicRoom, moderated, invitationRequired, " +
"canInvite, password, canDiscoverJID, logEnabled, subject, rolesToBroadcast, " + "canInvite, password, canDiscoverJID, logEnabled, subject, rolesToBroadcast, " +
"lastActiveDate, inMemory) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; "lastActiveDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
private static final String UPDATE_SUBJECT = private static final String UPDATE_SUBJECT =
"UPDATE mucRoom SET subject=? WHERE roomID=?"; "UPDATE mucRoom SET subject=? WHERE roomID=?";
private static final String DELETE_ROOM = private static final String DELETE_ROOM =
...@@ -159,7 +159,7 @@ public class MUCPersistenceManager { ...@@ -159,7 +159,7 @@ public class MUCPersistenceManager {
room.setCanAnyoneDiscoverJID(rs.getInt(13) == 1 ? true : false); room.setCanAnyoneDiscoverJID(rs.getInt(13) == 1 ? true : false);
room.setLogEnabled(rs.getInt(14) == 1 ? true : false); room.setLogEnabled(rs.getInt(14) == 1 ? true : false);
room.setSubject(rs.getString(15)); room.setSubject(rs.getString(15));
List rolesToBroadcast = new ArrayList(); List<String> rolesToBroadcast = new ArrayList<String>();
String roles = Integer.toBinaryString(rs.getInt(16)); String roles = Integer.toBinaryString(rs.getInt(16));
if (roles.charAt(0) == '1') { if (roles.charAt(0) == '1') {
rolesToBroadcast.add("moderator"); rolesToBroadcast.add("moderator");
...@@ -257,8 +257,7 @@ public class MUCPersistenceManager { ...@@ -257,8 +257,7 @@ public class MUCPersistenceManager {
pstmt.setInt(11, (room.canAnyoneDiscoverJID() ? 1 : 0)); pstmt.setInt(11, (room.canAnyoneDiscoverJID() ? 1 : 0));
pstmt.setInt(12, (room.isLogEnabled() ? 1 : 0)); pstmt.setInt(12, (room.isLogEnabled() ? 1 : 0));
pstmt.setInt(13, marshallRolesToBroadcast(room)); pstmt.setInt(13, marshallRolesToBroadcast(room));
pstmt.setInt(14, 1); pstmt.setLong(14, room.getID());
pstmt.setLong(15, room.getID());
pstmt.executeUpdate(); pstmt.executeUpdate();
} }
else { else {
...@@ -281,7 +280,6 @@ public class MUCPersistenceManager { ...@@ -281,7 +280,6 @@ public class MUCPersistenceManager {
pstmt.setString(16, room.getSubject()); pstmt.setString(16, room.getSubject());
pstmt.setInt(17, marshallRolesToBroadcast(room)); pstmt.setInt(17, marshallRolesToBroadcast(room));
pstmt.setString(18, StringUtils.dateToMillis(new Date())); pstmt.setString(18, StringUtils.dateToMillis(new Date()));
pstmt.setInt(19, 1); // the room starts always "in memory"
pstmt.executeUpdate(); pstmt.executeUpdate();
} }
} }
...@@ -371,7 +369,7 @@ public class MUCPersistenceManager { ...@@ -371,7 +369,7 @@ public class MUCPersistenceManager {
room.setCanAnyoneDiscoverJID(rs.getInt(14) == 1 ? true : false); room.setCanAnyoneDiscoverJID(rs.getInt(14) == 1 ? true : false);
room.setLogEnabled(rs.getInt(15) == 1 ? true : false); room.setLogEnabled(rs.getInt(15) == 1 ? true : false);
room.setSubject(rs.getString(16)); room.setSubject(rs.getString(16));
List rolesToBroadcast = new ArrayList(); List<String> rolesToBroadcast = new ArrayList<String>();
String roles = Integer.toBinaryString(rs.getInt(17)); String roles = Integer.toBinaryString(rs.getInt(17));
if (roles.charAt(0) == '1') { if (roles.charAt(0) == '1') {
rolesToBroadcast.add("moderator"); rolesToBroadcast.add("moderator");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment