NH-2408 - Fix locks application to tables with schema and/or catalog names and correct handle quoted table names in union subclasses by MsSql2000Dialect.LockHintAppender

Author: hazzik

src/NHibernate.Test/DialectTest/LockHintAppenderFixture.cs

@@ -55,7 +55,37 @@ public void ShouldIgnoreCasing()
 		{
 			const string expectedQuery =
 				"select Id, Name FROM (select Id, Name FROM Employee with (updlock, rowlock) union all select Id, Name from Manager with (updlock, rowlock)) as person";
-			
+
+			var result = _appender.AppendLockHint(new SqlString(expectedQuery.Replace(MsSql2000LockHint, string.Empty)));
+			Assert.That(result.ToString(), Is.EqualTo(expectedQuery));
+		}
+
+		[Test]
+		public void ShouldHandleExplicitSchemas()
+		{
+			const string expectedQuery =
+				"select Id, Name from (select Id, Name FROM dbo.Employee with (updlock, rowlock) union all select Id, Name from Manager with (updlock, rowlock)) as person";
+
+			var result = _appender.AppendLockHint(new SqlString(expectedQuery.Replace(MsSql2000LockHint, string.Empty)));
+			Assert.That(result.ToString(), Is.EqualTo(expectedQuery));
+		}
+
+		[Test]
+		public void ShouldHandleExplicitSchemasAndDbNames()
+		{
+			const string expectedQuery =
+				"select Id, Name from (select Id, Name FROM nhibernate.dbo.Employee with (updlock, rowlock) union all select Id, Name from Manager with (updlock, rowlock)) as person";
+
+			var result = _appender.AppendLockHint(new SqlString(expectedQuery.Replace(MsSql2000LockHint, string.Empty)));
+			Assert.That(result.ToString(), Is.EqualTo(expectedQuery));
+		}
+
+		[Test]
+		public void ShouldHandleExplicitSchemasAndDbNamesWithSpacesBetweenNameParts()
+		{
+			const string expectedQuery =
+				"select Id, Name from (select Id, Name FROM nhibernate .dbo. Employee with (updlock, rowlock) union all select Id, Name from Manager with (updlock, rowlock)) as person";
+
 			var result = _appender.AppendLockHint(new SqlString(expectedQuery.Replace(MsSql2000LockHint, string.Empty)));
 			Assert.That(result.ToString(), Is.EqualTo(expectedQuery));
 		}
@@ -70,6 +100,26 @@ public void ShouldHandleEscapingInSubselect()
 			Assert.That(result.ToString(), Is.EqualTo(expectedQuery));
 		}
 
+		[Test]
+		public void ShouldHandleEscapingWithWhitespacesInSubselect()
+		{
+			const string expectedQuery =
+				"select Id, Name from (select Id, Name from [Empl oyee] with (updlock, rowlock) union all select Id, Name from [Man ager] with (updlock, rowlock)) as person";
+
+			var result = _appender.AppendLockHint(new SqlString(expectedQuery.Replace(MsSql2000LockHint, string.Empty)));
+			Assert.That(result.ToString(), Is.EqualTo(expectedQuery));
+		}
+
+		[Test]
+		public void ShouldHandleEscapingWithSquareBracketsInSubselect()
+		{
+			const string expectedQuery =
+				"select Id, Name from (select Id, Name from [Empl ]]oyee] with (updlock, rowlock) union all select Id, Name from [Manager] with (updlock, rowlock)) as person";
+
+			var result = _appender.AppendLockHint(new SqlString(expectedQuery.Replace(MsSql2000LockHint, string.Empty)));
+			Assert.That(result.ToString(), Is.EqualTo(expectedQuery));
+		}
+
 		[Test]
 		public void ShouldHandleMultilineQuery()
 		{

src/NHibernate/Dialect/MsSql2000Dialect.cs

@@ -519,7 +519,13 @@ public override bool IsKnownToken(string currentToken, string nextToken)
 
 		public struct LockHintAppender
 		{
-			private static readonly Regex FromClauseTableNameRegex = new Regex(@"from\s+\[?(\w+)\]?", RegexOptions.IgnoreCase | RegexOptions.Multiline);
+			private const string UnescapedNameRegex = @"\w+";
+			private const string EscapedNameRegex = @"\[([^\]]|\]\])+\]";
+			private const string NameRegex = "(" + UnescapedNameRegex + "|" + EscapedNameRegex + ")";
+			private const string NameSeparatorRegex = @"\s*\.\s*";
+			private const string FromTableNameRegex = @"from\s+(" + NameRegex + NameSeparatorRegex + "){0,2}" + NameRegex;
+
+			private static readonly Regex FromClauseTableNameRegex = new Regex(FromTableNameRegex, RegexOptions.IgnoreCase | RegexOptions.Multiline);
 
 			private readonly MsSql2000Dialect _dialect;
 			private readonly IDictionary<string, LockMode> _aliasedLockModes;
@@ -546,7 +552,7 @@ public SqlString AppendLockHint(SqlString sql)
 			{
 				var result = new SqlStringBuilder();
 
-				foreach (object part in sql.Parts)
+				foreach (object part in sql)
 				{
 					if (part == Parameter.Placeholder)
 					{