More persister refactorings. As a byproduct, internals were modified to support components with insert/update="false" and using formulas for individual columns of a multi-column type, but the functionality is incomplete and untested.

SVN: trunk@1978

Author: Sergey Koshcheyev

src/NHibernate.Test/ExpressionTest/BetweenExpressionFixture.cs

@@ -1,15 +1,14 @@
 using System;
-using System.Data;
-using System.Text;
 
-using NHibernate.Engine;
-using NExpression = NHibernate.Expression;
+using NHibernate.DomainModel;
+using NHibernate.Expression;
 using NHibernate.SqlCommand;
-using NHibernate.Type;
+using NHibernate.SqlTypes;
 
-using NHibernate.DomainModel;
 using NUnit.Framework;
 
+using NExpression = NHibernate.Expression;
+
 namespace NHibernate.Test.ExpressionTest
 {
 	/// <summary>
@@ -19,27 +18,26 @@ namespace NHibernate.Test.ExpressionTest
 	public class BetweenExpressionFixture : BaseExpressionFixture
 	{
 		[Test]
-		public void BetweenSqlStringTest() 
+		public void BetweenSqlStringTest()
 		{
 			ISession session = factory.OpenSession();
-			
-			NExpression.ICriterion betweenExpression = NExpression.Expression.Between("Count", 5, 10);
-			SqlString sqlString = betweenExpression.ToSqlString(factoryImpl, typeof(Simple), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
 
+			ICriterion betweenExpression = Expression.Expression.Between( "Count", 5, 10 );
+			SqlString sqlString = betweenExpression.ToSqlString( factoryImpl, typeof( Simple ), "simple_alias", BaseExpressionFixture.EmptyAliasClasses );
 
 			string expectedSql = "simple_alias.count_ between :simple_alias.count__lo and :simple_alias.count__hi";
 			Parameter[] expectedParams = new Parameter[2];
 
-			Parameter firstBetweenParam = new Parameter( "count__lo", "simple_alias", new SqlTypes.Int32SqlType() );
-			expectedParams[0] = firstBetweenParam;
-			
-			Parameter secondBetweenParam = new Parameter( "count__hi", "simple_alias", new SqlTypes.Int32SqlType() );
-			expectedParams[1] = secondBetweenParam;
+			Parameter firstBetweenParam = new Parameter( "count__lo", "simple_alias", new Int32SqlType() );
+			expectedParams[ 0 ] = firstBetweenParam;
+
+			Parameter secondBetweenParam = new Parameter( "count__hi", "simple_alias", new Int32SqlType() );
+			expectedParams[ 1 ] = secondBetweenParam;
 
-			CompareSqlStrings(sqlString, expectedSql, expectedParams);
+			CompareSqlStrings( sqlString, expectedSql, expectedParams );
 
 			session.Close();
 
 		}
 	}
-}
+}

src/NHibernate/Cfg/HbmBinder.cs

