[Hibernate-commits] Hibernate Code SVN: r10034 - trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations

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

Author: epbernard
Date: 2006-06-21 08:50:39 -0400 (Wed, 21 Jun 2006)
New Revision: 10034

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/QueryBinder.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java
Log:
Allow annotations to compile with last core change
Native queries are broken though

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/QueryBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/QueryBinder.java	2006-06-21 06:23:30 UTC (rev 10033)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/QueryBinder.java	2006-06-21 12:50:39 UTC (rev 10034)
@@ -24,9 +24,8 @@
 import org.hibernate.cfg.NotYetImplementedException;
 import org.hibernate.engine.NamedQueryDefinition;
 import org.hibernate.engine.NamedSQLQueryDefinition;
-import org.hibernate.loader.custom.SQLQueryReturn;
-import org.hibernate.loader.custom.SQLQueryRootReturn;
-import org.hibernate.loader.custom.SQLQueryScalarReturn;
+import org.hibernate.engine.query.sql.NativeSQLQueryReturn;
+import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn;
 
 /**
  * Query binder
@@ -97,12 +96,11 @@
 		else if ( ! void.class.equals( queryAnn.resultClass() ) ) {
 			//class mapping usage
 			//FIXME should be done in a second pass due to entity name?
-			final SQLQueryRootReturn entityQueryReturn =
-					new SQLQueryRootReturn( "alias1", queryAnn.resultClass().getName(), new HashMap(), LockMode.READ );
+			final NativeSQLQueryRootReturn entityQueryReturn =
+					new NativeSQLQueryRootReturn( "alias1", queryAnn.resultClass().getName(), new HashMap(), LockMode.READ );
 			query = new NamedSQLQueryDefinition(
 					queryName,
-					new SQLQueryReturn[]{entityQueryReturn},
-					new SQLQueryScalarReturn[0],
+					new NativeSQLQueryReturn[]{entityQueryReturn},
 					null,
 					getBoolean( queryName, "org.hibernate.cacheable", hints ),
 					getString( queryName, "org.hibernate.cacheRegion", hints ),
@@ -159,12 +157,11 @@
 		else if ( ! void.class.equals( queryAnn.resultClass() ) ) {
 			//class mapping usage
 			//FIXME should be done in a second pass due to entity name?
-			final SQLQueryRootReturn entityQueryReturn =
-					new SQLQueryRootReturn( "alias1", queryAnn.resultClass().getName(), new HashMap(), LockMode.READ );
+			final NativeSQLQueryRootReturn entityQueryReturn =
+					new NativeSQLQueryRootReturn( "alias1", queryAnn.resultClass().getName(), new HashMap(), LockMode.READ );
 			query = new NamedSQLQueryDefinition(
 					queryAnn.query(),
-					new SQLQueryReturn[]{entityQueryReturn},
-					new SQLQueryScalarReturn[0],
+					new NativeSQLQueryReturn[]{entityQueryReturn},
 					null,
 					queryAnn.cacheable(),
 					AnnotationBinder.isDefault( queryAnn.cacheRegion() ) ? null : queryAnn.cacheRegion(),

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java	2006-06-21 06:23:30 UTC (rev 10033)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java	2006-06-21 12:50:39 UTC (rev 10034)
@@ -21,8 +21,8 @@
 import org.hibernate.cfg.ExtendedMappings;
 import org.hibernate.cfg.QuerySecondPass;
 import org.hibernate.engine.ResultSetMappingDefinition;
-import org.hibernate.loader.custom.SQLQueryRootReturn;
-import org.hibernate.loader.custom.SQLQueryScalarReturn;
+import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn;
+import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
@@ -141,15 +141,15 @@
 			}
 
 			propertyresults = propertyresults.isEmpty() ? CollectionHelper.EMPTY_MAP : propertyresults;
-			SQLQueryRootReturn result =
-					new SQLQueryRootReturn(
+			NativeSQLQueryRootReturn result =
+					new NativeSQLQueryRootReturn(
 							"alias" + entityAliasIndex++, entity.entityClass().getName(), propertyresults, LockMode.READ
 					);
-			definition.addEntityQueryReturn( result );
+			definition.addQueryReturn( result );
 		}
 
 		for ( ColumnResult column : ann.columns() ) {
-			definition.addScalarQueryReturn( new SQLQueryScalarReturn( column.name(), null ) );
+			definition.addQueryReturn( new NativeSQLQueryScalarReturn( column.name(), null ) );
 		}
 
 		if (isDefault) {