User: dsundstrom
  Date: 02/02/26 15:51:03

  Modified:    src/main/org/jboss/ejb/plugins/cmp/jdbc
                        JDBCLoadRelationCommand.java
  Log:
  Minor changes due to changes in CMRFieldBridge interface.
  
  Revision  Changes    Path
  1.15      +7 -7      
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JDBCLoadRelationCommand.java      16 Feb 2002 10:37:54 -0000      1.14
  +++ JDBCLoadRelationCommand.java      26 Feb 2002 23:51:03 -0000      1.15
  @@ -33,7 +33,7 @@
    * Loads relations for a particular entity from a relation table.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   public class JDBCLoadRelationCommand {
      private final JDBCStoreManager manager;
  @@ -195,7 +195,7 @@
         List relatedKeyFields = getRelatedKeyFields(cmrField);
         List preloadFields = getPreloadFields(cmrField);
         String relationTable = getRelationTable(cmrField);
  -      String relatedTable = cmrField.getRelatedEntity().getTableName();
  +      String relatedTable = cmrField.getRelatedJDBCEntity().getTableName();
         
         // do we need to join the relation table and the related table
         boolean join = (preloadFields.size() > 0 && 
  @@ -246,7 +246,7 @@
            whereClause.append(SQLUtil.getJoinClause(
                     relatedKeyFields,
                     relationTable,
  -                  cmrField.getRelatedEntity().getPrimaryKeyFields(),
  +                  cmrField.getRelatedJDBCEntity().getPrimaryKeyFields(),
                     relatedTable));
            whereClause.append(") AND (");
         }
  @@ -304,7 +304,7 @@
            return cmrField.getRelatedCMRField().getTableKeyFields();
         } else if(cmrField.getRelatedCMRField().hasForeignKey()) {
            // related has foreign key
  -         return cmrField.getRelatedEntity().getPrimaryKeyFields();
  +         return cmrField.getRelatedJDBCEntity().getPrimaryKeyFields();
         } else {
            // i have foreign key
            return cmrField.getForeignKeyFields();
  @@ -337,7 +337,7 @@
            return cmrField.getRelationMetaData().getTableName();
         } else if(cmrField.getRelatedCMRField().hasForeignKey()) {
            // related has foreign key
  -         return cmrField.getRelatedEntity().getTableName();
  +         return cmrField.getRelatedJDBCEntity().getTableName();
         } else {
            // i have foreign key
            return entity.getTableName();
  @@ -360,9 +360,9 @@
            }
         } else if(cmrField.getRelatedCMRField().hasForeignKey()) {
            // related has foreign key
  -         if(cmrField.getRelatedEntity().getMetaData().hasRowLocking()) {
  +         if(cmrField.getRelatedJDBCEntity().getMetaData().hasRowLocking()) {
               selectTemplate =
  -               
cmrField.getRelatedEntity().getMetaData().getTypeMapping().getRowLockingTemplate();
  +               
cmrField.getRelatedJDBCEntity().getMetaData().getTypeMapping().getRowLockingTemplate();
               if(selectTemplate == null) {
                  throw new IllegalStateException("row-locking is not allowed " +
                        "for this type of datastore");
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to