Merge branch 'master' into NH-4034

Author: hazzik

ShowBuildMenu.bat

@@ -50,12 +50,14 @@ echo F. Add a test configuration for PostgreSQL.
 echo G. Add a test configuration for Oracle.
 echo H. Add a test configuration for SQL Server Compact (x86).
 echo I. Add a test configuration for SQL Server Compact (x64).
+echo J. Add a test configuration for MySql.
 echo.
 echo X.  Exit to main menu.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGHIX
-if errorlevel 9 goto main-menu
+%BUILDTOOL% prompt ABCDEFGHIJX
+if errorlevel 10 goto main-menu
+if errorlevel 9 goto test-setup-mysql
 if errorlevel 8 goto test-setup-sqlservercex64
 if errorlevel 7 goto test-setup-sqlservercex86
 if errorlevel 6 goto test-setup-oracle
@@ -120,6 +122,13 @@ set LIB_FILES=lib\teamcity\postgresql\*.dll
 set LIB_FILES2=
 goto test-setup-generic
 
+:test-setup-mysql
+set CONFIG_NAME=MySql
+set PLATFORM=AnyCPU
+set LIB_FILES=lib\teamcity\mysql\*.dll
+set LIB_FILES2=
+goto test-setup-generic
+
 :test-setup-oracle
 set CONFIG_NAME=Oracle
 set PLATFORM=x86

src/NHibernate.Config.Templates/MySql.cfg.xml

@@ -4,13 +4,13 @@ This template was written to work with NHibernate.Test.
 Copy the template to your NHibernate.Test project folder and rename it in hibernate.cfg.xml and change it 
 for your own use before compile tests in VisualStudio.
 -->
-<!-- This is the ByteFX.Data.dll provider for MySql -->
 <hibernate-configuration  xmlns="urn:nhibernate-configuration-2.2" >
 	<session-factory name="NHibernate.Test">
 		<property name="connection.driver_class">NHibernate.Driver.MySqlDataDriver</property>
 		<property name="connection.connection_string">
-			Database=test;Data Source=someip;User Id=blah;Password=blah
+			Database=nhibernate;Data Source=localhost;User Id=nhibernate;Password=;
+			Protocol=memory;Old Guids=True;
 		</property>
-		<property name="dialect">NHibernate.Dialect.MySQLDialect</property>
+		<property name="dialect">NHibernate.Dialect.MySQL5Dialect</property>
 	</session-factory>
 </hibernate-configuration>

src/NHibernate.Test/NHSpecificTest/NH2241/Fixture.cs

