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

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

Revision: 5923
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5923&view=rev
Author:   fabiomaulo
Date:     2011-06-13 15:32:42 +0000 (Mon, 13 Jun 2011)

Log Message:
-----------
First step to remove SqlString.Parameter

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/SqlCommand/SqlString.cs
    trunk/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlStringFixture.cs

Modified: trunk/nhibernate/src/NHibernate/SqlCommand/SqlString.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/SqlCommand/SqlString.cs	2011-06-13 15:18:20 UTC (rev 5922)
+++ trunk/nhibernate/src/NHibernate/SqlCommand/SqlString.cs	2011-06-13 15:32:42 UTC (rev 5923)
@@ -690,19 +690,24 @@
 		{
 			foreach (object part in sqlParts)
 			{
-				string partString = part as string;
-				SqlString partSqlString = part as SqlString;
+				var partString = part as string;
 				if (partString != null)
 				{
 					visitor.String(partString);
+					continue;
 				}
-				else if (partSqlString != null && !SqlString.Parameter.Equals(partSqlString))
+
+				var partSqlString = part as SqlString;
+				if (partSqlString != null)
 				{
 					visitor.String(partSqlString);
+					continue;
 				}
-				else
+
+				var partParameter = part as Parameter;
+				if(partParameter != null)
 				{
-					visitor.Parameter((Parameter)part);
+					visitor.Parameter(partParameter);
 				}
 			}
 		}

Modified: trunk/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlStringFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlStringFixture.cs	2011-06-13 15:18:20 UTC (rev 5922)
+++ trunk/nhibernate/src/NHibernate.Test/SqlCommandTest/SqlStringFixture.cs	2011-06-13 15:32:42 UTC (rev 5923)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using NHibernate.SqlCommand;
 using NUnit.Framework;
+using SharpTestsEx;
 
 namespace NHibernate.Test.SqlCommandTest
 {
@@ -374,10 +375,10 @@
 			Parameter[] parameters1 = new Parameter[1];
 			Parameter[] parameters2 = new Parameter[1];
 			
-			SqlString parameterString1 = SqlString.Parameter;
+			SqlString parameterString1 = new SqlString(Parameter.Placeholder);
 			parameterString1.Parts.CopyTo(parameters1, 0);
 
-			SqlString parameterString2 = SqlString.Parameter;
+			SqlString parameterString2 = new SqlString(Parameter.Placeholder);
 			parameterString2.Parts.CopyTo(parameters2, 0);
 
 			Assert.AreEqual(parameterString1, parameterString2);
@@ -385,6 +386,9 @@
 
 			parameters1[0].ParameterPosition = 231;
 			Assert.IsNull(parameters2[0].ParameterPosition);
+
+			// more simple version of the test
+			Parameter.Placeholder.Should().Not.Be.SameInstanceAs(Parameter.Placeholder);
 		}
 	}
 }


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