[Nhibernate-commit] SF.net SVN: nhibernate:[5166] trunk/nhibernate/src/NHibernate

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

Revision: 5166
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5166&view=rev
Author:   fabiomaulo
Date:     2010-08-24 21:37:17 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
Applied NH-2293

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2293/
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2293/Fixture.cs

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs	2010-08-24 21:28:41 UTC (rev 5165)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs	2010-08-24 21:37:17 UTC (rev 5166)
@@ -134,8 +134,8 @@
 					// 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)

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2293/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2293/Fixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2293/Fixture.cs	2010-08-24 21:37:17 UTC (rev 5166)
@@ -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>();
+			}
+		}
+	}
+}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-08-24 21:28:41 UTC (rev 5165)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-08-24 21:37:17 UTC (rev 5166)
@@ -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" />


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