[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jboss-cvs-commits
Subject:    [jboss-cvs] jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc JDBCLoadEntityCommand.java JDBCLoadRelatio
From:       Alexey Loubyansky <loubyansky () users ! sourceforge ! net>
Date:       2003-01-31 14:17:14
[Download RAW message or body]

  User: loubyansky
  Date: 03/01/31 06:17:14

  Modified:    src/main/org/jboss/ejb/plugins/cmp/jdbc Tag: Branch_3_2
                        JDBCLoadEntityCommand.java
                        JDBCLoadRelationCommand.java
                        JDBCPostCreateEntityCommand.java
  Log:
  fix for [675932]: adjustment for JDBCCMRFieldBridge refactoring
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.19.2.7  +2 -2      \
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCLoadEntityCommand.java  
  Index: JDBCLoadEntityCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCLoadEntityCommand.java,v
  retrieving revision 1.19.2.6
  retrieving revision 1.19.2.7
  diff -u -r1.19.2.6 -r1.19.2.7
  --- JDBCLoadEntityCommand.java	24 Dec 2002 18:28:09 -0000	1.19.2.6
  +++ JDBCLoadEntityCommand.java	31 Jan 2003 14:17:13 -0000	1.19.2.7
  @@ -41,7 +41,7 @@
    * @author <a href="mailto:justin@j-m-f.demon.co.uk">Justin Forder</a>
    * @author <a href="mailto:dirk@jboss.de">Dirk Zimmermann</a>
    * @author <a href="mailto:danch@nvisia.com">danch (Dan Christopherson)</a>
  - * @version $Revision: 1.19.2.6 $
  + * @version $Revision: 1.19.2.7 $
    */
   public class JDBCLoadEntityCommand {
      private final JDBCStoreManager manager;
  @@ -291,7 +291,7 @@
               || field.isLoaded( ctx )
                  && (!field.isReadOnly() || !field.isReadTimedOut(ctx))
               || field instanceof JDBCCMRFieldBridge
  -               && ((JDBCCMRFieldBridge)field).isFkPartOfPk()) {
  +               && ((JDBCCMRFieldBridge)field).allFkFieldsMappedToPkFields()) {
               fields.remove();
            }
         }
  
  
  
  1.17.2.4  +2 -2      \
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCLoadRelationCommand.java  
  Index: JDBCLoadRelationCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCLoadRelationCommand.java,v
  retrieving revision 1.17.2.3
  retrieving revision 1.17.2.4
  diff -u -r1.17.2.3 -r1.17.2.4
  --- JDBCLoadRelationCommand.java	24 Dec 2002 18:29:20 -0000	1.17.2.3
  +++ JDBCLoadRelationCommand.java	31 Jan 2003 14:17:14 -0000	1.17.2.4
  @@ -33,7 +33,7 @@
    * Loads relations for a particular entity from a relation table.
    *
    * @author <a href="mailto:dain@daingroup.com">Dain Sundstrom</a>
  - * @version $Revision: 1.17.2.3 $
  + * @version $Revision: 1.17.2.4 $
    */
   public class JDBCLoadRelationCommand {
      private final JDBCStoreManager manager;
  @@ -201,7 +201,7 @@
         
         // do we need to join the relation table and the related table
         // do we need to join the relation table and the related table
  -      boolean join = ((preloadFields.size() > 0) || cmrField.isFkPartOfPk())
  +      boolean join = ((preloadFields.size() > 0) || \
cmrField.allFkFieldsMappedToPkFields())  && !relationTable.equals(relatedTable);
   
         // aliases for the tables, only required if we are joining the tables
  
  
  
  1.2.2.2   +3 -4      \
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCPostCreateEntityCommand.java  
  Index: JDBCPostCreateEntityCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCPostCreateEntityCommand.java,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- JDBCPostCreateEntityCommand.java	24 Dec 2002 18:24:22 -0000	1.2.2.1
  +++ JDBCPostCreateEntityCommand.java	31 Jan 2003 14:17:14 -0000	1.2.2.2
  @@ -35,7 +35,7 @@
    *
    * @author <a href="mailto:aloubyansky@hotmail.com">Alex Loubyansky</a>
    *
  - * @version $Revision: 1.2.2.1 $
  + * @version $Revision: 1.2.2.2 $
    */
   public class JDBCPostCreateEntityCommand
   {
  @@ -64,7 +64,7 @@
         for(Iterator iter=entity.getCMRFields().iterator(); iter.hasNext();)
         {
            JDBCCMRFieldBridge cmrField = (JDBCCMRFieldBridge)iter.next();
  -         if(cmrField.isFkPartOfPk())
  +         if(cmrField.allFkFieldsMappedToPkFields())
            {
               // look for the pk field this cmr field is mapped to
               for(Iterator fkIter = cmrField.getForeignKeyFields().iterator();
  @@ -92,13 +92,12 @@
   
               // add the field to the list
               fkPartOfPkCmrFields.add(cmrField);
  -
               // create related-entity-exists-sql
               relatedEntityExistsSqlByField.put(
                  cmrField, createRelatedEntityExistsSql(cmrField));
   
            }
  -         else if(cmrField.getRelatedCMRField().isFkPartOfPk())
  +         else if(cmrField.getRelatedCMRField().allFkFieldsMappedToPkFields())
            {
               log.debug("found related CMR field mapped to the PK: "
                  + cmrField.getFieldName());
  
  
  


-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits


[prev in list] [next in list] [prev in thread] [next in thread]