Author: dgeraskov Date: 2009-08-19 10:56:24 -0400 (Wed, 19 Aug 2009) New Revision: 17162 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java Log: https://jira.jboss.org/jira/browse/JBIDE-4761 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2009-08-19 14:53:59 UTC (rev 17161) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2009-08-19 14:56:24 UTC (rev 17162) @@ -15,6 +15,7 @@ import org.eclipse.jpt.core.context.JoinColumn; import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.core.internal.context.MappingTools; +import org.eclipse.jpt.db.Database; import org.eclipse.jpt.db.Table; import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; @@ -99,12 +100,16 @@ NamingStrategy namingStrategy = ((HibernateJpaProject)targetEntity.getJpaProject()).getNamingStrategy(); if (namingStrategy != null){ - String logicalTargetColumnName = namingStrategy.logicalColumnName(targetColumnName, prefix); + String logicalTargetColumnName = null; + if (targetColumnName != null || prefix != null){ + logicalTargetColumnName = namingStrategy.logicalColumnName(targetColumnName, prefix); + } String name = namingStrategy.foreignKeyColumnName(prefix, targetEntity.getPersistentType().getName(), targetEntity.getPrimaryTableName(), logicalTargetColumnName); - return targetEntity.getPrimaryDbTable().getDatabase().convertNameToIdentifier(name); + Table t = targetEntity.getPrimaryDbTable(); + return t != null ? t.getDatabase().convertNameToIdentifier(name) : name; } if (prefix == null) { prefix = targetEntityName; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-19 14:53:59 UTC (rev 17161) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-19 14:56:24 UTC (rev 17162) @@ -518,7 +518,10 @@ String name = ns.joinKeyColumnName(parentEntity.getPrimaryKeyColumnName(), parentEntity.getPrimaryTableName()); - return parentEntity.getPrimaryDbTable().getDatabase().convertNameToIdentifier(name) ; + if (parentEntity.getPrimaryDbTable() != null){ + return parentEntity.getPrimaryDbTable().getDatabase().convertNameToIdentifier(name); + } + return name ; } } }