This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository topia. See http://git.nuiton.org/topia.git commit f336e74abe4746f6df33f0cf8b32a9c8ed11a8c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 26 13:27:37 2014 +0200 fixes #3519: Bad schema name generation for a n*m relation --- .../topia/generator/EntityHibernateMappingGenerator.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java index 0b7feea..006f385 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java @@ -281,12 +281,12 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { generateHibernateOneToOne(output, attr, prefix); } } else { - generateHibernateProperty(output, attr, prefix); + generateHibernateProperty(output, clazz, attr, prefix); } } else { if (attr.getClassifier() != null && TopiaGeneratorUtil.isEntity(attr.getClassifier())) { if (TopiaGeneratorUtil.isNMultiplicity(attr.getReverseMaxMultiplicity()) && !attr.hasAssociationClass()) { - generateHibernateManyToMany(output, attr, prefix); + generateHibernateManyToMany(output, clazz, attr, prefix); } else { generateHibernateOneToMany(output, attr, prefix); } @@ -389,6 +389,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { } protected void generateHibernateProperty(Writer output, + ObjectModelClass clazz, ObjectModelAttribute attr, String prefix) throws IOException { String attrType = getType(attr); @@ -409,7 +410,8 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { attrType = attrType.trim().substring(0, attrType.trim().length()-2); String optionalAttributes = ""; - String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr.getClassifier(), model); + //String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr.getClassifier(), model); + String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(clazz, model); if (schema != null) { optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_SCHEMA, schema); } @@ -694,6 +696,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { } protected void generateHibernateManyToMany(Writer output, + ObjectModelClass clazz, ObjectModelAttribute attr, String prefix) throws IOException { // On ne met le inverse="true" uniquement pour un seul coté de la relation. @@ -736,7 +739,9 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { } String reverseAttrDBName = TopiaGeneratorUtil.getReverseDbName(attr); String optionalAttributes=""; - String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr.getClassifier(), model); + + //String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr.getClassifier(), model); + String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(clazz, model); if (schema != null) { optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_SCHEMA, schema); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.