Merge branch 'master' into 5.0.x

Author: fredericDelaporte

.editorconfig

@@ -20,6 +20,13 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
+[*.csproj]
+indent_style = space
+indent_size = 2
+
+[*.vbproj]
+indent_style = space
+indent_size = 2
 
 [*.cshtml]
 indent_style = space

README.md

@@ -38,10 +38,11 @@ Bug Reports
 
 If you find any bugs, please report them using the [GitHub issue tracker][C1]. A
 test-case that demonstrates the issue is usually required. Instructions on providing a test-case
-can be found [here][C2].
+can be found in [contributing guidelines][C3] or [here][C2].
 
 [C1]: http://github.com/nhibernate/nhibernate-core/issues
-[C2]: http://nhibernate.info/blog/2008/10/03/the-best-way-to-solve-nhibernate-bugs-submit-good-unit-test.html
+[C2]: http://nhibernate.info/blog/2008/10/04/the-best-way-to-solve-nhibernate-bugs-submit-good-unit-test.html
+[C3]: CONTRIBUTING.md
 
 Licenses
 --------

Tools/packages.config

@@ -7,6 +7,6 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
-  <package id="CSharpAsyncGenerator.CommandLine" version="0.6.0" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.6.2" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
 </packages>

doc/reference/modules/configuration.xml

@@ -1026,6 +1026,29 @@ var session = sessions.OpenSession(conn);
                             </para>
                         </entry>
                     </row>
+                    <row>
+                        <entry>
+                            <literal>track_session_id</literal>
+                        </entry>
+                        <entry>
+                            Set whether the session id should be tracked in logs or not. When <literal>true</literal>, each
+                            session will have an unique <literal>Guid</literal> that can be retrieved with
+                            <literal>ISessionImplementor.SessionId</literal>, otherwise <literal>ISessionImplementor.SessionId</literal>
+                            will be <literal>Guid.Empty</literal>.
+                            <para>
+                                Session id is used for logging purpose and can also be retrieved on the static property
+                                <literal>NHibernate.Impl.SessionIdLoggingContext.SessionId</literal>, when tracking is enabled.
+                            </para>
+                            <para>
+                                Disabling tracking by setting <literal>track_session_id</literal> to <literal>false</literal>
+                                increases performances. Default is <literal>true</literal>.
+                            </para>
+                            <para>
+                                <emphasis role="strong">eg.</emphasis>
+                                <literal>true</literal> | <literal>false</literal>
+                            </para>
+                        </entry>
+                    </row>
                     <row>
                         <entry>
                             <literal>sql_types.keep_datetime</literal>

doc/reference/modules/manipulating_data.xml

@@ -820,7 +820,7 @@ sess.Lock(pk, LockMode.Upgrade);]]></programlisting>
         </orderedlist>
 
         <para>
