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

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

Revision: 4937
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4937&view=rev
Author:   ayenderahien
Date:     2010-01-27 15:07:21 +0000 (Wed, 27 Jan 2010)

Log Message:
-----------
Fixing NH-2077

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Hql/Classic/ParserHelper.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Fixture.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Mappings.hbm.xml
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Model.cs

Modified: trunk/nhibernate/src/NHibernate/Hql/Classic/ParserHelper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Classic/ParserHelper.cs	2010-01-27 14:40:36 UTC (rev 4936)
+++ trunk/nhibernate/src/NHibernate/Hql/Classic/ParserHelper.cs	2010-01-27 15:07:21 UTC (rev 4937)
@@ -7,7 +7,7 @@
 	{
 		public const string HqlVariablePrefix = ":";
 
-		public const string HqlSeparators = " \n\r\f\t,()=<>&|+-=/*'^![]#~\\";
+		public const string HqlSeparators = " \n\r\f\t,()=<>&|+-=/*'^![]#~\\;";
 		//NOTICE: no " or . since they are part of (compound) identifiers
 
 		public const string PathSeparators = ".";


Property changes on: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077
___________________________________________________________________
Added: bugtraq:url
   + http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:logregex
   + NH-\d+


Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Fixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Fixture.cs	2010-01-27 15:07:21 UTC (rev 4937)
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Transactions;
+using NHibernate.Dialect;
+using NHibernate.Impl;
+using NUnit.Framework;
+using NHibernate.Criterion;
+
+namespace NHibernate.Test.NHSpecificTest.NH2077
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+
+		protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
+		{
+			return dialect is MsSql2000Dialect;
+		}
+     
+		[Test]
+      	public void CanExecuteMultipleQueriesUsingNativeSQL()
+		{
+            using (var s = OpenSession())
+            {
+            	s.CreateSQLQuery(
+					@"
+DELETE FROM Person WHERE Id = :userId; 
+UPDATE Person SET Id = :deletedUserId WHERE Id = :userId; 
+DELETE FROM Person WHERE Id = :userId; 
+")
+ .SetParameter("userId",1)
+ .SetParameter("deletedUserId", 1)
+            		.ExecuteUpdate();
+            }
+		} 
+
+	}
+}

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Mappings.hbm.xml	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Mappings.hbm.xml	2010-01-27 15:07:21 UTC (rev 4937)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+									 assembly="NHibernate.Test"
+									 namespace="NHibernate.Test.NHSpecificTest.NH2077">
+
+	<class name="Person">
+		<id name="Id">
+			<generator class="increment" />
+		</id>
+		<property name="Name"/>
+
+    <set name="Children">
+      <key column="ParentId"/>
+      <one-to-many class="Person"/>
+    </set>
+	</class>
+
+</hibernate-mapping>

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Model.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2077/Model.cs	2010-01-27 15:07:21 UTC (rev 4937)
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH2077
+{
+	public class Person
+	{ 
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+        public virtual ICollection<Person> Children { get; set; }
+	} 
+
+}

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-01-27 14:40:36 UTC (rev 4936)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-01-27 15:07:21 UTC (rev 4937)
@@ -700,6 +700,8 @@
     <Compile Include="NHSpecificTest\NH2030\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2065\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2065\Model.cs" />
+    <Compile Include="NHSpecificTest\NH2077\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH2077\Model.cs" />
     <Compile Include="NHSpecificTest\NH473\Child.cs" />
     <Compile Include="NHSpecificTest\NH473\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH473\Parent.cs" />
@@ -2117,6 +2119,7 @@
     <EmbeddedResource Include="CfgTest\Loquacious\EntityToCache.hbm.xml" />
     <EmbeddedResource Include="DriverTest\SqlServerCeEntity.hbm.xml" />
     <Content Include="DynamicEntity\package.html" />
+    <EmbeddedResource Include="NHSpecificTest\NH2077\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2020\Mappings.hbm.xml" />
     <EmbeddedResource Include="GhostProperty\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2065\Mappings.hbm.xml" />


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