Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4569] branches/2.1.x/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2009-07-04 15:42:37
|
Revision: 4569
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4569&view=rev
Author: fabiomaulo
Date: 2009-07-04 15:42:33 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
Fix NH-1859
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/NH1859/
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml
branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.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-07-04 05:06:59 UTC (rev 4568)
+++ branches/2.1.x/nhibernate/src/NHibernate/Engine/Query/ParameterParser.cs 2009-07-04 15:42:33 UTC (rev 4569)
@@ -56,7 +56,7 @@
// check comments
if (indx + 1 < stringLength && sqlString.Substring(indx,2) == "/*")
{
- var closeCommentIdx = sqlString.IndexOf("*/");
+ var closeCommentIdx = sqlString.IndexOf("*/", indx+2);
recognizer.Other(sqlString.Substring(indx, (closeCommentIdx- indx)+2));
indx = closeCommentIdx + 1;
continue;
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/DomainClass.cs 2009-07-04 15:42:33 UTC (rev 4569)
@@ -0,0 +1,7 @@
+namespace NHibernate.Test.NHSpecificTest.NH1859
+{
+ public class DomainClass
+ {
+ public int Id { get; set; }
+ }
+}
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/Mappings.hbm.xml 2009-07-04 15:42:33 UTC (rev 4569)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+ namespace="NHibernate.Test.NHSpecificTest.NH1859"
+ default-lazy="false">
+ <class name="DomainClass">
+ <id name="Id">
+ <generator class="assigned" />
+ </id>
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Added: branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs (rev 0)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1859/SampleTest.cs 2009-07-04 15:42:33 UTC (rev 4569)
@@ -0,0 +1,40 @@
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1859
+{
+ [TestFixture]
+ public class SampleTest : BugTestCase
+ {
+ protected override void OnSetUp()
+ {
+ base.OnSetUp();
+ using (ISession session = OpenSession())
+ {
+ session.Save(new DomainClass {Id = 1});
+ session.Flush();
+ }
+ }
+
+ protected override void OnTearDown()
+ {
+ base.OnTearDown();
+ using (ISession session = OpenSession())
+ {
+ session.Delete("from DomainClass");
+ session.Flush();
+ }
+ }
+
+ [Test]
+ public void NativeQueryWithTwoComments()
+ {
+ using (ISession session = OpenSession())
+ {
+ IQuery qry = session.CreateSQLQuery("select /* first comment */ o.* /* second comment*/ from domainclass o")
+ .AddEntity("o", typeof (DomainClass));
+ var res = qry.List<DomainClass>();
+ Assert.AreEqual(res[0].Id, 1);
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 05:06:59 UTC (rev 4568)
+++ branches/2.1.x/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-07-04 15:42:33 UTC (rev 4569)
@@ -523,6 +523,8 @@
<Compile Include="NHSpecificTest\NH1837\Order.cs" />
<Compile Include="NHSpecificTest\NH1850\Customer.cs" />
<Compile Include="NHSpecificTest\NH1850\Fixture.cs" />
+ <Compile Include="NHSpecificTest\NH1859\DomainClass.cs" />
+ <Compile Include="NHSpecificTest\NH1859\SampleTest.cs" />
<Compile Include="NHSpecificTest\NH1864\Fixture.cs" />
<Compile Include="NHSpecificTest\NH1864\Model.cs" />
<Compile Include="NHSpecificTest\NH473\Child.cs" />
@@ -1935,6 +1937,7 @@
<EmbeddedResource Include="Bytecode\Lightweight\ProductLine.hbm.xml" />
<EmbeddedResource Include="DriverTest\MultiTypeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1859\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1864\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1850\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1192\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
