jmcnally 01/05/30 15:43:33
Modified: src/java/org/apache/turbine/om/security/peer RolePeer.java
Log:
remove reference to GroupPeer. We know the id from the Group so there is
no need to reference the GroupPeer. This allows a different table to serve
as the Group persistence. This saves a join as well.
The only reason to write the query as it was is that you do not want to assume the
Group object has a PrimaryKey. But this is being called from RolePeer which is db
specific and the old way references GroupPeer which is db specific. So nothing is
lost and the query is more efficient and flexible.
Revision Changes Path
1.15 +6 -5
jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePeer.java
Index: RolePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePeer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RolePeer.java 2001/05/23 18:53:11 1.14
+++ RolePeer.java 2001/05/30 22:43:30 1.15
@@ -60,6 +60,7 @@
import java.util.Vector;
import org.apache.turbine.om.BaseObject;
import org.apache.turbine.om.ObjectKey;
+import org.apache.turbine.om.Persistent;
import org.apache.turbine.om.peer.BasePeer;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
@@ -85,7 +86,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: RolePeer.java,v 1.14 2001/05/23 18:53:11 mikeh Exp $
+ * @version $Id: RolePeer.java,v 1.15 2001/05/30 22:43:30 jmcnally Exp $
*/
public class RolePeer extends BasePeer
{
@@ -146,12 +147,12 @@
.getUserPeerInstance();
criteria.add(up.getFullColumnName(UserPeer.USERNAME),
- user.getUserName());
- criteria.add(GroupPeer.NAME, group.getName());
+ user.getUserName());
+ criteria.add(UserGroupRolePeer.GROUP_ID,
+ ((Persistent)group).getPrimaryKey());
+
criteria.addJoin(up.getFullColumnName(UserPeer.USER_ID),
UserGroupRolePeer.USER_ID);
-
- criteria.addJoin(GroupPeer.GROUP_ID, UserGroupRolePeer.GROUP_ID);
criteria.addJoin(UserGroupRolePeer.ROLE_ID, RolePeer.ROLE_ID);
return retrieveSet(criteria);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
