branch develop updated (1be734b -> fc64b4e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from 1be734b [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 7a2ee87 refs #3671: use shema name if required new fc64b4e fixes #3671: Bad delete query generated (missing db shema if any) Merge branch 'feature/3671' into develop The 2 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 fc64b4e6751358773cb7caf2de93b07cfc887f54 Merge: 1be734b 7a2ee87 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 05:40:44 2015 +0200 fixes #3671: Bad delete query generated (missing db shema if any) Merge branch 'feature/3671' into develop commit 7a2ee8781c3b4357d26611e3c33e9a351c66df26 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 05:40:38 2015 +0200 refs #3671: use shema name if required Summary of changes: .../main/java/org/nuiton/topia/generator/EntityDAOTransformer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 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 http://git.nuiton.org/topia.git commit 7a2ee8781c3b4357d26611e3c33e9a351c66df26 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 05:40:38 2015 +0200 refs #3671: use shema name if required --- .../main/java/org/nuiton/topia/generator/EntityDAOTransformer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java index 3604621..1bd4bdc 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java @@ -40,7 +40,6 @@ import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelDependency; import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; -import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -590,6 +589,11 @@ public class EntityDAOTransformer extends ObjectModelTransformerToJava { String attrDBName = TopiaGeneratorUtil.getDbName(attr); String attrClassifierDBName = TopiaGeneratorUtil.getDbName(attr.getClassifier()); String attrJoinTableName = TopiaGeneratorUtil.getManyToManyTableName(attr); + String schemaName = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr.getClassifier(), model); + if (schemaName != null) { + attrJoinTableName = schemaName + "." + attrJoinTableName; + attrClassifierDBName = schemaName + "." + attrClassifierDBName; + } String attrReverseDBName = TopiaGeneratorUtil.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>.
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 fc64b4e6751358773cb7caf2de93b07cfc887f54 Merge: 1be734b 7a2ee87 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 05:40:44 2015 +0200 fixes #3671: Bad delete query generated (missing db shema if any) Merge branch 'feature/3671' into develop .../main/java/org/nuiton/topia/generator/EntityDAOTransformer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm