[Hibernate-commits] Hibernate SVN: r10231 - in trunk/HibernateExt/tools/src: templates/dao test/org/hibernate/tool/hbm2x

[<hib...@li...>]

Author: max...@jb...
Date: 2006-08-08 09:31:56 -0400 (Tue, 08 Aug 2006)
New Revision: 10231

Modified:
   trunk/HibernateExt/tools/src/templates/dao/daohome.ftl
   trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2DaoTest.java
Log:
HBX-714  Double methods generated in dao layer for named queries with pojo names starting with the same name

Modified: trunk/HibernateExt/tools/src/templates/dao/daohome.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/dao/daohome.ftl	2006-08-06 16:12:09 UTC (rev 10230)
+++ trunk/HibernateExt/tools/src/templates/dao/daohome.ftl	2006-08-08 13:31:56 UTC (rev 10231)
@@ -220,7 +220,7 @@
         }
     } 
 <#foreach queryName in cfg.namedQueries.keySet()>
-<#if queryName.startsWith(clazz.entityName)>
+<#if queryName.startsWith(clazz.entityName + ".")>
 <#assign methname = c2j.unqualify(queryName)>
 <#assign params = cfg.namedQueries.get(queryName).parameterTypes><#assign argList = c2j.asFinderArgumentList(params, clazz)>
 <#if jdk5 && methname.startsWith("find")>

Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2DaoTest.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2DaoTest.java	2006-08-06 16:12:09 UTC (rev 10230)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2DaoTest.java	2006-08-08 13:31:56 UTC (rev 10231)
@@ -56,6 +56,11 @@
         
 	}
 
+	public void testNamedQueries() {
+		
+		assertTrue(findFirstString("findByNameAndAddress",new File(getOutputDir(), "org/hibernate/tool/hbm2x/AuthorHome.java") ).trim().startsWith( "public List" ) );
+	}
+	
 	protected String getBaseForMappings() {
 		return "org/hibernate/tool/hbm2x/";
 	}