Add UseTagsAsCacheKey && Rename FirstTag

zzzprojects · zzzprojects · commit 297dbf88ea7c · 2016-10-04T18:26:44.000-04:00
Add UseTagsAsCacheKey &amp;&amp; Rename FirstTag
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/WithInclude/IncludeOptimized.cs b/src/test/Z.Test.EntityFramework.Plus.EF5/QueryCache/WithInclude/IncludeOptimized.cs
@@ -5,6 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
+#if EF5 || EF6
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -52,4 +53,5 @@ public void IncludeOptimized()
             }
         }
     }
-}
+}
+#endif
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF5/Z.Test.EntityFramework.Plus.EF5.csproj b/src/test/Z.Test.EntityFramework.Plus.EF5/Z.Test.EntityFramework.Plus.EF5.csproj
@@ -305,9 +305,6 @@
     <Compile Include="QueryCache\ExpireAll\Queryable_WithDefault.cs" />
     <Compile Include="QueryCache\ExpireAll\Queryable_WithExpiration.cs" />
     <Compile Include="QueryCache\ExpireAll\Queryable_WithTag.cs" />
-    <Compile Include="QueryCache\ForceFirstTagAsCacheKey\Many.cs" />
-    <Compile Include="QueryCache\ForceFirstTagAsCacheKey\None.cs" />
-    <Compile Include="QueryCache\ForceFirstTagAsCacheKey\Single.cs" />
     <Compile Include="QueryCache\FromCacheAsync\Queryable_WithDefault.cs" />
     <Compile Include="QueryCache\FromCacheAsync\Queryable_WithExpiration.cs" />
     <Compile Include="QueryCache\FromCacheAsync\QueryDeferred_WithDefault.cs" />
@@ -325,14 +322,21 @@
     <Compile Include="QueryCache\QueryCache_CacheKey.cs" />
     <Compile Include="QueryCache\QueryCache_CacheKeyFactory.cs" />
     <Compile Include="QueryCache\QueryCache_ExpireAll.cs" />
-    <Compile Include="QueryCache\QueryCache_ForceFirstTagAsCacheKey.cs" />
     <Compile Include="QueryCache\QueryCache_FromCache.cs" />
     <Compile Include="QueryCache\QueryCache_FromCacheAsync.cs" />
     <Compile Include="QueryCache\QueryCache_Tag.cs" />
+    <Compile Include="QueryCache\QueryCache_UseFirstTagAsCacheKey.cs" />
+    <Compile Include="QueryCache\QueryCache_UseTagsAsCacheKey.cs" />
     <Compile Include="QueryCache\QueryCache_WithInclude.cs" />
     <Compile Include="QueryCache\Tag\Equal.cs" />
     <Compile Include="QueryCache\Tag\Expire.cs" />
     <Compile Include="QueryCache\Tag\NotEqual.cs" />
+    <Compile Include="QueryCache\UseFirstTagAsCacheKey\Many.cs" />
+    <Compile Include="QueryCache\UseFirstTagAsCacheKey\None.cs" />
+    <Compile Include="QueryCache\UseFirstTagAsCacheKey\Single.cs" />
+    <Compile Include="QueryCache\UseTagsAsCacheKey\Many.cs" />
+    <Compile Include="QueryCache\UseTagsAsCacheKey\None.cs" />
+    <Compile Include="QueryCache\UseTagsAsCacheKey\Single.cs" />
     <Compile Include="QueryCache\WithInclude\IncludeFilter.cs" />
     <Compile Include="QueryCache\WithInclude\IncludeOptimized.cs" />
     <Compile Include="QueryDeferred\ExecuteAsync\Executor.cs" />
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/ExceptionMessage.cs b/src/test/Z.Test.EntityFramework.Plus.EF6/ExceptionMessage.cs
@@ -24,7 +24,8 @@ internal class ExceptionMessage
         public static string BatchOperations_AssemblyNotFound = "Oops! The assembly 'Microsoft.EntityFrameworkCore.SqlServer' could not be found. This feature is only supported for SQL Server for .NET Core. For more information, contact us: info@zzzprojects.com";
 #endif
 #if FULL || QUERY_CACHE
