Merge 5.2.6 #2205
Merge 5.2.6 #2205
Conversation
- Combine cahce hit/miss logs where possible Fixes nhibernate#2127
* Add helper methods to get the configured connection string * Expand NH-3426 tests to expose nhibernateGH-2110 (and nhibernateGH-2109) * Detect BinaryGuid setting and apply correct GUID-to-string expression * Document the new sqlite.binaryguid setting BinaryGuid is a configuration property of some MySql drivers, but relates to type used in the database for handling GUIDs, which impacts the dialect. The cases for nhibernateGH-2109 are marked as ignored for now, as that is not a regression. Fixes nhibernate#2110
This fix the generation bug which previously had to be reverted after each generation, see maca88/AsyncGenerator#133.
src/NHibernate.Test/Async/SystemTransactions/DistributedSystemTransactionFixture.cs
Outdated
Show resolved
Hide resolved
| @@ -1081,6 +1081,20 @@ in the parameter binding.</programlisting> | |||
| </para> | |||
| </entry> | |||
| </row> | |||
| <row> | |||
| <entry> | |||
| <literal>sqlite.binaryguid</literal> | |||
There was a problem hiding this comment.
This new setting lacks its declaration in nhibernate-configuration.xsd file. Thus, it cannot be used in configuration files, and can only be used programmatically. Fixing this is just one line to add into nhibernate-configuration.xsd.
Ideally, it should be done on 5.2.x. But I do not think it deserves a release on its own. So I propose to handle it with a PR targeting master, and waiting for 5.3. If we have a 5.2.x to do for some other reasons before, we could then retarget 5.2x. Otherwise just fix it for 5.3. @oskarb
This comment has been minimized.
This comment has been minimized.
fredericDelaporte
force-pushed
the
Merge5.2.6
branch
from
1363f10 to
0957e70
Compare
There was a problem hiding this comment.
This PR is still not meant to be directly merged. For having a clean merge, it will be better to directly push to master.
But now I consider we can do it, and I am just awaiting validation from review.
(For allowing the direct push to master, better not have anything else merged prior to this PR, otherwise I will have to do the merge again.)
# Conflicts: # Tools/packages.config # src/NHibernate.Test/SystemTransactions/SystemTransactionFixture.cs # src/NHibernate.Test/TestDialects/PostgreSQL83TestDialect.cs # src/NHibernate/Async/Cache/NonstrictReadWriteCache.cs # src/NHibernate/Async/Cache/ReadOnlyCache.cs # src/NHibernate/Async/Cache/StandardQueryCache.cs # src/NHibernate/Async/Multi/QueryBatchItemBase.cs # src/NHibernate/Cache/NonstrictReadWriteCache.cs # src/NHibernate/Cache/ReadOnlyCache.cs # src/NHibernate/Cache/StandardQueryCache.cs # src/NHibernate/Loader/JoinWalker.cs # src/NHibernate/Loader/Loader.cs # src/NHibernate/Multi/QueryBatchItemBase.cs
fredericDelaporte
force-pushed
the
Merge5.2.6
branch
from
0957e70 to
c79ea1f
Compare
|
Review comments have been addressed. |
This PR is not meant to be merged. For having a clean merge, it will be better to directly push to master.