[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment CMPContainerBuilder.java

[gdamour]

gdamour     2005/08/20 03:53:01

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        CMPContainerBuilder.java
  Log:

  We need to use the column name, i.e. physical name of the SQLSchema, to
  detect that a primary key column is also a foreign key column.
  
  Revision  Changes    Path
  1.28      +4 -3      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPContainerBuilder.java
  
  Index: CMPContainerBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPContainerBuilder.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- CMPContainerBuilder.java  20 Aug 2005 03:49:07 -0000      1.27
  +++ CMPContainerBuilder.java  20 Aug 2005 07:53:01 -0000      1.28
  @@ -443,10 +443,11 @@
       }
   
       private CMPFieldTransform buildCMRMappedToPKCMP(Entity entity, 
AssociationEnd end, CMPFieldTransform accessor, boolean owning, int cmrSlot) {
  -        List pkFields = entity.getPrimaryKeyFields();
  +        Table table = sqlSchema.getTable(entity.getName());
  +        List pkFields = table.getPrimaryKeyFields();
           for (Iterator iter = pkFields.iterator(); iter.hasNext();) {
               Attribute pkField = (Attribute) iter.next();
  -            if (end.hasFKAttribute(pkField.getName())) {
  +            if (end.hasFKAttribute(pkField.getPhysicalName())) {
                   if (owning) {
                       return new CMRMappedToOwningPKCMP(accessor, cmrSlot);
                   }