branch develop updated (17cb0e9 -> 2cf95c8)
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 17cb0e9 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 2cf95c8 Fix delete generate for nm associations (Fixes #3725) 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 2cf95c8cb0efe05e0338c4636569d12ba2eef541 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 16 11:39:12 2016 +0200 Fix delete generate for nm associations (Fixes #3725) Summary of changes: .../org/nuiton/topia/templates/EntityDaoTransformer.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 2cf95c8cb0efe05e0338c4636569d12ba2eef541 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 16 11:39:12 2016 +0200 Fix delete generate for nm associations (Fixes #3725) --- .../org/nuiton/topia/templates/EntityDaoTransformer.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 0cba1c8..3c0d3f9 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 @@ -43,6 +43,7 @@ import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelPackage; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaException; @@ -387,8 +388,8 @@ public class EntityDaoTransformer extends ObjectModelTransformerToJava { StringBuilder body = new StringBuilder(); String modelName = StringUtils.capitalize(model.getName()); - String providerFQN = getDefaultPackageName() + '.' + modelName + - "DAOHelper.getImplementationClass"; + String providerFQN = getDefaultPackageName() + '.' + modelName + "DAOHelper.getImplementationClass"; + ObjectModelPackage aPackage = getPackage(clazz); body.append("" /*{ @@ -434,9 +435,16 @@ 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 = topiaTagValues.getDbSchemaNameTagValue(clazz, aPackage, model); String attrDBName = templateHelper.getDbName(attr); String attrClassifierDBName = templateHelper.getDbName(attr.getClassifier()); + if (dbSchema != null) { + attrClassifierDBName = dbSchema + "." + attrClassifierDBName; + } String attrJoinTableName = templateHelper.getManyToManyTableName(attr); + if (dbSchema != null) { + attrJoinTableName = dbSchema + "." + attrJoinTableName; + } String attrReverseDBName = templateHelper.getReverseDbName(attr); //FIXME_-FC-20100413 Use a TopiaQuery (use HQLin elements) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm