Merge branch 'master' into db2

Author: hazzik

.deepsource.toml

@@ -3,11 +3,11 @@ version = 1
 test_patterns = ["src/NHibernate.Test/**"]
 
 exclude_patterns = [
+  "src/NHibernate/**/*.generated.cs",
   "src/NHibernate/Async/**/*.cs",
   "src/NHibernate.DomainModel/Async/**/*.cs",
   "src/NHibernate.Test/Async/**/*.cs"
 ]
 
 [[analyzers]]
-name = "csharp"
-enabled = true
+name = "csharp"

.github/renovate.json

@@ -35,6 +35,12 @@
         "Oracle.ManagedDataAccess"
       ],
       "groupName": "Oracle.ManagedDataAccess"
+    },
+    {
+      "matchPackagePrefixes": [
+        "NHibernate.Caches"
+      ],
+      "groupName": "NHibernate.Caches"
     }
   ]
 }

README.md

@@ -26,7 +26,7 @@ Nightly Development Builds
 --------------------------
 
 The quickest way to get the latest development build of NHibernate is to add it to your project using 
-NuGet from MyGet feed (<https://www.myget.org/gallery/nhibernate>).
+NuGet from Cloudsmith feed (<https://cloudsmith.io/~nhibernate/repos/nhibernate-core/packages/>).
 
 In order to make life a little bit easier you can register the package source in the NuGet.Config
 file in the top folder of your project, similar to the following.
@@ -35,11 +35,18 @@ file in the top folder of your project, similar to the following.
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="NHibernateDevBuilds" value="https://www.myget.org/F/nhibernate/api/v3/index.json" />
+    <add key="NHibernateDevBuilds" value="https://nuget.cloudsmith.io/nhibernate/nhibernate-core/v3/index.json" />
   </packageSources>
 </configuration>
 ```
 
+Package repository hosting is graciously provided by  [Cloudsmith](https://cloudsmith.com).
+Cloudsmith is the only fully hosted, cloud-native, universal package management solution, that
+enables your organization to create, store and share packages in any format, to any place, with total
+confidence.
+
+[![Hosted By: Cloudsmith](https://img.shields.io/badge/OSS%20hosting%20by-cloudsmith-blue?logo=cloudsmith&style=flat-square)](https://cloudsmith.com)
+
 Community Forums
 ----------------
 

doc/reference/modules/basic_mapping.xml

@@ -2385,6 +2385,7 @@
                     <area id="onetoone9" coords="10 60"/>
                     <area id="onetoone10" coords="11 60"/>
                     <area id="onetoone11" coords="12 60"/>
+                    <area id="onetoone12" coords="13 60"/>
                 </areaspec>
                 <programlisting><![CDATA[<one-to-one
     name="propertyName"
@@ -2398,6 +2399,7 @@
     formula="any SQL expression"
     entity-name="entityName"
     foreign-key="foreignKeyName"
+    optimistic-lock="true|false"
 />]]></programlisting>
                 <calloutlist>
                     <callout arearefs="onetoone1">
@@ -2471,12 +2473,20 @@
                             <literal>entity-name</literal> (optional): The entity name of the associated class.
                         </para>
                     </callout>
-                    <callout arearefs="manytoone11">
+                    <callout arearefs="onetoone11">
                         <para>
                             <literal>foreign-key</literal> (optional): Specifies the name of the foreign key
                             constraint for DDL generation.
                         </para>
                     </callout>
+                    <callout arearefs="onetoone12">
+                        <para>
+                            <literal>optimistic-lock</literal> (optional - defaults to <literal>true</literal>):
+                            Specifies that updates to this property do or do not require acquisition of the
+                            optimistic lock. In other words, determines if a version increment should occur when
+                            this property is dirty.
+                        </para>
+                    </callout>
                 </calloutlist>
             </programlistingco>
 

doc/reference/modules/configuration.xml

@@ -1728,7 +1728,7 @@ in the parameter binding.</programlisting>
                                     Use the assembly qualified class name of a custom <literal>IObjectsFactory</literal>
                                     implementation.
                                 </para>
-                                <programlisting><![CDATA[<bytecode-provider
+                                <programlisting><![CDATA[<objects-factory
     type="className" />]]></programlisting>
                                 <para>
                                     You can also set this property by code by setting

releasenotes.txt

@@ -1,4 +1,50 @@
-Build 5.4.0
+Build 5.4.2
+=============================
+
+Release notes - NHibernate - Version 5.4.2
+
+6 issues were resolved in this release.
+
+** Bug
+
+   * #3274 Improve LINQ Contains subquery parameter detection
+   * #3271 LINQ subqueries wrongly altered by SelectClauseVisitor
+   * #3263 Wrong alias in Where clause if using Fetch and scalar Select
+   * #3239 Incorrect SQL generated fetching many-to-many with subclasses
+
+** New Feature
+
+   * #3251 MappingByCode: Support backfield property access
+
+** Task
+
+   * #3281 Merge 5.3.16 in 5.4.x
+   * #3277 Release 5.4.2
+
+
+Build 5.4.1
+=============================
+
+Release notes - NHibernate - Version 5.4.1
+
+5 issues were resolved in this release.
+
+** Bug
+
+   * #3216 Enable one-to-one optimistic lock handling in mapping
+   * #3215 Count(Distinct ...) does not work
+   * #3203 Fix a wrong example in configuration documentation
+
+** Task
+
+   * #3232 Release 5.4.1
+   * #3227 Merge 5.3.15 in 5.4.x
+
+As part of releasing 5.4.1, a missing 5.4.0 possible breaking change has been added, about
+one-to-one associations and optimistic locking. See 5.4.0 possible breaking changes.
+
+
+Build 5.4.0
 =============================
 
 Release notes - NHibernate - Version 5.4.0
@@ -12,6 +58,8 @@ Release notes - NHibernate - Version 5.4.0
     * 201 issues were resolved in this release.
 
     ##### Possible Breaking Changes #####
+        * One-to-one changes does now trigger a version increment, consistently with the default behavior of other kinds of
+          associations. See #3204.
         * Linq and criteria queries on unmapped entities will throw instead of returning an empty result list. See #1106, #1095.
         * The second level cache UpdateTimestampsCache does not use locks anymore. This may slightly increase the number of cases
           where stale data is returned by the query cache. See #2742.
@@ -186,6 +234,41 @@ Release notes - NHibernate - Version 5.4.0
    * #2242 Test case for NH-3972 - SQL error when selecting a column of a subclass when sibling classes have a column of the same name
 
 
+Build 5.3.16
+=============================
+
+Release notes - NHibernate - Version 5.3.16
+
+3 issues were resolved in this release.
+
+** Bug
+
+   * #3269 "Or" clause in a "where" condition returns a wrong result with not-found-ignore
+   * #3210 Wrong name value for L2 read-only cache warning on mutable
+
+** Task
+
+   * #3276 Release 5.3.16
+
+
+Build 5.3.15
+=============================
+
+Release notes - NHibernate - Version 5.3.15
+
+4 issues were resolved in this release.
+
+** Bug
+
+   * #3218 Failure of contains subquery with parameter
+   * #3187 Fix mixing implied implicit and left joins in HQL for v5.3
+
+** Task
+
+   * #3225 Release 5.3.15
+   * #3222 Automatically generate async code on pull requests for 5.3
+
+
 Build 5.3.14
 =============================
 
@@ -195,8 +278,8 @@ Release notes - NHibernate - Version 5.3.14
 
 ** Bug
 
-    #3169 InvalidOperationException: This transformer is not initialized by Cached Query
-    #3164 Fetching a lazy loaded component regression
+   * #3169 InvalidOperationException: This transformer is not initialized by Cached Query
+   * #3164 Fetching a lazy loaded component regression
 
 ** Task
 
@@ -212,14 +295,14 @@ Release notes - NHibernate - Version 5.3.13
 
 ** Bug
 
-    #3134 ManyToMany - Tries to select not existing column in Mapping Table
-    #3113 Join fails on Oracle9Dialect
-    #3030 Memory leak named parameter holds entity references
+   * #3134 ManyToMany - Tries to select not existing column in Mapping Table
+   * #3113 Join fails on Oracle9Dialect
+   * #3030 Memory leak named parameter holds entity references
 
 ** Improvement
 
-    #3120 Guards against use of a disposed session factory
-    #2994 Npgsql 6 is not compatible
+   * #3120 Guards against use of a disposed session factory
+   * #2994 Npgsql 6 is not compatible
 
 ** Task
 

src/NHibernate.Test/Async/Hql/Ast/HqlFixture.cs

@@ -141,6 +141,17 @@ public async Task MultipleParametersInCaseStatementAsync()
 			}
 		}
 
+		[Test]
+		public async Task ParametersInCaseThenClauseAsync()
+		{
+			using ISession s = OpenSession();
+			var result = await (s.CreateQuery("select a from Animal a where (case when 2=2 then ? else ? end) = 1")
+			              .SetParameter(0, 1)
+			              .SetParameter(1, 0)
+			              .UniqueResultAsync());
+			Assert.AreEqual(null, result);
+		}
+
 		[Test]
 		public async Task ParameterInCaseThenClauseAsync()
 		{

src/NHibernate.Test/Async/Hql/EntityJoinHqlTest.cs

@@ -358,6 +358,18 @@ from x2 in session.Query<NullableOwner>()
 				//GH-2988
 				var withNullOrValidList = await (session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == validManyToOne.Id || x.ManyToOne == null).ToListAsync());
 				var withNullOrValidList2 = await (session.Query<NullableOwner>().Where(x =>  x.ManyToOne == null || x.ManyToOne.Id == validManyToOne.Id).ToListAsync());
+				//GH-3269
+				var invalidId = Guid.NewGuid();
+				var withInvalidOrValid = await (session.Query<NullableOwner>().Where(x => x.OneToOne.Id == invalidId || x.ManyToOne.Id == validManyToOne.Id).ToListAsync());
+				var withInvalidOrNull = await (session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == invalidId || x.OneToOne == null).ToListAsync());
+				var withInvalidOrNotNull = await (session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == invalidId || x.OneToOne != null).ToListAsync());
+
+				Assert.That(withInvalidOrValid.Count, Is.EqualTo(1));
+				Assert.That(withInvalidOrNull.Count, Is.EqualTo(2));
+				Assert.That(withInvalidOrNotNull.Count, Is.EqualTo(0));
+
+				//GH-3185
+				var mixImplicitAndLeftJoinList = await (session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == validManyToOne.Id && x.OneToOne == null).ToListAsync());
 
 				Assert.That(fullList.Count, Is.EqualTo(2));
 				Assert.That(withValidManyToOneList.Count, Is.EqualTo(0));
@@ -366,6 +378,7 @@ from x2 in session.Query<NullableOwner>()
 				Assert.That(withNullManyToOneJoinedList.Count, Is.EqualTo(2));
 				Assert.That(withNullOrValidList.Count, Is.EqualTo(2));
 				Assert.That(withNullOrValidList2.Count, Is.EqualTo(2));
+				Assert.That(mixImplicitAndLeftJoinList.Count, Is.EqualTo(1));
 			}
 		}
 

src/NHibernate.Test/Async/Linq/EnumTests.cs

@@ -174,13 +174,11 @@ public async Task ConditionalNavigationPropertyAsync()
 			}
 		}
 
-		[Test]
-		public async Task CanQueryComplexExpressionOnTestEnumAsync()
+		[TestCase(null)]
+		[TestCase(TestEnum.Unspecified)]
+		public async Task CanQueryComplexExpressionOnTestEnumAsync(TestEnum? type)
 		{
-			//TODO: Fix issue on SQLite with type set to  TestEnum.Unspecified
-			TestEnum? type = null;
 			using (var session = OpenSession())
-			using (var trans = session.BeginTransaction())
 			{
 				var entities = session.Query<EnumEntity>();
 
@@ -197,7 +195,7 @@ public async Task CanQueryComplexExpressionOnTestEnumAsync()
 								 coalesce = user.NullableEnum1 ?? TestEnum.Medium
 							 }).ToListAsync());
 
-				Assert.That(query.Count, Is.EqualTo(0));
+				Assert.That(query.Count, Is.EqualTo(type == TestEnum.Unspecified ? 1 : 0));
 			}
 		}
 

src/NHibernate.Test/Async/Linq/FunctionTests.cs

@@ -459,6 +459,33 @@ where item.Discount.Equals(-1)
 			await (ObjectDumper.WriteAsync(query));
 		}
 
+		[Test]
+		public async Task WhereEnumEqualAsync()
+		{
+			var query = from item in db.PatientRecords
+						where item.Gender.Equals(Gender.Female)
+						select item;
+
+			await (ObjectDumper.WriteAsync(query));
+
+			query = from item in db.PatientRecords
+					where item.Gender.Equals(item.Gender)
+					select item;
+
+			await (ObjectDumper.WriteAsync(query));
+		}
+
+
+		[Test]
+		public async Task WhereObjectEqualAsync()
+		{
+			var query = from item in db.PatientRecords
+						where ((object) item.Gender).Equals(Gender.Female)
+						select item;
+
+			await (ObjectDumper.WriteAsync(query));
+		}
+
 		[Test]
 		public async Task WhereEquatableEqualAsync()
 		{