Merge pull request #830 from lvffilho/master

Add NamingConvention support to ManyToMany columns
This commit is contained in:
Rob Bygrave authored and GitHub committed 2016-10-14 23:27:32 +13:00
commit 6dc3038d0d
1 file changed
+2 -2
@@ -231,7 +231,7 @@ public class AnnotationAssocManys extends AnnotationParser {
for (int i = 0; i < localIds.length; i++) {
// add the source to intersection join columns
String fkCol = localTableName+"_"+localIds[i].getDbColumn();
intJoin.addJoinColumn(new DeployTableJoinColumn(localIds[i].getDbColumn(), fkCol));
intJoin.addJoinColumn(new DeployTableJoinColumn(localIds[i].getDbColumn(), namingConvention.getColumnFromProperty(null, fkCol)));
}
}
@@ -241,7 +241,7 @@ public class AnnotationAssocManys extends AnnotationParser {
for (int i = 0; i < otherIds.length; i++) {
// set the intersection to dest table join columns
final String fkCol = otherTableName+"_"+otherIds[i].getDbColumn();
destJoin.addJoinColumn(new DeployTableJoinColumn(fkCol, otherIds[i].getDbColumn()));
destJoin.addJoinColumn(new DeployTableJoinColumn(namingConvention.getColumnFromProperty(null, fkCol), otherIds[i].getDbColumn()));
}
}