Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2013-11-14 10:12:47 -0500
committerMartin Taal2013-11-14 10:12:47 -0500
commit54b499cc1b423302bfacdb4f433eea43b7f90425 (patch)
tree8dddd89b988adaf9c6500c36eda2fba4330720ee /generator/org.eclipse.emf.texo.orm
parentee4523a5a5b48537c193806974909be094e71259 (diff)
downloadorg.eclipse.emf.texo-54b499cc1b423302bfacdb4f433eea43b7f90425.tar.gz
org.eclipse.emf.texo-54b499cc1b423302bfacdb4f433eea43b7f90425.tar.xz
org.eclipse.emf.texo-54b499cc1b423302bfacdb4f433eea43b7f90425.zip
[421746] Don't set name of CollectionTable if option generate full db schema is false
Diffstat (limited to 'generator/org.eclipse.emf.texo.orm')
-rwxr-xr-xgenerator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java
index b26f79c5..938eb9ce 100755
--- a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java
+++ b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java
@@ -238,12 +238,14 @@ public class EAttributeORMAnnotator extends EStructuralFeatureORMAnnotator imple
if (elementCollection.getCollectionTable() == null) {
final CollectionTable collectionTable = OrmFactory.eINSTANCE.createCollectionTable();
elementCollection.setCollectionTable(collectionTable);
- }
- if (GeneratorUtils.isEmptyOrNull(elementCollection.getCollectionTable().getName())) {
- elementCollection.getCollectionTable().setName(namingStrategy.getJoinTableName(eAttribute));
+ collectionTable.setName(null);
}
if (namingStrategy.isGenerateAllDBSchemaNames()) {
+ if (GeneratorUtils.isEmptyOrNull(elementCollection.getCollectionTable().getName())) {
+ elementCollection.getCollectionTable().setName(namingStrategy.getJoinTableName(eAttribute));
+ }
+
if (elementCollection.getColumn() == null) {
elementCollection.setColumn(OrmFactory.eINSTANCE.createColumn());
}

Back to the top