Skip to content

Commit e6f3fd0

Browse files
oskarboskarb
committed
NH-3644: Remove the now empty IEnhancedProjection interface.
1 parent 0fa5e02 commit e6f3fd0

File tree

8 files changed

+14
-57
lines changed

8 files changed

+14
-57
lines changed

‎src/NHibernate/Criterion/AliasedProjection.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace NHibernate.Criterion
99
{
1010
[Serializable]
11-
public class AliasedProjection : IEnhancedProjection
11+
public class AliasedProjection : IProjection
1212
{
1313
private readonly IProjection projection;
1414
private readonly string alias;
@@ -55,9 +55,7 @@ public virtual string[] GetColumnAliases(string alias, int loc)
5555

5656
public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
5757
{
58-
return projection is IEnhancedProjection
59-
? ((IEnhancedProjection)projection).GetColumnAliases(position, criteria, criteriaQuery)
60-
: this.GetColumnAliases(position);
58+
return projection.GetColumnAliases(position, criteria, criteriaQuery);
6159
}
6260

6361
public string[] GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery)

‎src/NHibernate/Criterion/Distinct.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace NHibernate.Criterion
88
{
99
[Serializable]
10-
public class Distinct : IEnhancedProjection
10+
public class Distinct : IProjection
1111
{
1212
private readonly IProjection projection;
1313

@@ -44,9 +44,7 @@ public virtual string[] GetColumnAliases(int loc)
4444

4545
public virtual string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
4646
{
47-
return projection is IEnhancedProjection
48-
? ((IEnhancedProjection)projection).GetColumnAliases(position, criteria, criteriaQuery)
49-
: GetColumnAliases(position);
47+
return projection.GetColumnAliases(position, criteria, criteriaQuery);
5048
}
5149

5250
public virtual string[] GetColumnAliases(string alias, int loc)
@@ -56,9 +54,7 @@ public virtual string[] GetColumnAliases(string alias, int loc)
5654

5755
public virtual string[] GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
5856
{
59-
return projection is IEnhancedProjection
60-
? ((IEnhancedProjection)projection).GetColumnAliases(alias, position, criteria, criteriaQuery)
61-
: GetColumnAliases(alias, position);
57+
return projection.GetColumnAliases(alias, position, criteria, criteriaQuery);
6258
}
6359

6460
public virtual string[] Aliases

‎src/NHibernate/Criterion/GroupedProjection.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ public virtual string[] GetColumnAliases(string alias, int loc)
5050

5151
public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
5252
{
53-
return projection is IEnhancedProjection
54-
? ((IEnhancedProjection)projection).GetColumnAliases(position, criteria, criteriaQuery)
55-
: this.GetColumnAliases(position);
53+
return projection.GetColumnAliases(position, criteria, criteriaQuery);
5654
}
5755

5856
public string[] GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery)

‎src/NHibernate/Criterion/IEnhancedProjection.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/NHibernate/Criterion/ProjectionList.cs

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace NHibernate.Criterion
1111
{
1212
[Serializable]
13-
public class ProjectionList : IEnhancedProjection
13+
public class ProjectionList : IProjection
1414
{
1515
private IList<IProjection> elements = new List<IProjection>();
1616

@@ -61,7 +61,7 @@ public SqlString ToSqlString(ICriteria criteria, int loc, ICriteriaQuery criteri
6161
{
6262
IProjection proj = this[i];
6363
buf.Add(proj.ToSqlString(criteria, loc, criteriaQuery, enabledFilters));
64-
loc += GetColumnAliases(loc, criteria, criteriaQuery, proj).Length;
64+
loc += proj.GetColumnAliases(loc, criteria, criteriaQuery).Length;
6565
if (i < elements.Count - 1)
6666
{
6767
buf.Add(", ");
@@ -121,7 +121,7 @@ public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuer
121121
var result = new List<string>(Length);
122122
for (var i = 0; i < Length; i++)
123123
{
124-
var colAliases = GetColumnAliases(position, criteria, criteriaQuery, this[i]);
124+
var colAliases = this[i].GetColumnAliases(position, criteria, criteriaQuery);
125125
result.AddRange(colAliases);
126126
position += colAliases.Length;
127127
}
@@ -132,26 +132,12 @@ public string[] GetColumnAliases(string alias, int position, ICriteria criteria,
132132
{
133133
for (int i = 0; i < Length; i++)
134134
{
135-
string[] result = GetColumnAliases(alias, position, criteria, criteriaQuery, this[i]);
135+
string[] result = this[i].GetColumnAliases(alias, position, criteria, criteriaQuery);
136136
if (result != null) return result;
137-
position += GetColumnAliases(position, criteria, criteriaQuery, this[i]).Length;
137+
position += this[i].GetColumnAliases(position, criteria, criteriaQuery).Length;
138138
}
139139
return null;
140140
}
141-
142-
private static string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery, IProjection projection)
143-
{
144-
return projection is IEnhancedProjection
145-
? ((IEnhancedProjection)projection).GetColumnAliases(position, criteria, criteriaQuery)
146-
: projection.GetColumnAliases(position);
147-
}
148-
149-
private static string[] GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery, IProjection projection)
150-
{
151-
return projection is IEnhancedProjection
152-
? ((IEnhancedProjection)projection).GetColumnAliases(alias, position, criteria, criteriaQuery)
153-
: projection.GetColumnAliases(alias, position);
154-
}
155141

156142
public IType[] GetTypes(string alias, ICriteria criteria, ICriteriaQuery criteriaQuery)
157143
{

‎src/NHibernate/Criterion/SimpleProjection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace NHibernate.Criterion
1010
/// A single-column projection that may be aliased
1111
/// </summary>
1212
[Serializable]
13-
public abstract class SimpleProjection : IEnhancedProjection
13+
public abstract class SimpleProjection : IProjection
1414
{
1515
public IProjection As(string alias)
1616
{

‎src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,7 @@ public IType[] ProjectedTypes
179179

180180
public string[] ProjectedColumnAliases
181181
{
182-
get
183-
{
184-
return rootCriteria.Projection is IEnhancedProjection
185-
? ((IEnhancedProjection)rootCriteria.Projection).GetColumnAliases(0, rootCriteria, this)
186-
: rootCriteria.Projection.GetColumnAliases(0);
187-
}
182+
get { return rootCriteria.Projection.GetColumnAliases(0, rootCriteria, this); }
188183
}
189184

190185
public string[] ProjectedAliases
@@ -818,11 +813,7 @@ public string[] GetColumnAliasesUsingProjection(ICriteria subcriteria, string pr
818813
string[] projectionColumns = null;
819814

820815
if (projection != null)
821-
{
822-
projectionColumns = projection is IEnhancedProjection
823-
? ((IEnhancedProjection)projection).GetColumnAliases(propertyName, 0, subcriteria, this)
824-
: projection.GetColumnAliases(propertyName, 0);
825-
}
816+
projectionColumns = projection.GetColumnAliases(propertyName, 0, subcriteria, this);
826817

827818
if (projectionColumns == null)
828819
{

‎src/NHibernate/NHibernate.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
<Compile Include="Connection\DriverConnectionProvider.cs" />
138138
<Compile Include="Connection\IConnectionProvider.cs" />
139139
<Compile Include="Connection\UserSuppliedConnectionProvider.cs" />
140-
<Compile Include="Criterion\IEnhancedProjection.cs" />
141140
<Compile Include="Dialect\DB2Dialect.cs" />
142141
<Compile Include="Dialect\Dialect.cs" />
143142
<Compile Include="Dialect\FirebirdDialect.cs" />

0 commit comments

Comments
 (0)