Skip to content

O
Openfire
Commit f9b81f20 authored by akrherz's avatar akrherz
Browse files
Options

OF-163: fix patch regression with ambiguous rosterID column

parent 1ed61932
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java
View file @ f9b81f20
......@@ -75,9 +75,9 @@ public class DefaultRosterItemProvider implements RosterItemProvider {
private static final String LOAD_ROSTER =
"SELECT jid, rosterID, sub, ask, recv, nick FROM ofRoster WHERE username=?";
private static final String LOAD_ROSTER_ITEM_GROUPS =
"SELECT rosterID,groupName FROM ofRosterGroups " +
"SELECT ofRosterGroups.rosterID,groupName FROM ofRosterGroups " +
"INNER JOIN ofRoster ON ofRosterGroups.rosterID = ofRoster.rosterID " +
"WHERE username=? ORDER BY rosterID, rank";
"WHERE username=? ORDER BY ofRosterGroups.rosterID, rank";
/* (non-Javadoc)
* @see org.jivesoftware.openfire.roster.RosterItemProvider#createItem(java.lang.String, org.jivesoftware.openfire.roster.RosterItem)
......
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

Technounit-GROUP 2023