[Hibernate-commits] Hibernate Code SVN: r10030 - in trunk/HibernateExt/tools/src: java/org/hibernate/tool/hbm2x templates/hbm

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

Author: max...@jb...
Date: 2006-06-20 07:52:41 -0400 (Tue, 20 Jun 2006)
New Revision: 10030

Modified:
   trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2HbmTool.java
   trunk/HibernateExt/tools/src/templates/hbm/sql-query.hbm.ftl
Log:
update to latest core native sql changes

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2HbmTool.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2HbmTool.java	2006-06-20 10:56:01 UTC (rev 10029)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2HbmTool.java	2006-06-20 11:52:41 UTC (rev 10030)
@@ -12,10 +12,10 @@
 import org.hibernate.FetchMode;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.Versioning;
-import org.hibernate.loader.custom.SQLQueryCollectionReturn;
-import org.hibernate.loader.custom.SQLQueryJoinReturn;
-import org.hibernate.loader.custom.SQLQueryReturn;
-import org.hibernate.loader.custom.SQLQueryRootReturn;
+import org.hibernate.engine.query.sql.NativeSQLQueryCollectionReturn;
+import org.hibernate.engine.query.sql.NativeSQLQueryJoinReturn;
+import org.hibernate.engine.query.sql.NativeSQLQueryReturn;
+import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Formula;
@@ -138,23 +138,38 @@
 		return nsqlqry == null || nsqlqry.isEmpty() ? false : true;
 	}
 	
-	public String getNamedSQLReturnTag(SQLQueryReturn sqlret) {
+	public String getNamedSQLReturnTag(NativeSQLQueryReturn sqlret) {
 		String retVal = "return";
-		if (isNamedSQLReturnRole(sqlret) ) retVal = "return-join";
-		else if (isNamedSQLReturnCollection(sqlret) ) retVal = "load-collection";
+		if (isNamedSQLReturnRole(sqlret) ) {
+			retVal = "return-join";
+		}
+		else if (isNamedSQLReturnCollection(sqlret) ) {
+			retVal = "load-collection";
+		}
 		return retVal;
 	}
 	
-	public boolean isNamedSQLReturnRoot(SQLQueryReturn sqlret) {
-		return sqlret instanceof SQLQueryRootReturn;
+	public String getNamedSQLReturnProperty(NativeSQLQueryJoinReturn o) {
+		/*if(o instanceof NativeSQLQueryCollectionReturn) {
+			return ((NativeSQLQueryCollectionReturn)o).getOwnerEntityName() + "." + ((NativeSQLQueryCollectionReturn)o).getOwnerProperty();
+		}*/
+		return o.getOwnerAlias() + "." + o.getOwnerProperty();		
 	}
 	
-	public boolean isNamedSQLReturnCollection(SQLQueryReturn sqlret) {
-		return sqlret instanceof SQLQueryCollectionReturn;
+	public String getNamedSQLReturnRole(NativeSQLQueryCollectionReturn o) {
+		return o.getOwnerEntityName() + "." + o.getOwnerProperty();
 	}
+	
+	public boolean isNamedSQLReturnRoot(NativeSQLQueryReturn sqlret) {
+		return sqlret instanceof NativeSQLQueryRootReturn;
+	}
+	
+	public boolean isNamedSQLReturnCollection(NativeSQLQueryReturn sqlret) {
+		return sqlret instanceof NativeSQLQueryCollectionReturn;
+	}
 
-	public boolean isNamedSQLReturnRole(SQLQueryReturn sqlret) {
-		return sqlret instanceof SQLQueryJoinReturn;
+	public boolean isNamedSQLReturnRole(NativeSQLQueryReturn sqlret) {
+		return sqlret instanceof NativeSQLQueryJoinReturn;
 	}
 
 	public boolean isFilterDefinitions(Configuration cfg) {

Modified: trunk/HibernateExt/tools/src/templates/hbm/sql-query.hbm.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/hbm/sql-query.hbm.ftl	2006-06-20 10:56:01 UTC (rev 10029)
+++ trunk/HibernateExt/tools/src/templates/hbm/sql-query.hbm.ftl	2006-06-20 11:52:41 UTC (rev 10030)
@@ -1,4 +1,6 @@
-<#foreach queryKey in cfg.namedSQLQueries.keySet()><#assign queryDef = cfg.namedSQLQueries.get(queryKey)>    <sql-query 
+<#foreach queryKey in cfg.namedSQLQueries.keySet()>
+<#assign queryDef = cfg.namedSQLQueries.get(queryKey)>
+    <sql-query 
         name="${queryKey}"
 <#if queryDef.flushMode?exists>
         flush-mode="${queryDef.flushMode.toString().toLowerCase()}"