From: Michael D. <mik...@us...> - 2004-11-22 03:53:27
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28715/Hql Modified Files: ClauseParser.cs QueryTranslator.cs WhereParser.cs Log Message: removed protected fields in favor of protected properties. Index: ClauseParser.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/ClauseParser.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ClauseParser.cs 30 Apr 2004 08:34:25 -0000 1.6 --- ClauseParser.cs 22 Nov 2004 03:53:07 -0000 1.7 *************** *** 53,57 **** { EndChild(q); ! child = new WhereParser(q.dialect); child.Start(q); } --- 53,57 ---- { EndChild(q); ! child = new WhereParser( q.Dialect ); child.Start(q); } *************** *** 65,69 **** { EndChild(q); ! child = new HavingParser(q.dialect); child.Start(q); } --- 65,69 ---- { EndChild(q); ! child = new HavingParser( q.Dialect ); child.Start(q); } Index: WhereParser.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/WhereParser.cs,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** WhereParser.cs 20 Nov 2004 15:49:38 -0000 1.24 --- WhereParser.cs 22 Nov 2004 03:53:07 -0000 1.25 *************** *** 260,264 **** throw new QueryException("MappingException occurred compiling subquery", me); } ! // AppendToken( q, subq.SQLString); AppendToken(q, subq.SqlString); inSubselect = false; --- 260,264 ---- throw new QueryException("MappingException occurred compiling subquery", me); } ! AppendToken(q, subq.SqlString); inSubselect = false; Index: QueryTranslator.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** QueryTranslator.cs 21 Nov 2004 22:56:28 -0000 1.48 --- QueryTranslator.cs 22 Nov 2004 03:53:07 -0000 1.49 *************** *** 169,178 **** /// Persisters for the return values of a <c>Find</c> style query /// </summary> ! public override ILoadable[] Persisters { ! get ! { ! return persisters; ! } } --- 169,181 ---- /// Persisters for the return values of a <c>Find</c> style query /// </summary> ! /// <remarks> ! /// The <c>Persisters</c> stored by QueryTranslator have to be <see cref="IQueryable"/>. The ! /// <c>setter</c> will attempt to cast the <c>ILoadable</c> array passed in into an ! /// <c>IQueryable</c> array. ! /// </remarks> ! protected override ILoadable[] Persisters { ! get { return persisters; } ! set { persisters = (IQueryable[])value; } } *************** *** 281,285 **** // we want! return new SqlCommand.Alias(10, NextCount().ToString() + StringHelper.Underscore) ! .ToAliasString(StringHelper.Unqualify(description).ToLower(), dialect); } --- 284,288 ---- // we want! return new SqlCommand.Alias(10, NextCount().ToString() + StringHelper.Underscore) ! .ToAliasString(StringHelper.Unqualify(description).ToLower(), Dialect ); } |