Skip to content

Commit 3a31120

Browse files
committed
NH-3619 - Set default flush mode to Auto
1 parent efbb116 commit 3a31120

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

src/NHibernate.Test/App.config

+1-5
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,9 @@
5252
<property name="show_sql">false</property>
5353
<property name="command_timeout">444</property>
5454

55-
<property name="default_flush_mode">Commit</property>
56-
57-
</session-factory>
55+
</session-factory>
5856
</hibernate-configuration>
5957

60-
61-
6258
<log4net debug="false">
6359

6460
<!-- Appenders -->

src/NHibernate.Test/CfgTest/DefaultFlushModeFixture.cs

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System.Collections.Generic;
2+
using System.IO;
23
using System.Linq;
34
using System.Text;
5+
using System.Xml;
46
using NHibernate.Cfg;
57
using NUnit.Framework;
68

@@ -12,13 +14,19 @@ public class DefaultFlushModeFixture
1214
[Test]
1315
public void CanSetDefaultFlushModeThroughXmlConfiguration()
1416
{
15-
var cfg = new Configuration().Configure();
17+
const string c = @"<hibernate-configuration xmlns=""urn:nhibernate-configuration-2.2"">
18+
<session-factory name=""NHibernate.Test"">
19+
<property name=""default_flush_mode"">Commit</property>
20+
</session-factory>
21+
</hibernate-configuration>";
22+
23+
var cfg = new Configuration().Configure(new XmlTextReader(new StringReader(c)));
1624

1725
using (var sessionFactory = cfg.BuildSessionFactory())
1826
{
1927
using (var session = sessionFactory.OpenSession())
2028
{
21-
Assert.AreEqual(session.FlushMode, FlushMode.Commit);
29+
Assert.AreEqual(FlushMode.Commit, session.FlushMode);
2230
}
2331
}
2432
}
@@ -33,7 +41,7 @@ public void CanSetDefaultFlushModeThroughStandardConfiguration()
3341
{
3442
using (var session = sessionFactory.OpenSession())
3543
{
36-
Assert.AreEqual(session.FlushMode, FlushMode.Always);
44+
Assert.AreEqual(FlushMode.Always, session.FlushMode);
3745
}
3846
}
3947

@@ -43,7 +51,7 @@ public void CanSetDefaultFlushModeThroughStandardConfiguration()
4351
{
4452
using (var session = sessionFactory.OpenSession())
4553
{
46-
Assert.AreEqual(session.FlushMode, FlushMode.Commit);
54+
Assert.AreEqual(FlushMode.Commit, session.FlushMode);
4755
}
4856
}
4957
}
@@ -62,7 +70,7 @@ public void CanSetDefaultFlushModeThroughLoquaciousConfiguration()
6270
{
6371
using (var session = sessionFactory.OpenSession())
6472
{
65-
Assert.AreEqual(session.FlushMode, FlushMode.Always);
73+
Assert.AreEqual(FlushMode.Always, session.FlushMode);
6674
}
6775
}
6876

@@ -74,7 +82,7 @@ public void CanSetDefaultFlushModeThroughLoquaciousConfiguration()
7482
{
7583
using (var session = sessionFactory.OpenSession())
7684
{
77-
Assert.AreEqual(session.FlushMode, FlushMode.Commit);
85+
Assert.AreEqual(FlushMode.Commit, session.FlushMode);
7886
}
7987
}
8088
}

src/NHibernate/Cfg/SettingsFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public Settings BuildSettings(IDictionary<string, string> properties)
260260
}
261261

262262
//NH-3619
263-
FlushMode defaultFlushMode = (FlushMode) Enum.Parse(typeof(FlushMode), PropertiesHelper.GetString(Environment.DefaultFlushMode, properties, FlushMode.Unspecified.ToString()), false);
263+
FlushMode defaultFlushMode = (FlushMode) Enum.Parse(typeof(FlushMode), PropertiesHelper.GetString(Environment.DefaultFlushMode, properties, FlushMode.Auto.ToString()), false);
264264
log.Info("Default flush mode: " + defaultFlushMode);
265265
settings.DefaultFlushMode = defaultFlushMode;
266266

0 commit comments

Comments
 (0)