Rereading HQL

SVN: trunk@483

Author: Peter Smulovics

src/NHibernate/Hql/ClauseParser.cs

@@ -16,7 +16,8 @@ public class ClauseParser : IParser {
 		private bool    byExpected = false;
 		private int parenCount = 0;
 
-		public virtual void Token(string token, QueryTranslator q) {
+		public virtual void Token(string token, QueryTranslator q) 
+		{
 			string lcToken = token.ToLower();
 
 			if ( token.Equals(StringHelper.OpenParen ) )
@@ -28,7 +29,8 @@ public virtual void Token(string token, QueryTranslator q) {
 				parenCount--;
 			}
 
-			if (byExpected && !lcToken.Equals("by")) {
+			if (byExpected && !lcToken.Equals("by")) 
+			{
 				throw new QueryException("BY expected after GROUP or ORDER: " + token);
 			}
 
@@ -38,7 +40,7 @@ public virtual void Token(string token, QueryTranslator q) {
 			{
 				if (lcToken.Equals("select")) 
 				{
-					selectTokens      = new ArrayList();
+					selectTokens = new ArrayList();
 					cacheSelectTokens = true;
 				} 
 				else if (lcToken.Equals("from")) 

src/NHibernate/Hql/FilterTranslator.cs

@@ -4,23 +4,27 @@
 using NHibernate.Engine;
 using System.Runtime.CompilerServices;
 
-namespace NHibernate.Hql {
+namespace NHibernate.Hql 
+{
 
-	public class FilterTranslator : QueryTranslator {
-		
+	public class FilterTranslator : QueryTranslator 
+	{
 		public FilterTranslator(Dialect.Dialect d) : base(d)
 		{
 		}
 
-		/// <summary> Compile a filter. This method may be called multiple
+		/// <summary>
+		/// Compile a filter. This method may be called multiple
 		/// times. Subsequent invocations are no-ops.
 		/// </summary>
 		[MethodImpl(MethodImplOptions.Synchronized)]
-		public void Compile(string collectionRole, ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) {
-			if (!compiled) {
-					this.factory = factory; // yick!
-					AddFromCollection("this", collectionRole);
-					base.Compile(factory, queryString, replacements, scalar);
+		public void Compile(string collectionRole, ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) 
+		{
+			if (!compiled) 
+			{
+				this.factory = factory; // yick!
+				AddFromCollection("this", collectionRole);
+				base.Compile(factory, queryString, replacements, scalar);
 			}
 		}
 	}

src/NHibernate/Hql/FromParser.cs

@@ -23,8 +23,6 @@ public class FromParser : IParser {
 		private bool expectingAs;
 		private bool afterJoinType;
 		private bool afterFetch;
-		//TODO: H2.0.3 does not have classPersister as a field...
-		private ILoadable classPersister;
 		private JoinType joinType = JoinType.None;
 
 		private static IDictionary joinTypes = new Hashtable();
@@ -119,11 +117,6 @@ public void Token(string token, QueryTranslator q) {
 					// _after_ the class name or path expression ie using the
 					// AS construction
 
-//					if (classPersister!=null) 
-//					{
-//						q.AddFromClass(token, classPersister);
-//					} 
-					//else if (entityName!=null) 
 					if (entityName!=null) 
 					{
 						q.SetAliasName(token, entityName);
@@ -136,15 +129,14 @@ public void Token(string token, QueryTranslator q) {
 					expectingJoin = true;
 					expectingAs = false;
 					entityName = null;
-					classPersister = null;
-
 				} 
 				else if (afterIn) 
 				{
 					// process the "old" HQL style where aliases appear _first
 					// ie using the IN or IN CLASS constructions
 
 					if (alias==null) throw new QueryException("alias not specified for: " + token);
+
 					if (joinType!=JoinType.None) throw new QueryException("outer or full join must be followed by path expressions");
 
 					if (afterClass) 
@@ -180,7 +172,6 @@ public void Token(string token, QueryTranslator q) {
 					{
 						// starts with the name of a mapped class (new style)
 						if (joinType!=JoinType.None) throw new QueryException("outer or full join must be followed by path expression");
-						classPersister = p;
 						entityName = q.CreateNameFor( p.MappedClass );
 						q.AddFromClass( entityName, p );
 						expectingAs = true;
@@ -197,6 +188,7 @@ public void Token(string token, QueryTranslator q) {
 						// starts with a path expression (new style)
 
 						// force HQL style: from Person p inner join p.cars c
+						//if (joinType==JoinType.None) throw new QueryException("path expression must be preceded by full, left, right or inner join");
 
 						//allow ODMG OQL style: from Person p, p.cars c
 						if (joinType!=JoinType.None)
@@ -239,9 +231,9 @@ public void Token(string token, QueryTranslator q) {
 			}
 		}
 
-		public virtual void  Start(QueryTranslator q) {
+		public virtual void  Start(QueryTranslator q) 
+		{
 			entityName = null;
-			classPersister = null;
 			alias = null;
 			afterIn = false;
 			afterAs = false;
@@ -252,7 +244,8 @@ public virtual void  Start(QueryTranslator q) {
 			joinType = JoinType.None;
 		}
 
-		public virtual void  End(QueryTranslator q) {
+		public virtual void  End(QueryTranslator q) 
+		{
 		}
 	}
 }