Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtaal2007-02-05 11:13:40 -0500
committermtaal2007-02-05 11:13:40 -0500
commit86a0dc8533bce7dc652293e113328f1d5d38f41d (patch)
tree2cf620671841cc92a553c5415899987d8a3b1546
parentb36e312e1b23c8981d191ce9a5b45e96b147df32 (diff)
downloadorg.eclipse.emf.teneo-86a0dc8533bce7dc652293e113328f1d5d38f41d.tar.gz
org.eclipse.emf.teneo-86a0dc8533bce7dc652293e113328f1d5d38f41d.tar.xz
org.eclipse.emf.teneo-86a0dc8533bce7dc652293e113328f1d5d38f41d.zip
[172671]
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
index d871c260b..0f055c856 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
@@ -12,7 +12,7 @@
* Davide Marchignoli
* </copyright>
*
- * $Id: EntityMapper.java,v 1.7 2007/02/01 12:35:55 mtaal Exp $
+ * $Id: EntityMapper.java,v 1.8 2007/02/05 16:13:40 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.mapper;
@@ -164,8 +164,10 @@ class EntityMapper extends AbstractMapper {
target.addAttribute("discriminator-value", dValue.getValue());
log.debug("DValue " + dValue.getValue());
}
-
- if (table != null) {
+
+ if (table != null && hbClassName.compareTo(INHERITANCE_STRATEGY_NAMES[InheritanceType.SINGLE_TABLE]) == 0) {
+ log.warn("EClass/Entity (" + entityName + ") is mapped as subclass in a single table with its superclass but it also has a table annotation. This table annotation is ignored.");
+ } else if (table != null) {
if (table.getName() != null) {
target.addAttribute("table", getHbmContext().trunc(table.getName(), false));
log.debug("Table " + "`" + table.getName() + "`");

Back to the top