Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-530 : followup on parameter handling 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@15268 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Steve Ebersole 2008-10-08 04:13:07 +00:00
parent 959d2814ea
commit ff128ca6f8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/antlr/sql-gen.g
View File

@ -213,7 +213,7 @@ selectExpr
| aggregate | aggregate
| c:constant { out(c); } | c:constant { out(c); }
| arithmeticExpr | arithmeticExpr
| PARAM { out("?"); } | param:PARAM { out(param); }
| sn:SQL_NODE { out(sn); } | sn:SQL_NODE { out(sn); }
| { out("("); } selectStatement { out(")"); } | { out("("); } selectStatement { out(")"); }
; ;

1
core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java
View File

@ -45,7 +45,6 @@ import org.hibernate.sql.InsertSelect;
import org.hibernate.sql.Select; import org.hibernate.sql.Select;
import org.hibernate.sql.SelectFragment; import org.hibernate.sql.SelectFragment;
import org.hibernate.util.StringHelper; import org.hibernate.util.StringHelper;
import org.hibernate.util.EmptyIterator;
import antlr.RecognitionException; import antlr.RecognitionException;
import antlr.collections.AST; import antlr.collections.AST;

7
core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java
View File

@ -131,9 +131,10 @@ public class MultiTableUpdateExecutor extends AbstractStatementExecutor {
try { try {
try { try {
ps = session.getBatcher().prepareStatement( idInsertSelect ); ps = session.getBatcher().prepareStatement( idInsertSelect );
int parameterStart = getWalker().getNumberOfParametersInSetClause(); // int parameterStart = getWalker().getNumberOfParametersInSetClause();
List allParams = getIdSelectParameterSpecifications(); // List allParams = getIdSelectParameterSpecifications();
Iterator whereParams = allParams.subList( parameterStart, allParams.size() ).iterator(); // Iterator whereParams = allParams.subList( parameterStart, allParams.size() ).iterator();
Iterator whereParams = getIdSelectParameterSpecifications().iterator();
int sum = 1; // jdbc params are 1-based int sum = 1; // jdbc params are 1-based
while ( whereParams.hasNext() ) { while ( whereParams.hasNext() ) {
sum += ( ( ParameterSpecification ) whereParams.next() ).bind( ps, parameters, session, sum ); sum += ( ( ParameterSpecification ) whereParams.next() ).bind( ps, parameters, session, sum );