Dev -> Trunk

RobThree · RobThree · commit 259f9c5a4071 · 2014-11-27T14:44:03.000+01:00
diff --git a/MongoRepository/trunk/Help/MongoRepository.shfbproj b/MongoRepository/trunk/Help/MongoRepository.shfbproj
@@ -37,7 +37,7 @@
     <SccProvider>SAK</SccProvider>
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
-    <HelpFileVersion>1.6.5.0</HelpFileVersion>
+    <HelpFileVersion>1.6.7.0</HelpFileVersion>
     <BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
     <HelpFileFormat>HtmlHelp1, Website</HelpFileFormat>
     <IndentHtml>False</IndentHtml>
diff --git a/MongoRepository/trunk/MongoRepository.nuspec b/MongoRepository/trunk/MongoRepository.nuspec
@@ -3,7 +3,7 @@
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>MongoRepository</id>
     <title>MongoRepository</title>
-    <version>1.6.5</version>
+    <version>1.6.7</version>
     <authors>tgeek, RobIII</authors>
     <owners>tgeek</owners>
     <licenseUrl>http://mongorepository.codeplex.com/license</licenseUrl>
@@ -13,14 +13,14 @@
     <tags>mongo mongodb repository</tags>
     <iconUrl>http://download-codeplex.sec.s-msft.com/Download?ProjectName=mongorepository&amp;DownloadId=334950&amp;Build=19692</iconUrl>
     <releaseNotes>
-      Updated to MongoCSharp driver 1.9.1.221, added GetById(ObjectId) overload, added CollectionName property (convenience property)
+      * Fix inherited classes go to same collection as baseclass (https://mongorepository.codeplex.com/discussions/572382)
     </releaseNotes>
     <summary>
       Provides a repository pattern on top of 10gen's MongoDB C# driver.
     </summary>
     <language>en-US</language>
     <dependencies>
-      <dependency id="mongocsharpdriver" version="[1.9.1]" />
+      <dependency id="mongocsharpdriver" version="[1.9.2]" />
     </dependencies>
   </metadata>
   <files>
diff --git a/MongoRepository/trunk/MongoRepository/MongoRepository.Net35.csproj b/MongoRepository/trunk/MongoRepository/MongoRepository.Net35.csproj
@@ -40,13 +40,13 @@
     <DocumentationFile>bin\Release\MongoRepository.Net35.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MongoDB.Bson, Version=1.9.1.221, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
+    <Reference Include="MongoDB.Bson, Version=1.9.2.235, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\mongocsharpdriver.1.9.1\lib\net35\MongoDB.Bson.dll</HintPath>
+      <HintPath>..\packages\mongocsharpdriver.1.9.2\lib\net35\MongoDB.Bson.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=1.9.1.221, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
+    <Reference Include="MongoDB.Driver, Version=1.9.2.235, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\mongocsharpdriver.1.9.1\lib\net35\MongoDB.Driver.dll</HintPath>
+      <HintPath>..\packages\mongocsharpdriver.1.9.2\lib\net35\MongoDB.Driver.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/MongoRepository/trunk/MongoRepository/Properties/AssemblyInfo.cs b/MongoRepository/trunk/MongoRepository/Properties/AssemblyInfo.cs
@@ -22,5 +22,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("7e3d1784-b1f3-4b33-a303-7facc780917e")]
 
-[assembly: AssemblyVersion("1.6.4.0")]
-[assembly: AssemblyFileVersion("1.6.4.0")]
+[assembly: AssemblyVersion("1.6.7.0")]
+[assembly: AssemblyFileVersion("1.6.7.0")]
diff --git a/MongoRepository/trunk/MongoRepository/Repository/MongoRepository.cs b/MongoRepository/trunk/MongoRepository/Repository/MongoRepository.cs
@@ -84,6 +84,9 @@ public MongoCollection<T> Collection
             get { return this.collection; }
         }
 
+        /// <summary>
+        /// Gets the name of the collection
+        /// </summary>
         public string CollectionName
         {
             get { return this.collection.Name; }
diff --git a/MongoRepository/trunk/MongoRepository/Util.cs b/MongoRepository/trunk/MongoRepository/Util.cs
@@ -153,7 +153,7 @@ private static string GetCollectionNameFromType(Type entitytype)
             }
             else
             {
-                if (entitytype.Equals(typeof(Entity)))
+                if (typeof(Entity).IsAssignableFrom(entitytype))
                 {
                     // No attribute found, get the basetype
                     while (!entitytype.BaseType.Equals(typeof(Entity)))
diff --git a/MongoRepository/trunk/MongoRepository/packages.config b/MongoRepository/trunk/MongoRepository/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="mongocsharpdriver" version="1.9.1" targetFramework="net35" />
+  <package id="mongocsharpdriver" version="1.9.2" targetFramework="net35" />
 </packages>
diff --git a/MongoRepository/trunk/MongoRepositoryTests/MongoRepositoryTests.csproj b/MongoRepository/trunk/MongoRepositoryTests/MongoRepositoryTests.csproj
@@ -41,13 +41,13 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="MongoDB.Bson, Version=1.9.1.221, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
+    <Reference Include="MongoDB.Bson, Version=1.9.2.235, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\mongocsharpdriver.1.9.1\lib\net35\MongoDB.Bson.dll</HintPath>
+      <HintPath>..\packages\mongocsharpdriver.1.9.2\lib\net35\MongoDB.Bson.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=1.9.1.221, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
+    <Reference Include="MongoDB.Driver, Version=1.9.2.235, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\mongocsharpdriver.1.9.1\lib\net35\MongoDB.Driver.dll</HintPath>
+      <HintPath>..\packages\mongocsharpdriver.1.9.2\lib\net35\MongoDB.Driver.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -72,7 +72,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MongoRepository\MongoRepository.Net40.csproj">
diff --git a/MongoRepository/trunk/MongoRepositoryTests/RepoTests.cs b/MongoRepository/trunk/MongoRepositoryTests/RepoTests.cs
@@ -338,13 +338,45 @@ public abstract class BaseA : BaseItem
 
         public class SpecialA : BaseA
         { }
-        
+
         [TestMethod]
         public void Discussion433878()
         {
             var specialRepository = new MongoRepository<SpecialA>();
         }
         #endregion
 
+        #region Reproduce issue: https://mongorepository.codeplex.com/discussions/572382
+        public abstract class ClassA : Entity
+        {
+            public string Prop1 { get; set; }
+        }
+
+        public class ClassB : ClassA
+        {
+            public string Prop2 { get; set; }
+        }
+
+        public class ClassC : ClassA
+        {
+            public string Prop3 { get; set; }
+        }
+
+        [TestMethod]
+        public void Discussion572382()
+        {
+            var repo = new MongoRepository<ClassA>() { 
+                new ClassB() { Prop1 = "A", Prop2 = "B" } ,
+                new ClassC() { Prop1 = "A", Prop3 = "C" }
+            };
+
+            Assert.AreEqual(2, repo.Count());
+
+            Assert.AreEqual(2, repo.OfType<ClassA>().Count());
+            Assert.AreEqual(1, repo.OfType<ClassB>().Count());
+            Assert.AreEqual(1, repo.OfType<ClassC>().Count());
+        }
+        #endregion
+
     }
 }
diff --git a/MongoRepository/trunk/MongoRepositoryTests/packages.config b/MongoRepository/trunk/MongoRepositoryTests/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="mongocsharpdriver" version="1.9.1" targetFramework="net40" />
+  <package id="mongocsharpdriver" version="1.9.2" targetFramework="net40" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,9 @@ public MongoCollection<T> Collection`
`84`	`84`	`get { return this.collection; }`
`85`	`85`	`}`
`86`	`86`
	`87`	`+ /// <summary>`
	`88`	`+ /// Gets the name of the collection`
	`89`	`+ /// </summary>`
`87`	`90`	`public string CollectionName`
`88`	`91`	`{`
`89`	`92`	`get { return this.collection.Name; }`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ private static string GetCollectionNameFromType(Type entitytype)`
`153`	`153`	`}`
`154`	`154`	`else`
`155`	`155`	`{`
`156`		`- if (entitytype.Equals(typeof(Entity)))`
	`156`	`+ if (typeof(Entity).IsAssignableFrom(entitytype))`
`157`	`157`	`{`
`158`	`158`	`// No attribute found, get the basetype`
`159`	`159`	`while (!entitytype.BaseType.Equals(typeof(Entity)))`