[Nhibernate-commit] SF.net SVN: nhibernate:[4690] branches/2.1.x/nhibernate/src/NHibernate

[<aye...@us...>]

Revision: 4690
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4690&view=rev
Author:   ayenderahien
Date:     2009-08-14 05:26:21 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
Fixing NH-1928

Modified Paths:
--------------
    branches/2.1.x/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs
    branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/
    branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Fixture.cs
    branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Mappings.hbm.xml
    branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Model.cs

Modified: branches/2.1.x/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs	2009-08-13 11:56:42 UTC (rev 4689)
+++ branches/2.1.x/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs	2009-08-14 05:26:21 UTC (rev 4690)
@@ -64,7 +64,17 @@
 				if (afterNewLine && (indx + 1 < stringLength) && sqlString.Substring(indx, 2) == "--")
 				{
 					var closeCommentIdx = sqlString.IndexOf(Environment.NewLine, indx + 2);
-					recognizer.Other(sqlString.Substring(indx, closeCommentIdx - indx));
+					string comment;
+					if (closeCommentIdx == -1)
+					{
+						closeCommentIdx = sqlString.Length;
+						comment = sqlString.Substring(indx);
+					}
+					else
+					{
+						comment = sqlString.Substring(indx, closeCommentIdx - indx + Environment.NewLine.Length);
+					}
+					recognizer.Other(comment);
 					indx = closeCommentIdx + NewLineLength - 1;
 					continue;
 				}


Property changes on: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Fixture.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Fixture.cs	                        (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Fixture.cs	2009-08-14 05:26:21 UTC (rev 4690)
@@ -0,0 +1,73 @@
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1928
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+        [Test]
+        public void SqlCommentAtBeginningOfLine()
+        {
+            using (ISession session = OpenSession())
+            using (ITransaction tx = session.BeginTransaction())
+            {
+                var query = session.CreateSQLQuery(
+                    @"
+select 1
+from 
+    Customer 
+where
+-- this is a comment
+    Name = 'Joe'
+    and Age > 50
+");
+   
+                Assert.DoesNotThrow(() => query.List());
+                tx.Commit();
+            }
+        }
+
+		[Test]
+		public void SqlCommentAtBeginningOfLastLine()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction tx = session.BeginTransaction())
+			{
+				var query = session.CreateSQLQuery(
+					@"
+select 1
+from 
+    Customer 
+where
+    Name = 'Joe'
+    and Age > 50
+-- this is a comment");
+
+				Assert.DoesNotThrow(() => query.List());
+				tx.Commit();
+			}
+		}
+
+        [Test]
+        public void SqlCommentAfterBeginningOfLine()
+        {
+            using (ISession session = OpenSession())
+            using (ITransaction tx = session.BeginTransaction())
+            {
+                var query = session.CreateSQLQuery(
+                    @"
+select 1
+from 
+    Customer 
+where
+ -- this is a comment
+    Name = 'Joe'
+    and Age > 50
+");
+
+                Assert.DoesNotThrow(() => query.List());
+                tx.Commit();
+            }
+        }
+    }
+}

Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Mappings.hbm.xml
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Mappings.hbm.xml	                        (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Mappings.hbm.xml	2009-08-14 05:26:21 UTC (rev 4690)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+									 assembly="NHibernate.Test"
+									 namespace="NHibernate.Test.NHSpecificTest.NH1928">
+
+  <class name="Customer" >
+    <id name="ID" type="Int32">
+      <generator class="hilo" />
+    </id>
+
+    <property name="Age" type="Int32" />
+    <property name="Name" type="String" />
+  </class>
+
+</hibernate-mapping>

Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Model.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Model.cs	                        (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1928/Model.cs	2009-08-14 05:26:21 UTC (rev 4690)
@@ -0,0 +1,9 @@
+namespace NHibernate.Test.NHSpecificTest.NH1928
+{
+    public class Customer 
+    {
+        public virtual int ID { get; private set; }
+        public virtual string Name { get; set; }
+        public virtual int Age { get; set; }
+    }
+}

Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-08-13 11:56:42 UTC (rev 4689)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-08-14 05:26:21 UTC (rev 4690)
@@ -359,6 +359,8 @@
     <Compile Include="NHSpecificTest\ElementsEnums\IntEnumsBagPartialNameFixture.cs" />
     <Compile Include="NHSpecificTest\ElementsEnums\IntEnumsBagFixture.cs" />
     <Compile Include="NHSpecificTest\ElementsEnums\Something.cs" />
+    <Compile Include="NHSpecificTest\NH1928\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1928\Model.cs" />
     <Compile Include="NHSpecificTest\NH1044\Domain.cs" />
     <Compile Include="NHSpecificTest\NH1044\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH1069\Domain.cs" />
@@ -1964,6 +1966,7 @@
     <EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
     <EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
     <Content Include="DynamicEntity\package.html" />
+    <EmbeddedResource Include="NHSpecificTest\NH1928\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1914\Mappings.hbm.xml" />
     <EmbeddedResource Include="IdTest\AssignedClass.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1904\Mappings.hbm.xml" />


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