Skip to content

Commit

Permalink
igniterealtime#31: Fixed duplicate column name definition.
Browse files Browse the repository at this point in the history
  • Loading branch information
guusdk committed Jun 25, 2019
1 parent c05ae41 commit 37c4d46
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.html
Expand Up @@ -52,6 +52,7 @@ <h1>
<li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/25'>Issue #25</a>] - When logging is disabled, queries should not go unanswered.</li>
<li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/27'>Issue #27</a>] - Fix addressing when original request has no 'to' attribute.</li>
<li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/29'>Issue #29</a>] - Fix Maven build.</li>
<li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/31'>Issue #31</a>] - Renamed duplicate database column definition.</li>
<li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/36'>Issue #36</a>] - Fixes newlines in obtained archived messages.</li>
<li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/38'>Issue #38</a>] - Recent MUC messages missing in archive result.</li>
<li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/41'>Issue #41</a>] - Improve performance for chatrooms that have many archived messages.</li>
Expand Down
Expand Up @@ -53,7 +53,7 @@ public class JdbcPersistenceManager implements PersistenceManager {
+ "ofConversation.conversationID, " + " ofConversation.room, " + "ofConversation.isExternal, "+ "ofConversation.lastActivity, "
+ "ofConversation.messageCount, " + "ofConversation.startDate, " + "ofConParticipant.bareJID, " + "ofConParticipant.jidResource,"
+ "ofConParticipant.nickname, " + "ofConParticipant.bareJID AS fromJID, " + "ofMessageArchive.toJID, "
+ "min(ofConParticipant.joinedDate) AS startDate, " + "max(ofConParticipant.leftDate) as leftDate "
+ "min(ofConParticipant.joinedDate) AS joinedDate, " + "max(ofConParticipant.leftDate) as leftDate "
+ "FROM ofConversation "
+ "INNER JOIN ofConParticipant ON ofConversation.conversationID = ofConParticipant.conversationID "
+ "INNER JOIN (SELECT conversationID, toJID FROM ofMessageArchive union all SELECT conversationID, fromJID as toJID FROM ofMessageArchive) ofMessageArchive ON ofConParticipant.conversationID = ofMessageArchive.conversationID ";
Expand Down

0 comments on commit 37c4d46

Please sign in to comment.