branch develop updated (54dfd7b -> 357137b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git from 54dfd7b [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 357137b Bad generation of delete method in generated dao for *-* relation if surrounding entity is not in the same schema (fixes #4096) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 357137bef9feb90dd3d053e67ac3af6a969d7e2d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 14 17:19:07 2016 +0100 Bad generation of delete method in generated dao for *-* relation if surrounding entity is not in the same schema (fixes #4096) Summary of changes: .../java/org/nuiton/topia/templates/EntityDaoTransformer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 357137bef9feb90dd3d053e67ac3af6a969d7e2d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 14 17:19:07 2016 +0100 Bad generation of delete method in generated dao for *-* relation if surrounding entity is not in the same schema (fixes #4096) --- .../java/org/nuiton/topia/templates/EntityDaoTransformer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java index 3e37418..a84713b 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java @@ -435,15 +435,15 @@ public class EntityDaoTransformer extends ObjectModelTransformerToJava { // On doit absolument supprimer pour les relations many-to-many // le this de la collection de l'autre cote - String dbSchema = topiaHibernateTagValues.getDbSchemaNameTagValue(clazz, aPackage, model); String attrDBName = templateHelper.getDbName(attr); String attrClassifierDBName = templateHelper.getDbName(attr.getClassifier()); - if (dbSchema != null) { - attrClassifierDBName = dbSchema + "." + attrClassifierDBName; + String attrClassifierDBNameSchemaName = topiaHibernateTagValues.getDbSchemaNameTagValue(attr.getClassifier(), getPackage(attr.getClassifier()), model); + if (attrClassifierDBNameSchemaName != null) { + attrClassifierDBName = attrClassifierDBNameSchemaName + "." + attrClassifierDBName; } String attrJoinTableName = templateHelper.getManyToManyTableName(attr); - if (dbSchema != null) { - attrJoinTableName = dbSchema + "." + attrJoinTableName; + if (attrClassifierDBNameSchemaName != null) { + attrJoinTableName = attrClassifierDBNameSchemaName + "." + attrJoinTableName; } String attrReverseDBName = templateHelper.getReverseDbName(attr); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm