Skip to content

Commit 8021599

Browse files
author
Kevin Williams
committed
fixing xml comments and letting ReSharper do reformatting
SVN: trunk@1181
1 parent aa68f90 commit 8021599

26 files changed

+1817
-1160
lines changed

‎src/NHibernate/SqlCommand/ANSICaseFragment.cs

+40-21
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
using System;
21
using System.Collections;
32
using System.Text;
4-
53
using NHibernate.Util;
64

7-
85
namespace NHibernate.SqlCommand
96
{
107
/// <summary>
@@ -15,7 +12,11 @@ public class ANSICaseFragment : CaseFragment
1512
{
1613
private Dialect.Dialect dialect;
1714

18-
public ANSICaseFragment(Dialect.Dialect dialect)
15+
/// <summary>
16+
///
17+
/// </summary>
18+
/// <param name="dialect"></param>
19+
public ANSICaseFragment( Dialect.Dialect dialect )
1920
{
2021
this.dialect = dialect;
2122
}
@@ -24,46 +25,64 @@ public ANSICaseFragment(Dialect.Dialect dialect)
2425

2526
private IList cases = new ArrayList();
2627

27-
public override CaseFragment SetReturnColumnName(string returnColumnName)
28+
/// <summary>
29+
///
30+
/// </summary>
31+
/// <param name="returnColumnName"></param>
32+
/// <returns></returns>
33+
public override CaseFragment SetReturnColumnName( string returnColumnName )
2834
{
2935
this.returnColumnName = returnColumnName;
3036
return this;
3137
}
3238

33-
public override CaseFragment SetReturnColumnName(string returnColumnName, string suffix)
39+
/// <summary>
40+
///
41+
/// </summary>
42+
/// <param name="returnColumnName"></param>
43+
/// <param name="suffix"></param>
44+
/// <returns></returns>
45+
public override CaseFragment SetReturnColumnName( string returnColumnName, string suffix )
3446
{
35-
return SetReturnColumnName( new Alias(suffix).ToAliasString( returnColumnName, dialect ) );
47+
return SetReturnColumnName( new Alias( suffix ).ToAliasString( returnColumnName, dialect ) );
3648
}
3749

38-
public override CaseFragment AddWhenColumnNotNull(string alias, string columnName, string columnValue)
50+
/// <summary>
51+
///
52+
/// </summary>
53+
/// <param name="alias"></param>
54+
/// <param name="columnName"></param>
55+
/// <param name="columnValue"></param>
56+
/// <returns></returns>
57+
public override CaseFragment AddWhenColumnNotNull( string alias, string columnName, string columnValue )
3958
{
4059
string key = alias + StringHelper.Dot + columnName + " is not null";
41-
42-
cases.Add(" when " + key + " then " + columnValue );
60+
61+
cases.Add( " when " + key + " then " + columnValue );
4362
return this;
4463
}
4564

65+
/// <summary></summary>
4666
public override SqlString ToSqlStringFragment()
4767
{
48-
49-
StringBuilder buf = new StringBuilder( cases.Count * 15 + 10 );
68+
StringBuilder buf = new StringBuilder( cases.Count*15 + 10 );
5069

51-
buf.Append("case");
70+
buf.Append( "case" );
5271

53-
for(int i = 0 ; i < cases.Count; i++)
72+
for( int i = 0; i < cases.Count; i++ )
5473
{
55-
buf.Append(cases[i]);
74+
buf.Append( cases[ i ] );
5675
}
5776

58-
buf.Append(" end");
77+
buf.Append( " end" );
5978

60-
if( returnColumnName != null )
79+
if( returnColumnName != null )
6180
{
62-
buf.Append(" as ")
63-
.Append(returnColumnName);
81+
buf.Append( " as " )
82+
.Append( returnColumnName );
6483
}
6584

66-
return new SqlString(buf.ToString());
85+
return new SqlString( buf.ToString() );
6786
}
6887
}
69-
}
88+
}

‎src/NHibernate/SqlCommand/ANSIJoinFragment.cs

+81-28
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
32
using NHibernate.Engine;
43
using NHibernate.Type;
54
using NHibernate.Util;
@@ -14,10 +13,18 @@ public class ANSIJoinFragment : JoinFragment
1413
private SqlStringBuilder buffer = new SqlStringBuilder();
1514
private SqlStringBuilder conditions = new SqlStringBuilder();
1615

