Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move NHibernate.Hql.Ast.ANTLR.Loader.QueryLoader to NHibernate.Loader…

….Hql namespace to match Hibernate
  • Loading branch information...
commit 1ba05d620100560d099b975c506ee2a79ba19556 1 parent a91fac6
@hazzik hazzik authored
View
11 src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
@@ -10,11 +10,10 @@
using NHibernate.Engine.Query;
using NHibernate.Event;
using NHibernate.Hql.Ast.ANTLR.Exec;
-using NHibernate.Hql.Ast.ANTLR.Loader;
using NHibernate.Hql.Ast.ANTLR.Tree;
using NHibernate.Hql.Ast.ANTLR.Util;
+using NHibernate.Loader.Hql;
using NHibernate.Param;
-using NHibernate.Persister.Entity;
using NHibernate.SqlCommand;
using NHibernate.Type;
using NHibernate.Util;
@@ -98,10 +97,10 @@ public IList List(ISessionImplementor session, QueryParameters queryParameters)
{
log.Warn( "firstResult/maxResults specified with collection fetch; applying in memory!" );
var selection = new RowSelection
- {
- FetchSize = queryParameters.RowSelection.FetchSize,
- Timeout = queryParameters.RowSelection.Timeout
- };
+ {
+ FetchSize = queryParameters.RowSelection.FetchSize,
+ Timeout = queryParameters.RowSelection.Timeout
+ };
queryParametersToUse = queryParameters.CreateCopyUsing( selection );
}
else
View
13 src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs → src/NHibernate/Loader/Hql/QueryLoader.cs
@@ -5,9 +5,10 @@
using System.Diagnostics;
using NHibernate.Engine;
using NHibernate.Event;
+using NHibernate.Hql;
+using NHibernate.Hql.Ast.ANTLR;
using NHibernate.Hql.Ast.ANTLR.Tree;
using NHibernate.Impl;
-using NHibernate.Loader;
using NHibernate.Param;
using NHibernate.Persister.Collection;
using NHibernate.Persister.Entity;
@@ -17,7 +18,7 @@
using NHibernate.Util;
using IQueryable = NHibernate.Persister.Entity.IQueryable;
-namespace NHibernate.Hql.Ast.ANTLR.Loader
+namespace NHibernate.Loader.Hql
{
[CLSCompliant(false)]
public class QueryLoader : BasicLoader
@@ -59,7 +60,7 @@ public override bool IsSubselectLoadingEnabled
}
protected override SqlString ApplyLocks(SqlString sql, IDictionary<string, LockMode> lockModes,
- Dialect.Dialect dialect)
+ Dialect.Dialect dialect)
{
if (lockModes == null || lockModes.Count == 0)
{
@@ -292,8 +293,8 @@ public override IList GetResultList(IList results, IResultTransformer resultTran
{
// meant to handle dynamic instantiation queries...
HolderInstantiator holderInstantiator = HolderInstantiator.GetHolderInstantiator(_selectNewTransformer,
- resultTransformer,
- _queryReturnAliases);
+ resultTransformer,
+ _queryReturnAliases);
if (holderInstantiator.IsRequired)
{
for (int i = 0; i < results.Count; i++)
@@ -319,7 +320,7 @@ public override IList GetResultList(IList results, IResultTransformer resultTran
}
protected override object GetResultColumnOrRow(object[] row, IResultTransformer resultTransformer, IDataReader rs,
- ISessionImplementor session)
+ ISessionImplementor session)
{
row = ToResultRow(row);
bool hasTransform = HasSelectNew || resultTransformer != null;
View
4 src/NHibernate/Loader/Loader.cs
@@ -146,8 +146,8 @@ public ISessionFactoryImplementor Factory
/// value using the Property instead of directly to the field.
/// </para>
/// <para>
- /// The scope is <c>protected internal</c> because the <see cref="Hql.Classic.WhereParser"/> needs to
- /// be able to <c>get</c> the SqlString of the <see cref="Hql.Classic.QueryTranslator"/> when
+ /// The scope is <c>protected internal</c> because the <see cref="WhereParser"/> needs to
+ /// be able to <c>get</c> the SqlString of the <see cref="QueryTranslator"/> when
/// it is parsing a subquery.
/// </para>
/// </remarks>
View
2  src/NHibernate/NHibernate.csproj
@@ -935,7 +935,7 @@
<Compile Include="Hql\Ast\ANTLR\InvalidPathException.cs" />
<Compile Include="Hql\Ast\ANTLR\InvalidWithClauseException.cs" />
<Compile Include="Hql\Ast\ANTLR\IParseErrorHandler.cs" />
- <Compile Include="Hql\Ast\ANTLR\Loader\QueryLoader.cs" />
+ <Compile Include="Loader\Hql\QueryLoader.cs" />
<Compile Include="Hql\Ast\ANTLR\PolymorphicQuerySourceDetector.cs" />
<Compile Include="Hql\Ast\ANTLR\QuerySourceDetector.cs" />
<Compile Include="Hql\Ast\ANTLR\Tree\AssignmentSpecification.cs" />
Please sign in to comment.
Something went wrong with that request. Please try again.