-            (An exception is that objects using <literal>native</literal> ID generation are 
+            (An exception is that objects using <literal>identity</literal> ID generation are
             inserted when they are saved.)
         </para>
 
@@ -861,6 +861,37 @@ using (ITransaction tx = sess.BeginTransaction())
 
     </sect1>
 
+    <sect1 id="manipulatingdata-dirtiness">
+        <title>Checking dirtiness</title>
+
+        <para>
+            <literal>ISession.IsDirty()</literal> will return whether the session hold any pending
+            change to flush or not. Be cautious when using this method, its default implementation
+            may have the following effects:
+        </para>
+
+        <itemizedlist spacing="compact">
+            <listitem>
+                <para>
+                    Dirty checks all the loaded entities. NHibernate does not instrument the entities
+                    for being notified of changes done on loaded ones. Instead, it stores their
+                    initial state and compare them to it. If session has loaded a lot of entities,
+                    the dirty checking will have a significant impact.
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    Triggers pending cascade operations. This includes any pending <literal>Save</literal>
+                    of, by example, children added to a collection having the <literal>Save</literal>
+                    cascade enabled. Depending on the entities ID generators (see
+                    <xref linkend="mapping-declaration-id-generator"/>), this may trigger calls to the
+                    database, or even entity insertions if they are using the <literal>identity</literal>
+                    generator.
+                </para>
+            </listitem>
+        </itemizedlist>
+    </sect1>
+
     <sect1 id="manipulatingdata-endingsession">
         <title>Ending a Session</title>
 

src/NHibernate.Test/Async/DriverTest/OdbcDriverFixture.cs

@@ -0,0 +1,117 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Collections;
+using NHibernate.Dialect;
+using NHibernate.Driver;
+using NHibernate.Engine;
+using NUnit.Framework;
+
+namespace NHibernate.Test.DriverTest
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class OdbcDriverFixtureAsync : TestCase
+	{
+		protected override string MappingsAssembly => "NHibernate.Test";
+
+		protected override IList Mappings => new[] { "DriverTest.MultiTypeEntity.hbm.xml" };
+
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			return dialect is MsSql2000Dialect;
+		}
+
+		protected override bool AppliesTo(ISessionFactoryImplementor factory)
+		{
+			return factory.ConnectionProvider.Driver is OdbcDriver;
+		}
+
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				s.CreateQuery("delete from MultiTypeEntity").ExecuteUpdate();
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public async Task CrudAsync()
+		{
+			// Should use default dimension for CRUD op because the mapping does not 
+			// have dimensions specified.
+			object savedId;
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				savedId = await (s.SaveAsync(
+					new MultiTypeEntity
+					{
+						StringProp = "a",
+						StringClob = "a",
+						BinaryBlob = new byte[] { 1, 2, 3 },
+						Binary = new byte[] { 4, 5, 6 },
+						Currency = 123.4m,
+						Double = 123.5d,
+						Decimal = 789.5m,
+						DecimalHighScale = 1234567890.0123456789m
+					}));
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var m = await (s.GetAsync<MultiTypeEntity>(savedId));
+
+				Assert.That(m.StringProp, Is.EqualTo("a"), "StringProp");
+				Assert.That(m.StringClob, Is.EqualTo("a"), "StringClob");
+				Assert.That(m.BinaryBlob, Is.EqualTo(new byte[] { 1, 2, 3 }), "BinaryBlob");
+				Assert.That(m.Binary, Is.EqualTo(new byte[] { 4, 5, 6 }), "BinaryBlob");
+				Assert.That(m.Currency, Is.EqualTo(123.4m), "Currency");
+				Assert.That(m.Double, Is.EqualTo(123.5d).Within(0.0001d), "Double");
+				Assert.That(m.Decimal, Is.EqualTo(789.5m), "Decimal");
+				Assert.That(m.DecimalHighScale, Is.EqualTo(1234567890.0123456789m), "DecimalHighScale");
+
+				m.StringProp = "b";
+				m.StringClob = "b";
+				m.BinaryBlob = new byte[] { 4, 5, 6 };
+				m.Binary = new byte[] { 7, 8, 9 };
+				m.Currency = 456.78m;
+				m.Double = 987.6d;
+				m.Decimal = 1323456.45m;
+				m.DecimalHighScale = 9876543210.0123456789m;
+				await (t.CommitAsync());
+			}
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var m = await (s.LoadAsync<MultiTypeEntity>(savedId));
+
+				Assert.That(m.StringProp, Is.EqualTo("b"), "StringProp");
+				Assert.That(m.StringClob, Is.EqualTo("b"), "StringClob");
+				Assert.That(m.BinaryBlob, Is.EqualTo(new byte[] { 4, 5, 6 }), "BinaryBlob");
+				Assert.That(m.Binary, Is.EqualTo(new byte[] { 7, 8, 9 }), "BinaryBlob");
+				Assert.That(m.Currency, Is.EqualTo(456.78m), "Currency");
+				Assert.That(m.Double, Is.EqualTo(987.6d).Within(0.0001d), "Double");
+				Assert.That(m.Decimal, Is.EqualTo(1323456.45m), "Decimal");
+				Assert.That(m.DecimalHighScale, Is.EqualTo(9876543210.0123456789m), "DecimalHighScale");
+
+				await (t.CommitAsync());
+			}
+		}
+	}
+}