Applied NH-2293

SVN: trunk@5166

Author: fabiomaulo

src/NHibernate.Test/NHSpecificTest/NH2293/Fixture.cs

@@ -0,0 +1,27 @@
+using System.Linq;
+using NHibernate.Hql.Ast.ANTLR;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.NHSpecificTest.NH2293
+{
+	public class Fixture : BugTestCase
+	{
+		protected override System.Collections.IList Mappings
+		{
+			get
+			{
+				return Enumerable.Empty<object>().ToList();
+			}
+		}
+
+		[Test]
+		public void WhenQueryHasJustAfromThenThrowQuerySyntaxException()
+		{
+			using (ISession session = OpenSession())
+			{
+				session.Executing(s => s.CreateQuery("from").List()).Throws<QuerySyntaxException>();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -465,6 +465,7 @@
     <Compile Include="NHSpecificTest\NH2266\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2287\Domain.cs" />
     <Compile Include="NHSpecificTest\NH2287\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH2293\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2294\Fixture.cs" />
     <Compile Include="TypesTest\CharClass.cs" />
     <Compile Include="TypesTest\CharClassFixture.cs" />

src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs

@@ -134,8 +134,8 @@ public void WeakKeywords()
 					// Case 2: The current token is after FROM and before '.'.
                     if (t != IDENT && input.LA(-1) == FROM && ((input.LA(2) == DOT) || (input.LA(2) == IDENT) || (input.LA(2) == -1)))
 					{
-						HqlToken hqlToken = (HqlToken)input.LT(1);
-						if (hqlToken.PossibleId)
+						HqlToken hqlToken = input.LT(1) as HqlToken;
+						if (hqlToken != null && hqlToken.PossibleId)
 						{
 							hqlToken.Type = IDENT;
 							if (log.IsDebugEnabled)