|
From: <hib...@li...> - 2006-05-11 09:16:52
|
Author: max...@jb...
Date: 2006-05-11 05:16:38 -0400 (Thu, 11 May 2006)
New Revision: 9924
Modified:
trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java
trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java
trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml
Log:
HBX-658
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java 2006-05-11 05:44:27 UTC (rev 9923)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java 2006-05-11 09:16:38 UTC (rev 9924)
@@ -318,7 +318,16 @@
String className = (String) tableToClassName.get(tableIdentifier);
if(className!=null) {
- return className;
+ if(className.indexOf( "." )>=0) {
+ return className;
+ } else {
+ String packageName = getPackageName(tableIdentifier);
+ if(packageName==null) {
+ return className;
+ } else {
+ return StringHelper.qualify(packageName, className);
+ }
+ }
}
String packageName = getPackageName(tableIdentifier);
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java 2006-05-11 05:44:27 UTC (rev 9923)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java 2006-05-11 09:16:38 UTC (rev 9924)
@@ -246,6 +246,9 @@
assertEquals("org.werd.Q", repository.tableToClassName(new TableIdentifier("q","Werd", "Q") ) );
assertEquals("Notknown", repository.tableToClassName(new TableIdentifier(null,null, "notknown") ) );
+ assertEquals("org.werd.MyWorld", repository.tableToClassName(new TableIdentifier(null,"Werd", "TBL_PKG") ) );
+ assertEquals("other.MyWorld", repository.tableToClassName(new TableIdentifier(null,"Werd", "TBL_OTHER") ) );
+
}
public Table findTable(String name) {
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml 2006-05-11 05:44:27 UTC (rev 9923)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml 2006-05-11 09:16:38 UTC (rev 9924)
@@ -79,7 +79,9 @@
<column name="EXCOLUMN" exclude="true"/>
</table>
- <table name="TblTest" class="org.test.Test"/>
-
+ <table name="TblTest" class="org.test.Test"/>
+
+ <table schema="Werd" name="TBL_PKG" class="MyWorld"/>
+ <table schema="Werd" name="TBL_OTHER" class="other.MyWorld"/>
</hibernate-reverse-engineering>
\ No newline at end of file
|