This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 5222744bfd9102d130b59a73fc729cfe2e3f561b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 11:53:28 2015 +0200 refs #3675 improve index name --- .../topia/generator/EntityHibernateMappingGenerator.java | 15 +++++++++++---- 1 file changed, 11 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 640d698..01930dd 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 @@ -230,8 +230,10 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { // add database-object to create and drop index + // add schema if exist (http://nuiton.org/issues/2052) + String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(clazz, model); + boolean withSchema = StringUtils.isNotEmpty(schema); String tableName; - String indexName = "idx_" + clazz.getName() + "_" + attribute.getName(); String propertyName; @@ -251,9 +253,14 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { propertyName = TopiaGeneratorUtil.getReverseDbNameOnReverseAttribute(attribute); } - // add schema if exist (http://nuiton.org/issues/2052) - String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(clazz, model); - if (StringUtils.isNotEmpty(schema)) { + String indexName = "idx"; + if (withSchema) { + indexName += '_' + schema; + } + indexName += '_' + propertyName + '_' + tableName; + indexName = indexName.toLowerCase(); + + if (withSchema) { tableName = schema + "." + tableName; } /*{ <database-object> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.