Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5117/NHibernate/Loader
Modified Files:
AbstractEntityLoader.cs OneToManyLoader.cs OuterJoinLoader.cs
Log Message:
Modified SetFromClause in SqlSelectBuilder to take a SqlString. Removed
some of the HACKs that were in classes using that method.
Index: AbstractEntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/AbstractEntityLoader.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AbstractEntityLoader.cs 19 Aug 2004 17:49:59 -0000 1.9
--- AbstractEntityLoader.cs 28 Aug 2004 05:26:36 -0000 1.10
***************
*** 41,50 ****
SelectString(persister, alias, suffixes[joins] )
)
- //TODO: HACK with ToString() required because of SetFromClause
.SetFromClause
(
persister.FromTableFragment(alias).Append(
persister.FromJoinFragment(alias, true, true)
! ).ToString()
)
.SetOuterJoins
--- 41,49 ----
SelectString(persister, alias, suffixes[joins] )
)
.SetFromClause
(
persister.FromTableFragment(alias).Append(
persister.FromJoinFragment(alias, true, true)
! )
)
.SetOuterJoins
***************
*** 87,95 ****
);
- //TODO: HACK with ToString() because of SetFromClause
sqlBuilder.SetFromClause(
persister.FromTableFragment(alias).Append(
persister.FromJoinFragment(alias, true, true)
! ).ToString()
);
--- 86,93 ----
);
sqlBuilder.SetFromClause(
persister.FromTableFragment(alias).Append(
persister.FromJoinFragment(alias, true, true)
! )
);
Index: OuterJoinLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OuterJoinLoader.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** OuterJoinLoader.cs 16 Aug 2004 05:26:39 -0000 1.13
--- OuterJoinLoader.cs 28 Aug 2004 05:26:36 -0000 1.14
***************
*** 424,428 ****
private static void AppendSelectString(StringBuilder buf, ILoadable persister, string alias, string suffix)
{
! //TODO: HACKs with ToString()
buf.Append( persister.IdentifierSelectFragment(alias,suffix).ToString() )
.Append( persister.PropertySelectFragment(alias, suffix).ToString() );
--- 424,429 ----
private static void AppendSelectString(StringBuilder buf, ILoadable persister, string alias, string suffix)
{
! // doing a ToString is okay because SelectFragments will have no parameters
! // and will be just straight strings cotaining sql.
buf.Append( persister.IdentifierSelectFragment(alias,suffix).ToString() )
.Append( persister.PropertySelectFragment(alias, suffix).ToString() );
Index: OneToManyLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OneToManyLoader.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OneToManyLoader.cs 19 Aug 2004 17:49:59 -0000 1.9
--- OneToManyLoader.cs 28 Aug 2004 05:26:36 -0000 1.10
***************
*** 62,70 ****
- //TODO: HACK with ToString() because of SetFromClause
selectBuilder.SetFromClause(
persister.FromTableFragment(alias).Append(
persister.FromJoinFragment(alias, true, true)
! ).ToString()
);
--- 62,69 ----
selectBuilder.SetFromClause(
persister.FromTableFragment(alias).Append(
persister.FromJoinFragment(alias, true, true)
! )
);
|
