From c1cde2c7d52a3e3b7881cbae9d45674c86c3e3f2 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Mon, 13 Aug 2012 12:11:03 -0700
Subject: [PATCH] Fixing second level cache activation fuzzymess

--HG--
branch : 1.x
---
 .../Modules/SysCache/Models/SysCacheRecord.cs            | 9 +++++++++
 src/Orchard.Web/Modules/SysCache/SysCache.csproj         | 1 +
 src/Orchard/Data/Conventions/AggregateAttribute.cs       | 2 +-
 src/Orchard/Data/DefaultDatabaseCacheConfiguration.cs    | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/SysCache/Models/SysCacheRecord.cs

diff --git a/src/Orchard.Web/Modules/SysCache/Models/SysCacheRecord.cs b/src/Orchard.Web/Modules/SysCache/Models/SysCacheRecord.cs
new file mode 100644
index 000000000..78a4d6c2e
--- /dev/null
+++ b/src/Orchard.Web/Modules/SysCache/Models/SysCacheRecord.cs
@@ -0,0 +1,9 @@
+namespace SysCache.Models {
+    /// <summary>
+    /// Fake record in order to force the mappings to be updated
+    /// once the modules is enabled/disabled
+    /// </summary>
+    public class SysCacheRecord {
+        public virtual int Id { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/SysCache/SysCache.csproj b/src/Orchard.Web/Modules/SysCache/SysCache.csproj
index cd934fc1c..8c73dba01 100644
--- a/src/Orchard.Web/Modules/SysCache/SysCache.csproj
+++ b/src/Orchard.Web/Modules/SysCache/SysCache.csproj
@@ -81,6 +81,7 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
+    <Compile Include="Models\SysCacheRecord.cs" />
     <Compile Include="Services\SysCacheDatabaseCacheConfiguration.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Orchard/Data/Conventions/AggregateAttribute.cs b/src/Orchard/Data/Conventions/AggregateAttribute.cs
index 9bb03bd92..d15354a11 100644
--- a/src/Orchard/Data/Conventions/AggregateAttribute.cs
+++ b/src/Orchard/Data/Conventions/AggregateAttribute.cs
@@ -24,7 +24,7 @@ namespace Orchard.Data.Conventions {
 
         public void Apply(IOneToManyCollectionInstance instance) {
             instance.Fetch.Join();
-            instance.Cache.NonStrictReadWrite();
+            instance.Cache.ReadWrite();
         }
 
         public void Accept(IAcceptanceCriteria<IOneToManyCollectionInspector> criteria) {
diff --git a/src/Orchard/Data/DefaultDatabaseCacheConfiguration.cs b/src/Orchard/Data/DefaultDatabaseCacheConfiguration.cs
index 9debb87a4..7de6fbf9d 100644
--- a/src/Orchard/Data/DefaultDatabaseCacheConfiguration.cs
+++ b/src/Orchard/Data/DefaultDatabaseCacheConfiguration.cs
@@ -3,7 +3,7 @@ using NHibernate.Cfg.Loquacious;
 namespace Orchard.Data {
     public class DefaultDatabaseCacheConfiguration : IDatabaseCacheConfiguration {
         public void Configure(ICacheConfigurationProperties cache) {
-            // do nothing, no cache
+            cache.UseQueryCache = false;
         }
     }
 }
\ No newline at end of file