[hibernate-commits] Hibernate SVN: r15270 - in core/branches/Branch_3_2: src/org/hibernate/hql/ast/exec and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2008-10-08 00:28:51 -0400 (Wed, 08 Oct 2008)
New Revision: 15270

Modified:
   core/branches/Branch_3_2/grammar/sql-gen.g
   core/branches/Branch_3_2/src/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java
Log:
HHH-530 : followup on parameter handling

Modified: core/branches/Branch_3_2/grammar/sql-gen.g
===================================================================
--- core/branches/Branch_3_2/grammar/sql-gen.g	2008-10-08 04:20:21 UTC (rev 15269)
+++ core/branches/Branch_3_2/grammar/sql-gen.g	2008-10-08 04:28:51 UTC (rev 15270)
@@ -213,7 +213,7 @@
 	| aggregate
 	| c:constant { out(c); }
 	| arithmeticExpr
-	| PARAM { out("?"); }
+	| param:PARAM { out(param); }
 	| sn:SQL_NODE { out(sn); }
 	| { out("("); } selectStatement { out(")"); }
 	;

Modified: core/branches/Branch_3_2/src/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java	2008-10-08 04:20:21 UTC (rev 15269)
+++ core/branches/Branch_3_2/src/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java	2008-10-08 04:28:51 UTC (rev 15270)
@@ -108,9 +108,10 @@
 			try {
 				try {
 					ps = session.getBatcher().prepareStatement( idInsertSelect );
-					int parameterStart = getWalker().getNumberOfParametersInSetClause();
-					List allParams = getIdSelectParameterSpecifications();
-					Iterator whereParams = allParams.subList( parameterStart, allParams.size() ).iterator();
+//					int parameterStart = getWalker().getNumberOfParametersInSetClause();
+//					List allParams = getIdSelectParameterSpecifications();
+//					Iterator whereParams = allParams.subList( parameterStart, allParams.size() ).iterator();
+					Iterator whereParams = getIdSelectParameterSpecifications().iterator();
 					int sum = 1; // jdbc params are 1-based
 					while ( whereParams.hasNext() ) {
 						sum += ( ( ParameterSpecification ) whereParams.next() ).bind( ps, parameters, session, sum );