@@ -545,7 +545,7 @@ public static void BindSimpleValue( XmlNode node, SimpleValue model, bool isNull
 			{
 				Formula f = new Formula();
 				f.FormulaString = formulaNode.InnerText;
-				model.Formula = f;
+				model.AddFormula( f );
 			}
 			else
 			{
@@ -613,7 +613,7 @@ private static string Columns( IValue val )
 		{
 			StringBuilder columns = new StringBuilder();
 			bool first = true;
-			foreach( Column col in val.ColumnCollection )
+			foreach( ISelectable col in val.ColumnCollection )
 			{
 				if( first )
 				{
@@ -623,7 +623,7 @@ private static string Columns( IValue val )
 				{
 					columns.Append( ", " );
 				}
-				columns.Append( col.Name );
+				columns.Append( col.Text );
 			}
 			return columns.ToString();
 		}
@@ -1093,16 +1093,6 @@ public static void BindComponent( XmlNode node, Component model, System.Type ref
 			int i = 0;
 			foreach( Mapping.Property prop in model.PropertyCollection )
 			{
-				if( prop.IsFormula )
-				{
-					throw new MappingException( "properties of components may not be formulas: " + prop.Name );
-				}
-				/*
-				if( !prop.IsInsertable || !prop.IsUpdateable )
-				{
-					throw new MappingException( "insert=\"false\", update=\"false\" not supported for properties of components: " + prop.Name );
-				}
-				*/
 				names[ i ] = prop.Name;
 				types[ i ] = prop.Type;
 				cascade[ i ] = prop.CascadeStyle;

src/NHibernate/Dialect/Dialect.cs

@@ -928,6 +928,11 @@ public virtual string QuoteForSchemaName( string schemaName )
 				Quote( schemaName );
 		}
 
+		public virtual int MaxAliasLength
+		{
+			get { return 10; }
+		}
+
 		/// <summary>
 		/// 
 		/// </summary>

src/NHibernate/Mapping/Column.cs

@@ -103,27 +103,39 @@ public string GetQuotedName( Dialect.Dialect d )
 				name;
 		}
 
-		/// <summary>
-		/// Gets an Alias for the column name.
-		/// </summary>
-		/// <param name="d">The <see cref="Dialect.Dialect"/> that contains the rules for Aliasing.</param>
-		/// <returns>
-		/// A string that can be used as the alias for this Column.
-		/// </returns>
-		public string GetAlias( Dialect.Dialect d )
+		/**
+		 * For any column name, generate an alias that is unique
+		 * to that column name, and also 10 characters or less
+		 * in length.
+		 */
+		public string GetAlias(Dialect.Dialect dialect) 
 		{
-			if( quoted || name[0] == StringHelper.SingleQuote || char.IsDigit( name, 0 ) )
+			string alias = name;
+			string unique = uniqueInteger.ToString() + '_';
+			int lastLetter = StringHelper.LastIndexOfLetter(name);
+			if( lastLetter == -1 )
 			{
-				return "y" + uniqueInteger.ToString() + StringHelper.Underscore;
+				alias = "column";
 			}
-
-			if( name.Length < 11 )
+			else if( lastLetter < name.Length-1 ) 
 			{
-				return name;
+				alias = name.Substring(0, lastLetter+1);
 			}
-			else
+			if ( alias.Length > dialect.MaxAliasLength ) 
+			{
+				alias = alias.Substring( 0, dialect.MaxAliasLength - unique.Length );
+			}
+			bool useRawName = name.Equals(alias) && 
+				!quoted &&
+				!name.ToLower(System.Globalization.CultureInfo.InvariantCulture).Equals("rowid");
+			
+			if ( useRawName )
+			{
+				return alias;
+			}
+			else 
 			{
-				return ( new Alias( 10, uniqueInteger.ToString() + StringHelper.Underscore ) ).ToAliasString( name, d );
+				return alias + unique;
 			}
 		}
 

src/NHibernate/Mapping/Formula.cs

@@ -31,12 +31,6 @@ public string GetTemplate( Dialect.Dialect dialect )
 			return Template.RenderWhereStringTemplate( formula, dialect );
 		}
 
-		/// <summary></summary>
-		public string Alias
-		{
-			get { return "f" + uniqueInteger.ToString() + StringHelper.Underscore; }
-		}
-
 		/// <summary></summary>
 		public string FormulaString
 		{
@@ -66,7 +60,7 @@ public string GetAlias(Dialect.Dialect dialect, Table table)
 
 		public bool IsFormula
 		{
-			get { return false; }
+			get { return true; }
 		}
 
 		public override string ToString() 

src/NHibernate/Mapping/IValue.cs

@@ -34,15 +34,6 @@ public interface IValue
 		/// </summary>
 		Table Table { get; }
 
-		/// <summary>
-		/// Gets the <see cref="Formula"/> used to populate the Value.
-		/// </summary>
-		/// <remarks>
-		/// If a <see cref="Formula"/> is not used then this will be 
-		/// <c>null</c>.
-		/// </remarks>
-		Formula Formula { get; }
-		
 		/// <summary>
 		/// Gets a <see cref="bool"/> indicating if this Value is unique.
 		/// </summary>

src/NHibernate/Mapping/Property.cs

@@ -148,7 +148,6 @@ public bool IsUpdateable
 			{
 				bool[] columnUpdateability = propertyValue.ColumnUpdateability;
 				return updateable &&
-					!IsFormula && // temporary
 					(
 						// columnUpdateability.Length == 0 ||
 						!ArrayHelper.IsAllFalse(columnUpdateability)
@@ -163,7 +162,6 @@ public bool IsInsertable
 			{
 				bool[] columnInsertability = propertyValue.ColumnInsertability;
 				return insertable &&
-					!IsFormula && // temporary
 					(
 						columnInsertability.Length == 0 ||
 						!ArrayHelper.IsAllFalse( columnInsertability )
@@ -172,18 +170,6 @@ public bool IsInsertable
 			set { insertable = value; }
 		}
 
-		/// <summary></summary>
-		public Formula Formula
-		{
-			get { return propertyValue.Formula; }
-		}
-
-		/// <summary></summary>
-		public bool IsFormula
-		{
-			get { return Formula != null; }
-		}
-
 		/// <summary></summary>
 		public bool IsNullable
 		{
@@ -247,7 +233,7 @@ public MetaAttribute GetMetaAttribute( string name )
 		/// <returns></returns>
 		public bool IsValid( IMapping mapping )
 		{
-			return IsFormula ? ColumnSpan == 0 : Value.IsValid( mapping );
+			return Value.IsValid( mapping );
 		}
 
 		/// <summary>