@@ -0,0 +1,44 @@
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2241
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var tran = session.BeginTransaction())
+			{
+				var country = new Country {CountryCode = "SE", CountryName = "Sweden"};
+				session.Save(country);
+				tran.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var tran = session.BeginTransaction())
+			{
+				session.Delete("from Country");
+				session.Delete("from User");
+				tran.Commit();
+			}
+		}
+
+		[Test]
+		public void CanInsertUsingStatelessEvenWhenAssociatedEntityHasCacheStategy()
+		{
+			using (var ss = Sfi.OpenStatelessSession())
+			using (var tx = ss.BeginTransaction())
+			{
+				var user = new User();
+				user.Country = new Country {CountryCode = "SE", CountryName = "Sweden"};
+
+				ss.Insert(user);
+				tx.Commit();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH2241/Mappings.hbm.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+	assembly="NHibernate.Test"
+	namespace="NHibernate.Test.NHSpecificTest.NH2241">
+
+  <class name="User" table="Users">
+    <id name="Id">
+      <generator class="native"/>
+    </id>
+
+    <many-to-one name="Country" column="CountryCode" cascade="none" />
+  </class>
+
+  <class name="Country">
+    <cache region="ShortTerm" usage="read-write" />
+
+    <id name="CountryCode">
+      <generator class="assigned"/>
+    </id>
+
+    <property name="CountryName" />
+
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH2241/Model.cs

@@ -0,0 +1,16 @@
+namespace NHibernate.Test.NHSpecificTest.NH2241
+{
+	public class User
+	{
+		public virtual int Id { get; set; }
+
+		public virtual Country Country { get; set; }
+	}
+
+	public class Country
+	{
+		public virtual string CountryCode { get; set; }
+
+		public virtual string CountryName { get; set; }
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -760,6 +760,8 @@
     <Compile Include="NHSpecificTest\EntityWithUserTypeCanHaveLinqGenerators\Fixture.cs" />
     <Compile Include="NHSpecificTest\EntityWithUserTypeCanHaveLinqGenerators\FooExample.cs" />
     <Compile Include="NHSpecificTest\EntityWithUserTypeCanHaveLinqGenerators\IExample.cs" />
+    <Compile Include="NHSpecificTest\NH2241\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH2241\Model.cs" />
     <Compile Include="Insertordering\NH3931Entities.cs" />
     <Compile Include="NHSpecificTest\NH4004\Entity.cs" />
     <Compile Include="NHSpecificTest\NH4004\Fixture.cs" />
@@ -3287,6 +3289,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="TransactionTest\Person.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH2241\Mappings.hbm.xml" />
     <EmbeddedResource Include="Futures\Mappings.hbm.xml" />
     <EmbeddedResource Include="SessionBuilder\Mappings.hbm.xml" />
     <EmbeddedResource Include="IdTest\IdentityClass.hbm.xml" />

src/NHibernate/Engine/BatchFetchQueue.cs

@@ -236,7 +236,7 @@ public object[] GetEntityBatch(IEntityPersister persister,object id,int batchSiz
 
 		private bool IsCached(EntityKey entityKey, IEntityPersister persister)
 		{
-			if (persister.HasCache)
+			if (persister.HasCache && context.Session.CacheMode.HasFlag(CacheMode.Get))
 			{
 				CacheKey key = context.Session.GenerateCacheKey(entityKey.Identifier, persister.IdentifierType, entityKey.EntityName);
 				return persister.Cache.Cache.Get(key) != null;
@@ -246,12 +246,12 @@ private bool IsCached(EntityKey entityKey, IEntityPersister persister)
 
 		private bool IsCached(object collectionKey, ICollectionPersister persister)
 		{
-			if (persister.HasCache)
+			if (persister.HasCache && context.Session.CacheMode.HasFlag(CacheMode.Get))
 			{
 				CacheKey cacheKey = context.Session.GenerateCacheKey(collectionKey, persister.KeyType, persister.Role);
 				return persister.Cache.Cache.Get(cacheKey) != null;
 			}
 			return false;
 		}
 	}
-}
+}

src/NHibernate/Engine/Loading/CollectionLoadContext.cs

@@ -260,7 +260,7 @@ private void EndLoadingCollection(LoadingCollectionEntry lce, ICollectionPersist
 			}
 
 			bool addToCache = hasNoQueuedAdds && persister.HasCache && 
-				((session.CacheMode & CacheMode.Put) == CacheMode.Put) && !ce.IsDoremove; // and this is not a forced initialization during flush
+				session.CacheMode.HasFlag(CacheMode.Put) && !ce.IsDoremove; // and this is not a forced initialization during flush
 
 			if (addToCache)
 			{

src/NHibernate/Engine/TwoPhaseLoad.cs

@@ -98,7 +98,7 @@ public static void InitializeEntity(object entity, bool readOnly, ISessionImplem
 
 			ISessionFactoryImplementor factory = session.Factory;
 
-			if (persister.HasCache && ((session.CacheMode & CacheMode.Put) == CacheMode.Put))
+			if (persister.HasCache && session.CacheMode.HasFlag(CacheMode.Put))
 			{
 				if (log.IsDebugEnabled)
 					log.Debug("adding entity to second-level cache: " + MessageHelper.InfoString(persister, id, session.Factory));

src/NHibernate/Event/Default/DefaultInitializeCollectionEventListener.cs

@@ -70,7 +70,7 @@ private bool InitializeCollectionFromCache(object id, ICollectionPersister persi
 				return false;
 			}
 
-			bool useCache = persister.HasCache && ((source.CacheMode & CacheMode.Get) == CacheMode.Get);
+			bool useCache = persister.HasCache && source.CacheMode.HasFlag(CacheMode.Get);
 
 			if (!useCache)
 			{

src/NHibernate/Event/Default/DefaultLoadEventListener.cs

@@ -413,7 +413,7 @@ protected virtual object LoadFromSessionCache(LoadEvent @event, EntityKey keyToL
 		protected virtual object LoadFromSecondLevelCache(LoadEvent @event, IEntityPersister persister, LoadType options)
 		{
 			ISessionImplementor source = @event.Session;
-			bool useCache = persister.HasCache && ((source.CacheMode & CacheMode.Get) == CacheMode.Get)
+			bool useCache = persister.HasCache && source.CacheMode .HasFlag(CacheMode.Get)
 				&& @event.LockMode.LessThan(LockMode.Read);
 
 			if (useCache)

src/NHibernate/Impl/MultiCriteriaImpl.cs

@@ -137,7 +137,7 @@ private IList ListUsingQueryCache()
 				log.Debug("Cache miss for multi criteria query");
 				IList list = DoList();
 				result = list;
-				if ((session.CacheMode & CacheMode.Put) == CacheMode.Put)
+				if (session.CacheMode.HasFlag(CacheMode.Put))
 				{
 					bool put = queryCache.Put(key, new ICacheAssembler[] { assembler }, new object[] { list }, combinedParameters.NaturalKeyLookup, session);
 					if (put && factory.Statistics.IsStatisticsEnabled)
@@ -476,4 +476,4 @@ private void ThrowIfKeyAlreadyExists(string key)
 				throw new InvalidOperationException(String.Format("The key '{0}' already exists", key));
 		}
 	}
-}
+}

src/NHibernate/Loader/Loader.cs

@@ -1582,7 +1582,7 @@ private IList GetResultFromQueryCache(ISessionImplementor session, QueryParamete
 		{
 			IList result = null;
 
-			if ((!queryParameters.ForceCacheRefresh) && (session.CacheMode & CacheMode.Get) == CacheMode.Get)
+			if (!queryParameters.ForceCacheRefresh && session.CacheMode.HasFlag(CacheMode.Get))
 			{
 				IPersistenceContext persistenceContext = session.PersistenceContext;
 
@@ -1620,7 +1620,7 @@ private IList GetResultFromQueryCache(ISessionImplementor session, QueryParamete
 		private void PutResultInQueryCache(ISessionImplementor session, QueryParameters queryParameters, IType[] resultTypes,
 										   IQueryCache queryCache, QueryKey key, IList result)
 		{
-			if ((session.CacheMode & CacheMode.Put) == CacheMode.Put)
+			if (session.CacheMode.HasFlag(CacheMode.Put))
 			{
 				bool put = queryCache.Put(key, key.ResultTransformer.GetCachedResultTypes(resultTypes), result, queryParameters.NaturalKeyLookup, session);
 				if (put && _factory.Statistics.IsStatisticsEnabled)
@@ -1858,4 +1858,4 @@ protected bool TryGetLimitString(Dialect.Dialect dialect, SqlString queryString,
 
 		#endregion
 	}
-}
+}

src/NHibernate/Persister/Entity/AbstractEntityPersister.cs

@@ -1245,7 +1245,7 @@ public virtual object InitializeLazyProperty(string fieldName, object entity, IS
 												MessageHelper.InfoString(this, id, Factory), fieldName));
 			}
 
-			if (HasCache)
+			if (HasCache && session.CacheMode.HasFlag(CacheMode.Get))
 			{
 				CacheKey cacheKey = session.GenerateCacheKey(id, IdentifierType, EntityName);
 				object ce = Cache.Get(cacheKey, session.Timestamp);
@@ -3818,7 +3818,7 @@ public virtual void AfterReassociate(object entity, ISessionImplementor session)
             }
 
 			// check to see if it is in the second-level cache
-			if (HasCache)
+			if (HasCache && session.CacheMode.HasFlag(CacheMode.Get))
 			{
 				CacheKey ck = session.GenerateCacheKey(id, IdentifierType, RootEntityName);
 				if (Cache.Get(ck, session.Timestamp) != null)