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

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

Revision: 5158
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5158&view=rev
Author:   fabiomaulo
Date:     2010-08-15 15:25:18 +0000 (Sun, 15 Aug 2010)

Log Message:
-----------
Fix NH-2287 (by Jose Romaniello)

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/NH2287/
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Domain.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Fixture.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Mappings.hbm.xml

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs	2010-08-15 13:31:20 UTC (rev 5157)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs	2010-08-15 15:25:18 UTC (rev 5158)
@@ -323,8 +323,8 @@
 			if (input.LA(1) == DOT && input.LA(2) != IDENT)
 			{
 				// See if the second lookahed token can be an identifier.
-				HqlToken t = (HqlToken)input.LT(2);
-				if (t.PossibleId)
+				HqlToken t = input.LT(2) as HqlToken;
+				if (t != null && t.PossibleId)
 				{
 					// Set it!
 					input.LT(2).Type = IDENT;

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Domain.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Domain.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Domain.cs	2010-08-15 15:25:18 UTC (rev 5158)
@@ -0,0 +1,7 @@
+namespace NHibernate.Test.NHSpecificTest.NH2287
+{
+	public class Foo
+	{
+		public string Bar { get; set; }
+	}
+}

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Fixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Fixture.cs	2010-08-15 15:25:18 UTC (rev 5158)
@@ -0,0 +1,20 @@
+using System;
+using NHibernate.Hql.Ast.ANTLR;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.NHSpecificTest.NH2287
+{
+	public class Fixture: BugTestCase
+	{
+		[Test]
+		public void DotInStringLiteralsConstant()
+		{
+			using (ISession session = OpenSession())
+			{
+				var query = string.Format("from Foo f {0}where f.", Environment.NewLine);
+				session.Executing(s => s.CreateQuery(query).List()).Throws<QuerySyntaxException>();
+			}
+		}
+	}
+}

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Mappings.hbm.xml	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2287/Mappings.hbm.xml	2010-08-15 15:25:18 UTC (rev 5158)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   assembly="NHibernate.Test"
+				   namespace="NHibernate.Test.NHSpecificTest.NH2287"
+				   default-lazy="false">
+
+	<class name="Foo">
+		<id type="int">
+			<generator class="native" />
+		</id>
+		<property name="Bar" />
+	</class>
+</hibernate-mapping>

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-08-15 13:31:20 UTC (rev 5157)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-08-15 15:25:18 UTC (rev 5158)
@@ -463,6 +463,8 @@
     <Compile Include="NHSpecificTest\NH2245\Model.cs" />
     <Compile Include="NHSpecificTest\NH2266\Domain.cs" />
     <Compile Include="NHSpecificTest\NH2266\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH2287\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH2287\Fixture.cs" />
     <Compile Include="TypesTest\CharClass.cs" />
     <Compile Include="TypesTest\CharClassFixture.cs" />
     <Compile Include="TypesTest\DateTimeClass.cs" />
@@ -2250,6 +2252,7 @@
     <EmbeddedResource Include="CollectionTest\NullableValueTypeElementMapFixture.hbm.xml" />
     <EmbeddedResource Include="DriverTest\EntityForMs2008.hbm.xml" />
     <Content Include="DynamicEntity\package.html" />
+    <EmbeddedResource Include="NHSpecificTest\NH2287\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2266\Mappings.hbm.xml" />
     <EmbeddedResource Include="TypesTest\CharClass.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1836\Mappings.hbm.xml" />


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