taylor 01/12/05 21:10:52 Modified: src/java/org/apache/jetspeed/om/dbpsml JetspeedAnonProfilePeer.java JetspeedGroupProfilePeer.java JetspeedRoleProfilePeer.java JetspeedUserProfilePeer.java Log: Changed update statement to not use default 'primary key' method, and instead use the secondary unique index in where clause for update criteria. Revision Changes Path 1.2 +6 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedAnonProfilePeer.java Index: JetspeedAnonProfilePeer.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedAnonProfilePeer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JetspeedAnonProfilePeer.java 2001/11/12 03:37:53 1.1 +++ JetspeedAnonProfilePeer.java 2001/12/06 05:10:52 1.2 @@ -77,7 +77,12 @@ } else if (operation == UPDATE) { - super.doUpdate(anonProfile); + Criteria values = buildCriteria(anonProfile); + Criteria select = buildCriteria(anonProfile); + select.remove(PROFILE); + BasePeer.doUpdate( select, values ); + +// super.doUpdate(anonProfile); } } 1.2 +6 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java Index: JetspeedGroupProfilePeer.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JetspeedGroupProfilePeer.java 2001/11/12 03:37:53 1.1 +++ JetspeedGroupProfilePeer.java 2001/12/06 05:10:52 1.2 @@ -84,7 +84,12 @@ } else if (operation == UPDATE) { - super.doUpdate(groupProfile); + Criteria values = buildCriteria(groupProfile); + Criteria select = buildCriteria(groupProfile); + select.remove(PROFILE); + BasePeer.doUpdate( select, values ); + +// super.doUpdate(groupProfile); } } 1.2 +6 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java Index: JetspeedRoleProfilePeer.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JetspeedRoleProfilePeer.java 2001/11/12 03:37:53 1.1 +++ JetspeedRoleProfilePeer.java 2001/12/06 05:10:52 1.2 @@ -84,7 +84,12 @@ } else if (operation == UPDATE) { - super.doUpdate(roleProfile); + Criteria values = buildCriteria(roleProfile); + Criteria select = buildCriteria(roleProfile); + select.remove(PROFILE); + BasePeer.doUpdate( select, values ); + +// super.doUpdate(roleProfile); } } 1.2 +10 -6 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java Index: JetspeedUserProfilePeer.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JetspeedUserProfilePeer.java 2001/11/12 03:37:53 1.1 +++ JetspeedUserProfilePeer.java 2001/12/06 05:10:52 1.2 @@ -19,6 +19,7 @@ import org.apache.turbine.util.db.*; import org.apache.turbine.util.db.map.*; import org.apache.turbine.util.db.pool.DBConnection; +import org.apache.turbine.om.NumberKey; // Local classes import org.apache.jetspeed.om.dbpsml.map.*; @@ -82,15 +83,19 @@ userProfile.setPage(profile.getName()); userProfile.setProfile(DBUtils.portletsToBytes( profile.getDocument().getPortlets())); - + if (operation == INSERT) { super.doInsert(userProfile); } else if (operation == UPDATE) { - super.doUpdate(userProfile); - } + Criteria values = buildCriteria(userProfile); + Criteria select = buildCriteria(userProfile); + select.remove(PROFILE); + BasePeer.doUpdate( select, values ); +// super.doUpdate(userProfile, con); + } } @@ -102,7 +107,7 @@ public void delete(ProfileLocator locator) throws Exception { JetspeedUserProfile userProfile = new JetspeedUserProfile(); - + userProfile.setUserName(locator.getUser().getUserName()); userProfile.setMediaType(locator.getMediaType()); userProfile.setLanguage(locator.getLanguage()); @@ -159,8 +164,7 @@ { criteria.add(COUNTRY, country); } - - return super.doSelect(criteria); + return super.doSelect(criteria); } /**
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>