-        public static string QueryCache_FirstTagNullOrEmpty = "Oops! The option 'ForceFirstTagAsCacheKey' is enabled but we found no tag, an empty string, or a null string instead. Make sure a tag is provided, and it's not null or empty. For more information, contact us: info@zzzprojects.com";
+        public static string QueryCache_FirstTagNullOrEmpty = "Oops! The option 'UseFirstTagAsCacheKey' is enabled but we found no tag, an empty tag string, or a null tag string instead. Make sure a tag is provided, and it's not null or empty. For more information, contact us: info@zzzprojects.com";
+        public static string QueryCache_UseTagsNullOrEmpty = "Oops! The option 'UseTagsAsCacheKey' is enabled but we found no tag, an empty tag string, or a null tag string instead. Make sure a tag is provided, and it's not null or empty. For more information, contact us: info@zzzprojects.com";    
 #endif
 #if FULL || QUERY_INCLUDEFILTER
         public static string QueryIncludeFilter_ArgumentExpression = "Oops! immediate method with expression argument are not supported in EF+ Query IncludeFilter. For more information, contact us: info@zzzprojects.com";
diff --git a/src/test/Z.Test.EntityFramework.Plus.EF6/Z.Test.EntityFramework.Plus.EF6.csproj b/src/test/Z.Test.EntityFramework.Plus.EF6/Z.Test.EntityFramework.Plus.EF6.csproj
@@ -301,13 +301,17 @@
     <Compile Include="QueryCache\ExpireAll\Queryable_WithTag.cs" />
     <Compile Include="QueryCache\ExpireAll\Queryable_WithDefault.cs" />
     <Compile Include="QueryCache\ExpireAll\Queryable_WithExpiration.cs" />
-    <Compile Include="QueryCache\ForceFirstTagAsCacheKey\Single.cs" />
-    <Compile Include="QueryCache\ForceFirstTagAsCacheKey\Many.cs" />
-    <Compile Include="QueryCache\ForceFirstTagAsCacheKey\None.cs" />
+    <Compile Include="QueryCache\UseTagsAsCacheKey\Many.cs" />
+    <Compile Include="QueryCache\UseTagsAsCacheKey\None.cs" />
+    <Compile Include="QueryCache\UseTagsAsCacheKey\Single.cs" />
+    <Compile Include="QueryCache\UseFirstTagAsCacheKey\Single.cs" />
+    <Compile Include="QueryCache\UseFirstTagAsCacheKey\Many.cs" />
+    <Compile Include="QueryCache\UseFirstTagAsCacheKey\None.cs" />
     <Compile Include="QueryCache\FromCacheAsync\QueryDeferred_WithNull.cs" />
     <Compile Include="QueryCache\FromCache\QueryDeferred_WithNull.cs" />
     <Compile Include="QueryCache\QueryCache_CacheKeyFactory.cs" />
-    <Compile Include="QueryCache\QueryCache_ForceFirstTagAsCacheKey.cs" />
+    <Compile Include="QueryCache\QueryCache_UseTagsAsCacheKey.cs" />
+    <Compile Include="QueryCache\QueryCache_UseFirstTagAsCacheKey.cs" />
     <Compile Include="QueryCache\QueryCache_WithInclude.cs" />
     <Compile Include="QueryCache\QueryCache_ExpireAll.cs" />
     <Compile Include="QueryCache\WithInclude\IncludeFilter.cs" />

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`// More projects: http://www.zzzprojects.com/`
`6`	`6`	`// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.`
`7`	`7`
	`8`	`+#if EF5 \|\| EF6`
`8`	`9`	`using System.Collections.Generic;`
`9`	`10`	`using System.Linq;`
`10`	`11`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`@@ -52,4 +53,5 @@ public void IncludeOptimized()`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`	`}`
`55`		`-}`
	`56`	`+}`
	`57`	`+#endif`
-Original file line number
+Diff line change
         public static string BatchOperations_AssemblyNotFound = "Oops! The assembly 'Microsoft.EntityFrameworkCore.SqlServer' could not be found. This feature is only supported for SQL Server for .NET Core. For more information, contact us: [email protected]";
 #endif
 #if FULL || QUERY_CACHE
 -        public static string QueryCache_FirstTagNullOrEmpty = "Oops! The option 'ForceFirstTagAsCacheKey' is enabled but we found no tag, an empty string, or a null string instead. Make sure a tag is provided, and it's not null or empty. For more information, contact us: [email protected]";
 +        public static string QueryCache_FirstTagNullOrEmpty = "Oops! The option 'UseFirstTagAsCacheKey' is enabled but we found no tag, an empty tag string, or a null tag string instead. Make sure a tag is provided, and it's not null or empty. For more information, contact us: [email protected]";
 +        public static string QueryCache_UseTagsNullOrEmpty = "Oops! The option 'UseTagsAsCacheKey' is enabled but we found no tag, an empty tag string, or a null tag string instead. Make sure a tag is provided, and it's not null or empty. For more information, contact us: [email protected]";
 #endif
 #if FULL || QUERY_INCLUDEFILTER
         public static string QueryIncludeFilter_ArgumentExpression = "Oops! immediate method with expression argument are not supported in EF+ Query IncludeFilter. For more information, contact us: [email protected]";