Skip to content

Commit ba4e74e

Browse files
fredericDelaportebahusoid
authored andcommitted
Apply code review changes
1 parent e704826 commit ba4e74e

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

src/NHibernate.Test/NHSpecificTest/GH1994/ManyToManyFilteredFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void TestQueryOverRestrictionWithClause()
143143
[Test]
144144
public void LazyLoad()
145145
{
146-
if(Dialect is PostgreSQLDialect)
146+
if (Dialect is PostgreSQLDialect)
147147
Assert.Ignore("Dialect doesn't support 0/1 to bool implicit cast");
148148

149149
using (var s = OpenSession())
@@ -158,7 +158,7 @@ public void LazyLoad()
158158
[Test]
159159
public void LazyLoadFiltered()
160160
{
161-
if(Dialect is PostgreSQLDialect)
161+
if (Dialect is PostgreSQLDialect)
162162
Assert.Ignore("Dialect doesn't support 0/1 to bool implicit cast");
163163

164164
using (var s = OpenSession())

src/NHibernate.Test/NHSpecificTest/NH750/Mappings.hbm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key column="DeviceId"/>
1414
<many-to-many class="Drive" column="DriveId" not-found="ignore"/>
1515
</bag>
16-
<bag name="DrivesNotIgnored" lazy="true" table="DriveOfDeviceNotIgnored" cascade="persist" >
16+
<bag name="DrivesNotIgnored" lazy="true" table="DriveOfDeviceNotIgnored" cascade="persist" >
1717
<key column="DeviceId"/>
1818
<many-to-many class="Drive" column="DriveId" foreign-key="none"/>
1919
</bag>

src/NHibernate/Loader/OuterJoinableAssociation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ internal string GetSelectFragment(string entitySuffix, string collectionSuffix)
238238
case SelectMode.FetchLazyPropertyGroup:
239239
return ReflectHelper.CastOrThrow<ISupportLazyPropsJoinable>(Joinable, "fetch lazy property")
240240
.SelectFragment(
241-
RHSAlias,
241+
RHSAlias,
242242
collectionSuffix,
243243
ShouldFetchCollectionPersister(),
244244
new EntityLoadInfo(entitySuffix)

src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,11 +1779,12 @@ public virtual string SelectFragment(
17791779

17801780
// 6.0 TODO: Remove
17811781
[Obsolete("Please use overload without rhs and rhsAlias parameters")]
1782-
public virtual string SelectFragment(IJoinable rhs, string rhsAlias, string lhsAlias, string collectionSuffix, bool includeCollectionColumns, EntityLoadInfo entityInfo)
1782+
public virtual string SelectFragment(IJoinable rhs, string rhsAlias, string lhsAlias, string currentCollectionSuffix, bool includeCollectionColumns, EntityLoadInfo entityInfo)
17831783
{
1784-
return SelectFragment(lhsAlias, collectionSuffix, includeCollectionColumns, entityInfo);
1784+
return SelectFragment(lhsAlias, currentCollectionSuffix, includeCollectionColumns, entityInfo);
17851785
}
17861786

1787+
// 6.0 TODO: Make abstract
17871788
public virtual string SelectFragment(string lhsAlias, string currentCollectionSuffix, bool includeCollectionColumns, EntityLoadInfo entityInfo)
17881789
{
17891790
throw new NotImplementedException("SelectFragment with fetching lazy properties option is not implemented by " + GetType().FullName);

src/NHibernate/Persister/Collection/OneToManyPersister.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public override string SelectFragment(string lhsAlias, string collectionSuffix,
317317
{
318318
var selectMode = ReflectHelper.CastOrThrow<ISupportLazyPropsJoinable>(ElementPersister, "fetch lazy properties");
319319
if (selectMode != null)
320-
return buf.Append(selectMode.SelectFragment( lhsAlias, null, false, entityInfo)).ToString();
320+
return buf.Append(selectMode.SelectFragment(lhsAlias, null, false, entityInfo)).ToString();
321321
}
322322

323323
var ojl = (IOuterJoinLoadable)ElementPersister;

0 commit comments

Comments
 (0)