Add virtual DefaultQueryProvider.CreateWithOptions

Author: bahusoid

src/NHibernate.Test/Async/CfgTest/ConfigurationFixture.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Collections;
 using System.IO;
+using System.Linq;
 using System.Xml;
 using NHibernate.Cfg;
 using NHibernate.DomainModel;
@@ -107,6 +108,15 @@ public SampleQueryProvider(ISessionImplementor session) : base(session)
 {
 
 }
+
+protected SampleQueryProvider(ISessionImplementor session, object collection, NhQueryableOptions options) : base(session, collection, options)
+{
+}
+
+protected override IQueryProvider CreateWithOptions(NhQueryableOptions options)
+{
+return new SampleQueryProvider(Session, Collection, options);
+}
 }
 
 }

src/NHibernate.Test/CfgTest/ConfigurationFixture.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.IO;
+using System.Linq;
 using System.Xml;
 using NHibernate.Cfg;
 using NHibernate.DomainModel;
@@ -426,6 +427,15 @@ public SampleQueryProvider(ISessionImplementor session) : base(session)
 {
 
 }
+
+protected SampleQueryProvider(ISessionImplementor session, object collection, NhQueryableOptions options) : base(session, collection, options)
+{
+}
+
+protected override IQueryProvider CreateWithOptions(NhQueryableOptions options)
+{
+return new SampleQueryProvider(Session, Collection, options);
+}
 }
 
 [Test]
@@ -444,6 +454,12 @@ public void NH2890Standard()
 var query = session.Query<NHibernate.DomainModel.A>();
 Assert.IsInstanceOf(typeof(SampleQueryProvider), query.Provider);
 }
+
+using (var session = sessionFactory.OpenSession())
+{
+var query = session.Query<NHibernate.DomainModel.A>().WithOptions(x => x.SetReadOnly(true));
+Assert.IsInstanceOf(typeof(SampleQueryProvider), query.Provider);
+}
 }
 }
 

src/NHibernate/Linq/DefaultQueryProvider.cs

@@ -70,7 +70,7 @@ public DefaultQueryProvider(ISessionImplementor session, object collection)
 Collection = collection;
 }
 
-private DefaultQueryProvider(ISessionImplementor session, object collection, NhQueryableOptions options)
+protected DefaultQueryProvider(ISessionImplementor session, object collection, NhQueryableOptions options)
 : this(session, collection)
 {
 _options = options;
@@ -108,6 +108,11 @@ public IQueryProvider WithOptions(Action<NhQueryableOptions> setOptions)
 ? _options.Clone()
 : new NhQueryableOptions();
 setOptions(options);
+return CreateWithOptions(options);
+}
+
+protected virtual IQueryProvider CreateWithOptions(NhQueryableOptions options)
+{
 return new DefaultQueryProvider(Session, Collection, options);
 }