nhibernate-commit

[Michael D. <mik...@us...>]

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

Modified Files:
	ISqlStringBuilder.cs QuerySelect.cs SqlBaseBuilder.cs 
	SqlDeleteBuilder.cs SqlInsertBuilder.cs SqlSelectBuilder.cs 
	SqlSimpleSelectBuilder.cs SqlString.cs SqlUpdateBuilder.cs 
	Template.cs 
Log Message:
minor fixes for FxCop rules

Index: SqlString.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlString.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** SqlString.cs	21 Sep 2004 09:58:25 -0000	1.15
--- SqlString.cs	22 Nov 2004 03:56:08 -0000	1.16
***************
*** 98,104 ****
  					
  					// don't add an empty string into the new compacted SqlString
! 					if(builderString!=String.Empty) 
  					{
! 						sqlBuilder.Add(builderString);
  					}
  
--- 98,104 ----
  					
  					// don't add an empty string into the new compacted SqlString
! 					if( builderString.Length!=0 ) 
  					{
! 						sqlBuilder.Add( builderString );
  					}
  

Index: QuerySelect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/QuerySelect.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** QuerySelect.cs	21 Aug 2004 13:08:08 -0000	1.1
--- QuerySelect.cs	22 Nov 2004 03:56:08 -0000	1.2
***************
*** 99,102 ****
--- 99,103 ----
  		public bool Distinct 
  		{
+ 			get { return distinct; }
  			set { this.distinct = value; }
  		}

Index: SqlUpdateBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlUpdateBuilder.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SqlUpdateBuilder.cs	13 Sep 2004 07:22:38 -0000	1.3
--- SqlUpdateBuilder.cs	22 Nov 2004 03:56:08 -0000	1.4
***************
*** 94,100 ****
  		public SqlUpdateBuilder AddColumns(string[] columnNames, IType propertyType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, propertyType);
  
! 			for(int i = 0; i < columnNames.Length; i++) {
  				this.columnNames.Add(columnNames[i]);
  				columnValues.Add(parameters[i]);
--- 94,101 ----
  		public SqlUpdateBuilder AddColumns(string[] columnNames, IType propertyType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, propertyType );
  
! 			for(int i = 0; i < columnNames.Length; i++) 
! 			{
  				this.columnNames.Add(columnNames[i]);
  				columnValues.Add(parameters[i]);
***************
*** 112,116 ****
  		public SqlUpdateBuilder SetIdentityColumn(string[] columnNames, IType identityType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, identityType);
  
  			identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
--- 113,117 ----
  		public SqlUpdateBuilder SetIdentityColumn(string[] columnNames, IType identityType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, identityType );
  
  			identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
***************
*** 127,131 ****
  		public SqlUpdateBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, versionType);
  
  			versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
--- 128,132 ----
  		public SqlUpdateBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, versionType );
  
  			versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
***************
*** 143,147 ****
  		public SqlUpdateBuilder AddWhereFragment(string[] columnNames, IType type, string op) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, type);
  			whereStrings.Add(ToWhereString(columnNames, parameters, op));
  
--- 144,148 ----
  		public SqlUpdateBuilder AddWhereFragment(string[] columnNames, IType type, string op) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, type );
  			whereStrings.Add(ToWhereString(columnNames, parameters, op));
  

