Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14723/NHibernate/SqlCommand
Modified Files:
SelectFragment.cs SqlStringBuilder.cs Template.cs
Log Message:
renamed PlaceHolder to Placeholder
attempted to reduce duplicate casting in AddObject per FxCop suggestion.
Index: SelectFragment.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SelectFragment.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SelectFragment.cs 31 Dec 2004 22:25:33 -0000 1.7
--- SelectFragment.cs 14 Feb 2005 03:26:10 -0000 1.8
***************
*** 152,156 ****
AddColumn(
null,
! StringHelper.Replace( formula, Template.PlaceHolder, tableAlias ),
formulaAlias );
--- 152,156 ----
AddColumn(
null,
! StringHelper.Replace( formula, Template.Placeholder, tableAlias ),
formulaAlias );
Index: SqlStringBuilder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/SqlStringBuilder.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SqlStringBuilder.cs 31 Dec 2004 22:25:44 -0000 1.6
--- SqlStringBuilder.cs 14 Feb 2005 03:26:10 -0000 1.7
***************
*** 95,114 ****
public SqlStringBuilder AddObject( object part )
{
! if( part is Parameter )
! {
! return this.Add( ( Parameter ) part );
! }
! else if( part is String )
{
! return this.Add( ( String ) part );
}
! else if( part is SqlString )
{
! return this.Add( ( SqlString ) part, null, null, null );
}
! else
{
! throw new ArgumentException( "Part was not a Parameter, String, or SqlString." );
}
}
--- 95,119 ----
public SqlStringBuilder AddObject( object part )
{
! Parameter paramPart = part as Parameter;
! if( paramPart!=null )
{
! return this.Add( paramPart ); // EARLY EXIT
}
!
! string stringPart = part as String;
! if( stringPart!=null )
{
! return this.Add( stringPart );
}
!
! SqlString sqlPart = part as SqlString;
! if( sqlPart!=null )
{
! return this.Add( sqlPart, null, null, null );
}
+
+ // remarks - we should not get to here - this is a problem with the
+ // SQL being generated.
+ throw new ArgumentException( "Part was not a Parameter, String, or SqlString." );
}
Index: Template.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlCommand/Template.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Template.cs 23 Jan 2005 15:48:00 -0000 1.12
--- Template.cs 14 Feb 2005 03:26:10 -0000 1.13
***************
*** 13,17 ****
{
/// <summary></summary>
! public const string PlaceHolder = "$PlaceHolder";
private static ISet Keywords = new HashedSet();
--- 13,17 ----
{
/// <summary></summary>
! public const string Placeholder = "$PlaceHolder";
private static ISet Keywords = new HashedSet();
***************
*** 146,150 ****
else if( isIdentifier && ( nextToken == null || !nextToken.Equals( "(" ) ) ) // not a function call
{
! result.Append( PlaceHolder )
.Append( StringHelper.Dot )
.Append( Quote( token, dialect ) );
--- 146,150 ----
else if( isIdentifier && ( nextToken == null || !nextToken.Equals( "(" ) ) ) // not a function call
{
! result.Append( Placeholder )
.Append( StringHelper.Dot )
.Append( Quote( token, dialect ) );
***************
*** 192,196 ****
commaNeeded = true;
! result.Append( PlaceHolder )
.Append( StringHelper.Dot )
.Append( column );
--- 192,196 ----
commaNeeded = true;
! result.Append( Placeholder )
.Append( StringHelper.Dot )
.Append( column );
|
