User: dsundstrom
Date: 01/08/18 09:13:05
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata
JDBCRelationshipRoleMetaData.java
Log:
Changed algorithm which generates default column names to generate more unique names.
Revision Changes Path
1.5 +25 -7
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCRelationshipRoleMetaData.java
Index: JDBCRelationshipRoleMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCRelationshipRoleMetaData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JDBCRelationshipRoleMetaData.java 2001/08/03 17:15:47 1.4
+++ JDBCRelationshipRoleMetaData.java 2001/08/18 16:13:05 1.5
@@ -22,7 +22,7 @@
* ejb-jar.xml file's ejb-relation elements.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public final class JDBCRelationshipRoleMetaData {
/**
@@ -84,7 +84,7 @@
for(Iterator i = entity.getCMPFields().iterator();
i.hasNext(); ) {
JDBCCMPFieldMetaData cmpField =
(JDBCCMPFieldMetaData)i.next();
if(cmpField.isPrimaryKeyMember()) {
- cmpField = new JDBCCMPFieldMetaData(entity,
cmpField, entity.getName() + "_" + cmpField.getFieldName(), false);
+ cmpField = new JDBCCMPFieldMetaData(entity,
cmpField, getCMRFieldName() + "_" + cmpField.getFieldName(), false);
tableKeyFields.put(cmpField.getFieldName(),
cmpField);
}
}
@@ -95,7 +95,7 @@
for(Iterator i = relatedEntity.getCMPFields().iterator();
i.hasNext(); ) {
JDBCCMPFieldMetaData cmpField =
(JDBCCMPFieldMetaData)i.next();
if(cmpField.isPrimaryKeyMember()) {
- cmpField = new JDBCCMPFieldMetaData(entity,
cmpField, relatedEntity.getName() + "_" + cmpField.getFieldName(), false);
+ cmpField = new JDBCCMPFieldMetaData(entity,
cmpField, getCMRFieldName() + "_" + cmpField.getFieldName(), false);
foreignKeyFields.put(cmpField.getFieldName(),
cmpField);
}
}
@@ -123,7 +123,7 @@
for(Iterator i = entity.getCMPFields().iterator();
i.hasNext(); ) {
JDBCCMPFieldMetaData cmpField =
(JDBCCMPFieldMetaData)i.next();
if(cmpField.isPrimaryKeyMember()) {
- cmpField = new JDBCCMPFieldMetaData(entity,
cmpField, entity.getName() + "_" + cmpField.getFieldName(), false);
+ cmpField = new JDBCCMPFieldMetaData(entity,
cmpField, getCMRFieldName() + cmpField.getFieldName(), false);
tableKeyFields.put(cmpField.getFieldName(),
cmpField);
}
}
@@ -134,7 +134,7 @@
for(Iterator i = relatedEntity.getCMPFields().iterator();
i.hasNext(); ) {
JDBCCMPFieldMetaData cmpField =
(JDBCCMPFieldMetaData)i.next();
if(cmpField.isPrimaryKeyMember()) {
- cmpField = new JDBCCMPFieldMetaData(entity,
cmpField, relatedEntity.getName() + "_" + cmpField.getFieldName(), false);
+ cmpField = new JDBCCMPFieldMetaData(entity,
cmpField, getCMRFieldName() + "_" + cmpField.getFieldName(), false);
foreignKeyFields.put(cmpField.getFieldName(),
cmpField);
}
}
@@ -194,6 +194,24 @@
}
/**
+ * Is this field single valued, that means it does not return a collection.
+ * A relationship role is single valued if the related role has a multiplicity
of one.
+ * @return true if this role does not return a collection
+ */
+ public boolean isSingleValued() {
+ return getRelatedRole().isMultiplicityOne();
+ }
+
+ /**
+ * Is this field collection valued, that means it returns a collection.
+ * A relationship role is collection valued if the related role has a
multiplicity of many.
+ * @return true if this role returns a collection
+ */
+ public boolean isCollectionValued() {
+ return getRelatedRole().isMultiplicityMany();
+ }
+
+ /**
* Should this entity be deleted when related entity is deleted.
*/
public boolean isCascadeDelete() {
@@ -258,7 +276,7 @@
for(Iterator i = relatedEntity.getCMPFields().iterator(); i.hasNext();
) {
JDBCCMPFieldMetaData cmpField = (JDBCCMPFieldMetaData)i.next();
if(cmpField.isPrimaryKeyMember()) {
- cmpField = new JDBCCMPFieldMetaData(entity, cmpField,
relatedEntity.getName() + "_" + cmpField.getFieldName(), false);
+ cmpField = new JDBCCMPFieldMetaData(entity, cmpField,
getCMRFieldName() + "_" + cmpField.getFieldName(), false);
foreignKeyFields.put(cmpField.getFieldName(),
cmpField);
}
}
@@ -299,7 +317,7 @@
for(Iterator i = entity.getCMPFields().iterator(); i.hasNext(); ) {
JDBCCMPFieldMetaData cmpField = (JDBCCMPFieldMetaData)i.next();
if(cmpField.isPrimaryKeyMember()) {
- cmpField = new JDBCCMPFieldMetaData(entity, cmpField,
entity.getName() + "_" + cmpField.getFieldName(), false);
+ cmpField = new JDBCCMPFieldMetaData(entity, cmpField,
getCMRFieldName() + "_" + cmpField.getFieldName(), false);
tableKeyFields.put(cmpField.getFieldName(), cmpField);
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