Index: Template.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/Template.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Template.cs	21 Oct 2004 00:21:06 -0000	1.8
--- Template.cs	22 Nov 2004 03:56:08 -0000	1.9
***************
*** 15,21 ****
  	public sealed class Template 
  	{
! 
  		private static StringDictionary Keywords = new StringDictionary();
- 		public static readonly string PlaceHolder = "$PlaceHolder";
  		private static ArrayList delimiterList = new ArrayList(13);
  		private static string delimiters = null;
--- 15,21 ----
  	public sealed class Template 
  	{
! 		public const string PlaceHolder = "$PlaceHolder";
! 		
  		private static StringDictionary Keywords = new StringDictionary();
  		private static ArrayList delimiterList = new ArrayList(13);
  		private static string delimiters = null;

Index: ISqlStringBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/ISqlStringBuilder.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ISqlStringBuilder.cs	10 Feb 2004 18:38:55 -0000	1.1
--- ISqlStringBuilder.cs	22 Nov 2004 03:56:00 -0000	1.2
***************
*** 4,10 ****
  using NHibernate.Connection;
  
! namespace NHibernate.SqlCommand {
  	
! 	public interface ISqlStringBuilder {
  		/// <summary>
  		/// Builds a SqlString from the internal data.
--- 4,12 ----
  using NHibernate.Connection;
  
! namespace NHibernate.SqlCommand 
! {
  	
! 	public interface ISqlStringBuilder 
! 	{
  		/// <summary>
  		/// Builds a SqlString from the internal data.

Index: SqlSimpleSelectBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlSimpleSelectBuilder.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SqlSimpleSelectBuilder.cs	10 Feb 2004 18:38:55 -0000	1.1
--- SqlSimpleSelectBuilder.cs	22 Nov 2004 03:56:08 -0000	1.2
***************
*** 105,110 ****
  		/// <param name="identityType">The IType of the Identity Property.</param>
  		/// <returns>The SqlSimpleSelectBuilder.</returns>
! 		public SqlSimpleSelectBuilder SetIdentityColumn(string[] columnNames, IType identityType) {
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, identityType);
  
  			identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
--- 105,111 ----
  		/// <param name="identityType">The IType of the Identity Property.</param>
  		/// <returns>The SqlSimpleSelectBuilder.</returns>
! 		public SqlSimpleSelectBuilder SetIdentityColumn(string[] columnNames, IType identityType) 
! 		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, identityType );
  
  			identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
***************
*** 119,124 ****
  		/// <param name="versionType">The IVersionType of the Version Property.</param>
  		/// <returns>The SqlSimpleSelectBuilder.</returns>
! 		public SqlSimpleSelectBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) {
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, versionType);
  
  			versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
--- 120,126 ----
  		/// <param name="versionType">The IVersionType of the Version Property.</param>
  		/// <returns>The SqlSimpleSelectBuilder.</returns>
! 		public SqlSimpleSelectBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) 
! 		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, versionType );
  
  			versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
***************
*** 154,159 ****
  		/// <param name="op">The operator to put between the column name and value.</param>
  		/// <returns>The SqlSimpleSelectBuilder</returns>
! 		public SqlSimpleSelectBuilder AddWhereFragment(string[] columnNames, IType type, string op) {
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, type);
  			
  			whereStrings.Add(ToWhereString(columnNames, parameters, op));
--- 156,162 ----
  		/// <param name="op">The operator to put between the column name and value.</param>
  		/// <returns>The SqlSimpleSelectBuilder</returns>
! 		public SqlSimpleSelectBuilder AddWhereFragment(string[] columnNames, IType type, string op) 
! 		{
! 			Parameter[] parameters = Parameter.GenerateParameters(Factory, columnNames, type);
  			
  			whereStrings.Add(ToWhereString(columnNames, parameters, op));

Index: SqlDeleteBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlDeleteBuilder.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SqlDeleteBuilder.cs	13 Sep 2004 07:22:38 -0000	1.3
--- SqlDeleteBuilder.cs	22 Nov 2004 03:56:08 -0000	1.4
***************
*** 43,47 ****
  		public SqlDeleteBuilder SetIdentityColumn(string[] columnNames, IType identityType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, identityType);
  
  			identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
--- 43,47 ----
  		public SqlDeleteBuilder SetIdentityColumn(string[] columnNames, IType identityType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, identityType );
  
  			identityFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
***************
*** 58,62 ****
  		public SqlDeleteBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, versionType);
  
  			versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
--- 58,62 ----
  		public SqlDeleteBuilder SetVersionColumn(string[] columnNames, IVersionType versionType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, versionType );
  
  			versionFragmentIndex = whereStrings.Add(ToWhereString(columnNames, parameters));
***************
*** 74,78 ****
  		public SqlDeleteBuilder AddWhereFragment(string[] columnNames, IType type, string op) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, type);
  			whereStrings.Add(ToWhereString(columnNames, parameters, op));
  
--- 74,78 ----
  		public SqlDeleteBuilder AddWhereFragment(string[] columnNames, IType type, string op) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, columnNames, type );
  			whereStrings.Add(ToWhereString(columnNames, parameters, op));
  

