[Nhibernate-commit] nhibernate/src/NHibernate/SqlCommand ConditionalFragment.cs,1.1,1.2 DecodeCaseFragment.cs,1.3,1.4 ForUpdateFragment.cs,1.5,1.6 InFragment.cs,1.2,1.3

[Kevin W. <kev...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9130

Modified Files:
	ConditionalFragment.cs DecodeCaseFragment.cs 
	ForUpdateFragment.cs InFragment.cs 
Log Message:
fixing xml comments and letting ReSharper do reformatting

Index: ConditionalFragment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/ConditionalFragment.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConditionalFragment.cs	4 Mar 2004 04:10:15 -0000	1.1
--- ConditionalFragment.cs	31 Dec 2004 22:24:48 -0000	1.2
***************
*** 1,14 ****
- using System;
  using System.Text;
  using NHibernate.Util;
  
! namespace NHibernate.SqlCommand 
  {
! 
! 	public class ConditionalFragment 
  	{
  		private string tableAlias;
! 		private string[] lhs;
! 		private string[] rhs;
  		private string op = "=";
  
--- 1,13 ----
  using System.Text;
  using NHibernate.Util;
  
! namespace NHibernate.SqlCommand
  {
! 	/// <summary></summary>
! 	public class ConditionalFragment
  	{
  		private string tableAlias;
! 		private string[ ] lhs;
! 		private string[ ] rhs;
  		private string op = "=";
  
***************
*** 17,21 ****
  		/// </summary>
  		/// <param name="op">The op to set</param>
! 		public ConditionalFragment SetOp(string op) 
  		{
  			this.op = op;
--- 16,20 ----
  		/// </summary>
  		/// <param name="op">The op to set</param>
! 		public ConditionalFragment SetOp( string op )
  		{
  			this.op = op;
***************
*** 23,27 ****
  		}
  
! 		public ConditionalFragment SetTableAlias(string tableAlias) 
  		{
  			this.tableAlias = tableAlias;
--- 22,31 ----
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="tableAlias"></param>
! 		/// <returns></returns>
! 		public ConditionalFragment SetTableAlias( string tableAlias )
  		{
  			this.tableAlias = tableAlias;
***************
*** 29,33 ****
  		}
  
! 		public ConditionalFragment SetCondition(string[] lhs, string[] rhs) 
  		{
  			this.lhs = lhs;
--- 33,43 ----
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="lhs"></param>
! 		/// <param name="rhs"></param>
! 		/// <returns></returns>
! 		public ConditionalFragment SetCondition( string[ ] lhs, string[ ] rhs )
  		{
  			this.lhs = lhs;
***************
*** 36,62 ****
  		}
  
! 		public ConditionalFragment SetCondition(string[] lhs, string rhs) 
  		{
  			this.lhs = lhs;
! 			this.rhs = ArrayHelper.FillArray(rhs, lhs.Length);
  			return this;
  		}
  
! 		public SqlString ToSqlStringFragment() 
  		{
! 			StringBuilder buf = new StringBuilder( lhs.Length * 10 );
! 			for ( int i=0; i<lhs.Length; i++ ) 
  			{
! 				buf.Append(tableAlias)
! 					.Append(StringHelper.Dot)
! 					.Append( lhs[i] )
! 					.Append(op)
! 					.Append( rhs[i] );
! 				if (i<lhs.Length-1) buf.Append(" and ");
  			}
! 			return new SqlString(buf.ToString());
  		}
  	}
! }
! 
! 
--- 46,80 ----
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="lhs"></param>
! 		/// <param name="rhs"></param>
! 		/// <returns></returns>
! 		public ConditionalFragment SetCondition( string[ ] lhs, string rhs )
  		{
  			this.lhs = lhs;
! 			this.rhs = ArrayHelper.FillArray( rhs, lhs.Length );
  			return this;
  		}
  
! 		/// <summary></summary>
! 		public SqlString ToSqlStringFragment()
  		{
! 			StringBuilder buf = new StringBuilder( lhs.Length*10 );
! 			for( int i = 0; i < lhs.Length; i++ )
  			{
! 				buf.Append( tableAlias )
! 					.Append( StringHelper.Dot )
! 					.Append( lhs[ i ] )
! 					.Append( op )
! 					.Append( rhs[ i ] );
! 				if( i < lhs.Length - 1 )
! 				{
! 					buf.Append( " and " );
! 				}
  			}
! 			return new SqlString( buf.ToString() );
  		}
  	}
! }
\ No newline at end of file

Index: ForUpdateFragment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/ForUpdateFragment.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ForUpdateFragment.cs	20 Aug 2004 17:39:02 -0000	1.5
--- ForUpdateFragment.cs	31 Dec 2004 22:24:48 -0000	1.6
***************
*** 1,46 ****
  using System;
- using System.Collections;
  using System.Text;
- 
  using NHibernate.Util;
  
! namespace NHibernate.SqlCommand 
  {
- 
  	/// <summary>
  	/// Represents an SQL <c>for update of ... nowait</c> statement
  	/// </summary>
! 	public class ForUpdateFragment 
  	{
- 
  		private StringBuilder aliases = new StringBuilder();
  		private bool nowait;
  
! 		public ForUpdateFragment() 
  		{
  		}
  
! 		public bool NoWait 
  		{
! 			get { return nowait;}
! 			set { nowait = value;}
  		}
  
! 		public ForUpdateFragment AddTableAlias(string alias) 
  		{
! 			if(aliases.Length > 0 ) aliases.Append(StringHelper.CommaSpace);
! 			aliases.Append(alias);
  			return this;
  		}
  
! 		public SqlString ToSqlStringFragment() 
  		{
! 			return aliases.Length==0 ?
! 				new SqlString(String.Empty) :
! 				new SqlString(" for update of " + aliases + ( nowait ? " nowait" : String.Empty)); 
  		}
  
  	}
! }
! 
! 
--- 1,51 ----
  using System;
  using System.Text;
  using NHibernate.Util;
  
! namespace NHibernate.SqlCommand
  {
  	/// <summary>
  	/// Represents an SQL <c>for update of ... nowait</c> statement
  	/// </summary>
! 	public class ForUpdateFragment
  	{
  		private StringBuilder aliases = new StringBuilder();
  		private bool nowait;
  
! 		/// <summary></summary>
! 		public ForUpdateFragment()
  		{
  		}
  
! 		/// <summary></summary>
! 		public bool NoWait
  		{
! 			get { return nowait; }
! 			set { nowait = value; }
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="alias"></param>
! 		/// <returns></returns>
! 		public ForUpdateFragment AddTableAlias( string alias )
  		{
! 			if( aliases.Length > 0 )
! 			{
! 				aliases.Append( StringHelper.CommaSpace );
! 			}
! 			aliases.Append( alias );
  			return this;
  		}
  
! 		/// <summary></summary>
! 		public SqlString ToSqlStringFragment()
  		{
! 			return aliases.Length == 0 ?
! 				new SqlString( String.Empty ) :
! 				new SqlString( " for update of " + aliases + ( nowait ? " nowait" : String.Empty ) );
  		}
  
  	}
! }
\ No newline at end of file

Index: InFragment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/InFragment.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InFragment.cs	16 Dec 2004 21:51:08 -0000	1.2
--- InFragment.cs	31 Dec 2004 22:24:48 -0000	1.3
***************
*** 1,5 ****
- using System;
  using System.Collections;
- 
  using NHibernate.Util;
  
--- 1,3 ----
***************
*** 13,25 ****
  		private string columnName;
  		private ArrayList values = new ArrayList();
! 		
! 		public InFragment AddValue(string value) 
  		{
! 			values.Add(value);
  			return this;
  
  		}
  
! 		public InFragment SetColumn(string columnName) 
  		{
  			this.columnName = columnName;
--- 11,33 ----
  		private string columnName;
  		private ArrayList values = new ArrayList();
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="value"></param>
! 		/// <returns></returns>
! 		public InFragment AddValue( string value )
  		{
! 			values.Add( value );
  			return this;
  
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="columnName"></param>
! 		/// <returns></returns>
! 		public InFragment SetColumn( string columnName )
  		{
  			this.columnName = columnName;
***************
*** 27,31 ****
  		}
  
! 		public InFragment SetColumn(string alias, string columnName) 
  		{
  			this.columnName = alias + StringHelper.Dot + columnName;
--- 35,45 ----
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="alias"></param>
! 		/// <param name="columnName"></param>
! 		/// <returns></returns>
! 		public InFragment SetColumn( string alias, string columnName )
  		{
  			this.columnName = alias + StringHelper.Dot + columnName;
***************
*** 33,42 ****
  		}
  
! 		public SqlString ToFragmentString() 
  		{
! 			SqlStringBuilder buf = new SqlStringBuilder( values.Count * 5 );
  			buf.Add( columnName );
! 			
! 			if( values.Count > 1 ) 
  			{
  				// is a comma needed before the value that's about to be added - it
--- 47,57 ----
  		}
  
! 		/// <summary></summary>
! 		public SqlString ToFragmentString()
  		{
! 			SqlStringBuilder buf = new SqlStringBuilder( values.Count*5 );
  			buf.Add( columnName );
! 
! 			if( values.Count > 1 )
  			{
  				// is a comma needed before the value that's about to be added - it
***************
*** 49,59 ****
  
  				buf.Add( " in (" );
! 				for( int i=0; i<values.Count; i++ ) 
  				{
! 					if("null".Equals(values[i])) 
  					{
  						allowNull = true;
  					}
! 					else 
  					{
  						if( commaNeeded )
--- 64,74 ----
  
  				buf.Add( " in (" );
! 				for( int i = 0; i < values.Count; i++ )
  				{
! 					if( "null".Equals( values[ i ] ) )
  					{
  						allowNull = true;
  					}
! 					else
  					{
  						if( commaNeeded )
***************
*** 61,66 ****
  							buf.Add( StringHelper.CommaSpace );
  						}
! 						buf.Add( (string)values[i] );
! 						
  						// a value has been added into the IN clause so the next
  						// one needs a comma before it
--- 76,81 ----
  							buf.Add( StringHelper.CommaSpace );
  						}
! 						buf.Add( ( string ) values[ i ] );
! 
  						// a value has been added into the IN clause so the next
  						// one needs a comma before it
***************
*** 69,98 ****
  				}
  
! 				buf.Add(StringHelper.ClosedParen);
! 				
  				// if "null" is in the list of values then add to the beginning of the
  				// SqlString "is null or [column] (" + [rest of sqlstring here] + ")"
! 				if( allowNull ) 
  				{
! 					buf.Insert(0, " is null or ")
! 						.Insert(0, columnName)
! 						.Insert(0, StringHelper.OpenParen)
! 						.Add(StringHelper.ClosedParen);
  				}
! 			} 
! 			else 
  			{
! 				string value = values[0] as string;
! 				if ( "null".Equals(value) ) 
  				{
! 					buf.Add(" is null");
! 				} 
! 				else 
  				{
! 					buf.Add( "=" + values[0] );
  				}
  			}
  			return buf.ToSqlString();
! 		}				
  	}
! }
--- 84,113 ----
  				}
  
! 				buf.Add( StringHelper.ClosedParen );
! 
  				// if "null" is in the list of values then add to the beginning of the
  				// SqlString "is null or [column] (" + [rest of sqlstring here] + ")"
! 				if( allowNull )
  				{
! 					buf.Insert( 0, " is null or " )
! 						.Insert( 0, columnName )
! 						.Insert( 0, StringHelper.OpenParen )
! 						.Add( StringHelper.ClosedParen );
  				}
! 			}
! 			else
  			{
! 				string value = values[ 0 ] as string;
! 				if( "null".Equals( value ) )
  				{
! 					buf.Add( " is null" );
! 				}
! 				else
  				{
! 					buf.Add( "=" + values[ 0 ] );
  				}
  			}
  			return buf.ToSqlString();
! 		}
  	}
! }
\ No newline at end of file

Index: DecodeCaseFragment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/DecodeCaseFragment.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DecodeCaseFragment.cs	16 Aug 2004 05:18:52 -0000	1.3
--- DecodeCaseFragment.cs	31 Dec 2004 22:24:48 -0000	1.4
***************
*** 1,6 ****
- using System;
  using System.Collections;
  using System.Text;
- 
  using NHibernate.Util;
  
--- 1,4 ----
***************
*** 10,18 ****
  	/// Represents an SQL decode(pkvalue, key1, 1, key2, 2, ..., 0)
  	/// </summary>
! 	public class DecodeCaseFragment : CaseFragment 
  	{
  		private Dialect.Dialect dialect;
  
! 		public DecodeCaseFragment(Dialect.Dialect dialect)
  		{
  			this.dialect = dialect;
--- 8,20 ----
  	/// Represents an SQL decode(pkvalue, key1, 1, key2, 2, ..., 0)
  	/// </summary>
! 	public class DecodeCaseFragment : CaseFragment
  	{
  		private Dialect.Dialect dialect;
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="dialect"></param>
! 		public DecodeCaseFragment( Dialect.Dialect dialect )
  		{
  			this.dialect = dialect;
***************
*** 22,26 ****
  		private IList cases = new ArrayList();
  
! 		public override CaseFragment SetReturnColumnName(string returnColumnName) 
  		{
  			this.returnColumnName = returnColumnName;
--- 24,33 ----
  		private IList cases = new ArrayList();
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="returnColumnName"></param>
! 		/// <returns></returns>
! 		public override CaseFragment SetReturnColumnName( string returnColumnName )
  		{
  			this.returnColumnName = returnColumnName;
***************
*** 28,74 ****
  		}
  
! 		public override CaseFragment SetReturnColumnName(string returnColumnName, string suffix) 
  		{
! 			return SetReturnColumnName( new Alias(suffix).ToAliasString(returnColumnName, dialect) );
  		}
  
! 		public override CaseFragment AddWhenColumnNotNull(string alias, string columnName, string columnValue) 
  		{
  			string key = alias + StringHelper.Dot + columnName;
  
! 			if(columnValue.Equals("0")) 
  			{
! 				cases.Insert(0, key);
  			}
! 			else 
  			{
! 				cases.Add(", " + key + ", " + columnValue);
  			}
! 			
  			return this;
  		}
  
! 		public override SqlString ToSqlStringFragment() 
  		{
! 			
! 			StringBuilder buf = new StringBuilder( cases.Count * 15 + 10 );
  
! 			buf.Append("decode (");
  
! 			for(int i = 0; i < cases.Count; i++) 
  			{
! 				buf.Append(cases[i]);
  			}
  
! 			buf.Append(",0 )");
  
! 			if(returnColumnName!=null) 
  			{
! 				buf.Append(" as ")
! 					.Append(returnColumnName);
  			}
  
! 			return new SqlString(buf.ToString());
  		}
  	}
! }
--- 35,94 ----
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="returnColumnName"></param>
! 		/// <param name="suffix"></param>
! 		/// <returns></returns>
! 		public override CaseFragment SetReturnColumnName( string returnColumnName, string suffix )
  		{
! 			return SetReturnColumnName( new Alias( suffix ).ToAliasString( returnColumnName, dialect ) );
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="alias"></param>
! 		/// <param name="columnName"></param>
! 		/// <param name="columnValue"></param>
! 		/// <returns></returns>
! 		public override CaseFragment AddWhenColumnNotNull( string alias, string columnName, string columnValue )
  		{
  			string key = alias + StringHelper.Dot + columnName;
  
! 			if( columnValue.Equals( "0" ) )
  			{
! 				cases.Insert( 0, key );
  			}
! 			else
  			{
! 				cases.Add( ", " + key + ", " + columnValue );
  			}
! 
  			return this;
  		}
  
! 		/// <summary></summary>
! 		public override SqlString ToSqlStringFragment()
  		{
! 			StringBuilder buf = new StringBuilder( cases.Count*15 + 10 );
  
! 			buf.Append( "decode (" );
  
! 			for( int i = 0; i < cases.Count; i++ )
  			{
! 				buf.Append( cases[ i ] );
  			}
  
! 			buf.Append( ",0 )" );
  
! 			if( returnColumnName != null )
  			{
! 				buf.Append( " as " )
! 					.Append( returnColumnName );
  			}
  
! 			return new SqlString( buf.ToString() );
  		}
  	}
! }
\ No newline at end of file