[Nhibernate-commit] SF.net SVN: nhibernate:[4232] trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR

[<fab...@us...>]

Revision: 4232
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4232&view=rev
Author:   fabiomaulo
Date:     2009-05-04 22:19:42 +0000 (Mon, 04 May 2009)

Log Message:
-----------
Simplified implementation

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs	2009-05-04 22:01:16 UTC (rev 4231)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs	2009-05-04 22:19:42 UTC (rev 4232)
@@ -3,6 +3,7 @@
 using System.Data;
 using System.Data.Common;
 using Antlr.Runtime;
+using Antlr.Runtime.Tree;
 using log4net;
 using NHibernate.Engine;
 using NHibernate.Exceptions;
@@ -21,17 +22,17 @@
 		private static readonly ILog log = LogManager.GetLogger(typeof(BasicExecutor));
 		private readonly SqlString sql;
 
-		public BasicExecutor(IStatement statement, ITokenStream tokenStream, IQueryable persister)
+		public BasicExecutor(IStatement statement, IQueryable persister)
 			: base(statement, log)
 		{
 			this.persister = persister;
 			try
 			{
-				var generator = new HqlSqlGenerator(statement, tokenStream, Factory);
-				generator.Generate();
-
-				sql = generator.Sql;
-				Parameters = generator.CollectionParameters;
+				var gen = new SqlGenerator(Factory, new CommonTreeNodeStream(statement));
+				gen.statement();
+				sql = gen.GetSQL();
+				gen.ParseErrorHandler.ThrowQueryException();
+				Parameters = gen.GetCollectedParameters();
 			}
 			catch (RecognitionException e)
 			{

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs	2009-05-04 22:01:16 UTC (rev 4231)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs	2009-05-04 22:19:42 UTC (rev 4232)
@@ -407,7 +407,7 @@
 				}
 				else
 				{
-					return new BasicExecutor(statement, _parser.Tokens, persister);
+					return new BasicExecutor(statement, persister);
 				}
 			}
 			else if (walker.StatementType == HqlSqlWalker.UPDATE)
@@ -423,7 +423,7 @@
 				}
 				else
 				{
-					return new BasicExecutor(statement, _parser.Tokens, persister);
+					return new BasicExecutor(statement, persister);
 				}
 			}
 			else if (walker.StatementType == HqlSqlWalker.INSERT)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.