Index: SqlSelectBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlSelectBuilder.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SqlSelectBuilder.cs	13 Sep 2004 07:22:38 -0000	1.4
--- SqlSelectBuilder.cs	22 Nov 2004 03:56:08 -0000	1.5
***************
*** 144,148 ****
  		public SqlSelectBuilder SetWhereClause(string tableAlias, string[] columnNames, IType whereType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, tableAlias, columnNames, whereType);
  
  			whereSqlStrings.Add(ToWhereString(tableAlias, columnNames, parameters));
--- 144,148 ----
  		public SqlSelectBuilder SetWhereClause(string tableAlias, string[] columnNames, IType whereType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters( Factory, tableAlias, columnNames, whereType );
  
  			whereSqlStrings.Add(ToWhereString(tableAlias, columnNames, parameters));

Index: SqlBaseBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlBaseBuilder.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SqlBaseBuilder.cs	21 Sep 2004 09:58:25 -0000	1.3
--- SqlBaseBuilder.cs	22 Nov 2004 03:56:08 -0000	1.4
***************
*** 5,20 ****
  using NHibernate.Util;
  
! namespace NHibernate.SqlCommand{
  	/// <summary>
  	/// The base class for all of the SqlBuilders.
  	/// </summary>
! 	public abstract class SqlBaseBuilder {
  
! 		protected ISessionFactoryImplementor factory;
  
! 		public SqlBaseBuilder(ISessionFactoryImplementor factory){
  			this.factory = factory;
  		}
  
  		/// <summary>
  		/// Converts the ColumnNames and ColumnValues to a WhereFragment
--- 5,28 ----
  using NHibernate.Util;
  
! namespace NHibernate.SqlCommand
! {
  	/// <summary>
  	/// The base class for all of the SqlBuilders.
  	/// </summary>
! 	public abstract class SqlBaseBuilder 
! 	{
  
! 		private ISessionFactoryImplementor factory;
  
! 		protected SqlBaseBuilder(ISessionFactoryImplementor factory)
! 		{
  			this.factory = factory;
  		}
  
+ 		protected ISessionFactoryImplementor Factory 
+ 		{
+ 			get { return factory; }
+ 		}
+ 
  		/// <summary>
  		/// Converts the ColumnNames and ColumnValues to a WhereFragment
***************
*** 36,40 ****
  		/// <returns>A SqlString that contains the WhereFragment</returns>
  		/// <remarks>This defaults the op to " = "</remarks>
! 		protected SqlString ToWhereString(string tableAlias, string[] columnNames, object[] columnValues) {
  			return ToWhereString(tableAlias, columnNames, columnValues, " = ");
  		}
--- 44,49 ----
  		/// <returns>A SqlString that contains the WhereFragment</returns>
  		/// <remarks>This defaults the op to " = "</remarks>
! 		protected SqlString ToWhereString(string tableAlias, string[] columnNames, object[] columnValues) 
! 		{
  			return ToWhereString(tableAlias, columnNames, columnValues, " = ");
  		}
***************
*** 47,51 ****
  		/// <param name="op">The operator to use between the names &amp; values.  For example " = " or "!="</param>
  		/// <returns>A SqlString that contains the WhereFragment</returns>
! 		protected SqlString ToWhereString(string[] columnNames, object[] columnValues, string op) {
  			return ToWhereString(null, columnNames, columnValues, op);
  		}
--- 56,61 ----
  		/// <param name="op">The operator to use between the names &amp; values.  For example " = " or "!="</param>
  		/// <returns>A SqlString that contains the WhereFragment</returns>
! 		protected SqlString ToWhereString(string[] columnNames, object[] columnValues, string op) 
! 		{
  			return ToWhereString(null, columnNames, columnValues, op);
  		}
***************
*** 59,76 ****
  		/// <param name="op">The operator to use between the names &amp; values.  For example " = " or "!="</param>
  		/// <returns>A SqlString that contains the WhereFragment</returns>
! 		protected SqlString ToWhereString(string tableAlias, string[] columnNames, object[] columnValues, string op) {
  			SqlStringBuilder sqlBuilder = new SqlStringBuilder((columnNames.Length * 2) + 5);
  
  			bool andNeeded = false;
  			
! 			for(int i = 0; i < columnNames.Length; i++){
  				if(andNeeded) sqlBuilder.Add(" AND ");
  				andNeeded = true;
  
  				string columnName;
! 				if(tableAlias!=null && tableAlias.Length > 0) {
  					columnName = tableAlias + StringHelper.Dot + columnNames[i];
  				}
! 				else {
  					columnName = columnNames[i];
  				}
--- 69,90 ----
  		/// <param name="op">The operator to use between the names &amp; values.  For example " = " or "!="</param>
  		/// <returns>A SqlString that contains the WhereFragment</returns>
! 		protected SqlString ToWhereString(string tableAlias, string[] columnNames, object[] columnValues, string op) 
! 		{
  			SqlStringBuilder sqlBuilder = new SqlStringBuilder((columnNames.Length * 2) + 5);
  
  			bool andNeeded = false;
  			
! 			for(int i = 0; i < columnNames.Length; i++)
! 			{
  				if(andNeeded) sqlBuilder.Add(" AND ");
  				andNeeded = true;
  
  				string columnName;
! 				if(tableAlias!=null && tableAlias.Length > 0) 
! 				{
  					columnName = tableAlias + StringHelper.Dot + columnNames[i];
  				}
! 				else 
! 				{
  					columnName = columnNames[i];
  				}
***************
*** 78,85 ****
  				sqlBuilder.Add(columnName)
  					.Add(op);
! 				if(columnValues[i] is Parameter) {
  					sqlBuilder.Add((Parameter)columnValues[i]);
  				}
! 				else {
  					sqlBuilder.Add((string)columnValues[i]);
  				}
--- 92,101 ----
  				sqlBuilder.Add(columnName)
  					.Add(op);
! 				if(columnValues[i] is Parameter) 
! 				{
  					sqlBuilder.Add((Parameter)columnValues[i]);
  				}
! 				else 
! 				{
  					sqlBuilder.Add((string)columnValues[i]);
  				}
***************
*** 89,93 ****
  
  		}
- 
  	}
  }
--- 105,108 ----

Index: SqlInsertBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlInsertBuilder.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SqlInsertBuilder.cs	13 Sep 2004 07:22:38 -0000	1.2
--- SqlInsertBuilder.cs	22 Nov 2004 03:56:08 -0000	1.3
***************
*** 18,23 ****
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(SqlInsertBuilder) );
! 
! 		ISessionFactoryImplementor factory;
  		string tableName;
  		IList columnNames = new ArrayList();
--- 18,23 ----
  	{
  		private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(SqlInsertBuilder) );
! 		
! 		private ISessionFactoryImplementor factory;
  		string tableName;
  		IList columnNames = new ArrayList();
***************
*** 45,49 ****
  		public SqlInsertBuilder AddColumn(string[] columnNames, IType propertyType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters(factory, columnNames, propertyType);
  
  			for(int i = 0; i < columnNames.Length; i++) 
--- 45,49 ----
  		public SqlInsertBuilder AddColumn(string[] columnNames, IType propertyType) 
  		{
! 			Parameter[] parameters = Parameter.GenerateParameters( factory, columnNames, propertyType );
  
  			for(int i = 0; i < columnNames.Length; i++)