17-
public override void AddJoin(string tableName, string alias, string[] fkColumns, string[] pkColumns, JoinType joinType)
16+
/// <summary>
17+
///
18+
/// </summary>
19+
/// <param name="tableName"></param>
20+
/// <param name="alias"></param>
21+
/// <param name="fkColumns"></param>
22+
/// <param name="pkColumns"></param>
23+
/// <param name="joinType"></param>
24+
public override void AddJoin( string tableName, string alias, string[ ] fkColumns, string[ ] pkColumns, JoinType joinType )
1825
{
1926
string joinString = null;
20-
switch (joinType)
27+
switch( joinType )
2128
{
2229
case JoinType.InnerJoin:
2330
joinString = " inner join ";
@@ -32,81 +39,127 @@ public override void AddJoin(string tableName, string alias, string[] fkColumns,
3239
joinString = " full outer join ";
3340
break;
3441
default:
35-
throw new AssertionFailure("undefind join type");
42+
throw new AssertionFailure( "undefind join type" );
3643
}
3744

3845
buffer.Add( joinString + tableName + ' ' + alias + " on " );
3946

40-
for (int j=0; j<fkColumns.Length; j++)
47+
for( int j = 0; j < fkColumns.Length; j++ )
4148
{
42-
if (fkColumns[j].IndexOf('.')<1) throw new AssertionFailure("missing alias");
43-
buffer.Add( fkColumns[j] + "=" + alias + StringHelper.Dot + pkColumns[j] );
44-
if (j<fkColumns.Length-1) buffer.Add(" and ");
49+
if( fkColumns[ j ].IndexOf( '.' ) < 1 )
50+
{
51+
throw new AssertionFailure( "missing alias" );
52+
}
53+
buffer.Add( fkColumns[ j ] + "=" + alias + StringHelper.Dot + pkColumns[ j ] );
54+
if( j < fkColumns.Length - 1 )
55+
{
56+
buffer.Add( " and " );
57+
}
4558
}
4659
}
4760

48-
public override SqlString ToFromFragmentString
61+
/// <summary></summary>
62+
public override SqlString ToFromFragmentString
4963
{
5064
get { return buffer.ToSqlString(); }
5165
}
5266

53-
public override SqlString ToWhereFragmentString
67+
/// <summary></summary>
68+
public override SqlString ToWhereFragmentString
5469
{
5570
get { return conditions.ToSqlString(); }
5671
}
5772

58-
public override void AddJoins(SqlString fromFragment, SqlString whereFragment)
73+
/// <summary>
74+
///
75+
/// </summary>
76+
/// <param name="fromFragment"></param>
77+
/// <param name="whereFragment"></param>
78+
public override void AddJoins( SqlString fromFragment, SqlString whereFragment )
5979
{
60-
buffer.Add(fromFragment);
80+
buffer.Add( fromFragment );
6181
//where fragment must be empty!
6282
}
6383

64-
public override JoinFragment Copy()
84+
/// <summary></summary>
85+
public override JoinFragment Copy()
6586
{
6687
ANSIJoinFragment copy = new ANSIJoinFragment();
6788
copy.buffer = new SqlStringBuilder( buffer.ToSqlString() );
6889
return copy;
6990
}
7091

71-
public override void AddCondition(string alias, string[] columns, string condition)
92+
/// <summary>
93+
///
94+
/// </summary>
95+
/// <param name="alias"></param>
96+
/// <param name="columns"></param>
97+
/// <param name="condition"></param>
98+
public override void AddCondition( string alias, string[ ] columns, string condition )
7299
{
73-
for (int i=0; i<columns.Length; i++)
100+
for( int i = 0; i < columns.Length; i++ )
74101
{
75-
conditions.Add( " and " + alias + StringHelper.Dot + columns[i] + condition );
102+
conditions.Add( " and " + alias + StringHelper.Dot + columns[ i ] + condition );
76103
}
77104
}
78105

79-
public override void AddCondition(string alias, string[] columns, string condition, IType conditionType, ISessionFactoryImplementor factory)
106+
/// <summary>
107+
///
108+
/// </summary>
109+
/// <param name="alias"></param>
110+
/// <param name="columns"></param>
111+
/// <param name="condition"></param>
112+
/// <param name="conditionType"></param>
113+
/// <param name="factory"></param>
114+
public override void AddCondition( string alias, string[ ] columns, string condition, IType conditionType, ISessionFactoryImplementor factory )
80115
{
81-
Parameter[] parameters = Parameter.GenerateParameters(factory, alias, columns, conditionType);
82-
for( int i=0; i<columns.Length; i++)
116+
Parameter[ ] parameters = Parameter.GenerateParameters( factory, alias, columns, conditionType );
117+
for( int i = 0; i < columns.Length; i++ )
83118
{
84-
conditions.Add( " and " + alias + StringHelper.Dot + columns[i] + condition );
85-
conditions.Add( parameters[i] );
119+
conditions.Add( " and " + alias + StringHelper.Dot + columns[ i ] + condition );
120+
conditions.Add( parameters[ i ] );
86121
}
87122
}
88123

89-
90-
public override void AddCrossJoin(string tableName, string alias)
124+
/// <summary>
125+
///
126+
/// </summary>
127+
/// <param name="tableName"></param>
128+
/// <param name="alias"></param>
129+
public override void AddCrossJoin( string tableName, string alias )
91130
{
92-
buffer.Add( StringHelper.CommaSpace + tableName + " " + alias);
131+
buffer.Add( StringHelper.CommaSpace + tableName + " " + alias );
93132
}
94133

95-
public override void AddCondition(string alias, string[] fkColumns, string[] pkColumns)
134+
/// <summary>
135+
///
136+
/// </summary>
137+
/// <param name="alias"></param>
138+
/// <param name="fkColumns"></param>
139+
/// <param name="pkColumns"></param>
140+
public override void AddCondition( string alias, string[ ] fkColumns, string[ ] pkColumns )
96141
{
97142
throw new NotSupportedException();
98143
}
99144

100-
public override void AddCondition(string condition)
145+
/// <summary>
146+
///
147+
/// </summary>
148+
/// <param name="condition"></param>
149+
public override void AddCondition( string condition )
101150
{
102151
throw new NotSupportedException();
103152
}
104153

105-
public override void AddCondition(SqlString condition)
154+
/// <summary>
155+
///
156+
/// </summary>
157+
/// <param name="condition"></param>
158+
public override void AddCondition( SqlString condition )
106159
{
107160
throw new NotSupportedException();
108161
}
109162

110163

111164
}
112-
}
165+
}

0 commit comments

Comments
 (0)