Just doing some cleaning up

markrendle · Mar 16, 2012 · be2bb27 · be2bb27
1 parent 6e7b5df
commit be2bb27
Show file tree

Hide file tree

Showing 25 changed files with 38 additions and 449 deletions.
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -19,6 +19,6 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.0.0.3")]
-[assembly: AssemblyFileVersion("1.0.0.3")]
+[assembly: AssemblyVersion("1.0.0.4")]
+[assembly: AssemblyFileVersion("1.0.0.4")]
 
diff --git a/Simple.Data.Ado/AdoAdapter.cs b/Simple.Data.Ado/AdoAdapter.cs
@@ -3,14 +3,11 @@
 using System.ComponentModel.Composition;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
 using System.Linq;
 using Simple.Data.Ado.Schema;
 
 namespace Simple.Data.Ado
 {
-    using Extensions;
-
     [Export("Ado", typeof (Adapter))]
     public partial class AdoAdapter : Adapter, ICloneable
     {

diff --git a/Simple.Data.Ado/Simple.Data.Ado.nuspec b/Simple.Data.Ado/Simple.Data.Ado.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Simple.Data.Ado</id>
-    <version>1.0.0-beta3</version>
+    <version>1.0.0-beta4</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>ADO Adapter for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>sqlserver database data ado .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Core" version="1.0.0-beta3" />
+      <dependency id="Simple.Data.Core" version="1.0.0-beta4" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.Mocking/Simple.Data.Mocking.nuspec b/Simple.Data.Mocking/Simple.Data.Mocking.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Simple.Data.Mocking</id>
-    <version>1.0.0-beta3</version>
+    <version>1.0.0-beta4</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>XML-based Mocking adapter for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>database data .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Ado" version="1.0.0-beta3" />
+      <dependency id="Simple.Data.Ado" version="1.0.0-beta4" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec b/Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Simple.Data.SqlCompact40</id>
-    <version>1.0.0-beta3</version>
+    <version>1.0.0-beta4</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>SQL Server Compact 4.0 ADO provider for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>sqlserver compact sqlce database data ado .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Ado" version="1.0.0-beta3" />
+      <dependency id="Simple.Data.Ado" version="1.0.0-beta4" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec b/Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Simple.Data.SqlServer</id>
-    <version>1.0.0-beta3</version>
+    <version>1.0.0-beta4</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>SQL Server ADO provider for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>sqlserver database data ado .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Ado" version="1.0.0-beta3" />
+      <dependency id="Simple.Data.Ado" version="1.0.0-beta4" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.UnitTest/BufferedEnumerableTest.cs b/Simple.Data.UnitTest/BufferedEnumerableTest.cs
diff --git a/Simple.Data.UnitTest/Simple.Data.UnitTest.csproj b/Simple.Data.UnitTest/Simple.Data.UnitTest.csproj
@@ -71,7 +71,6 @@
   <ItemGroup>
     <Compile Include="AdapterFactoryTest.cs" />
     <Compile Include="BinderHelperTest.cs" />
-    <Compile Include="BufferedEnumerableTest.cs" />
     <Compile Include="ComposerTest.cs" />
     <Compile Include="ConcreteCollectionTypeCreatorTest.cs" />
     <Compile Include="ConcreteTypeCreatorTest.cs" />

diff --git a/Simple.Data/ActionDisposable.cs b/Simple.Data/ActionDisposable.cs
@@ -5,7 +5,7 @@
 
 namespace Simple.Data
 {
-    public class ActionDisposable : IDisposable
+    public sealed class ActionDisposable : IDisposable
     {
         public static readonly IDisposable NoOp = new ActionDisposable();
         private readonly Action _action;
@@ -19,7 +19,18 @@ public ActionDisposable(Action action)
             _action = action ?? (() => { });
         }
 
+        ~ActionDisposable()
+        {
+            Dispose(false);
+        }
+
         public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
         {
             _action();
         }

diff --git a/Simple.Data/Adapter.cs b/Simple.Data/Adapter.cs
@@ -150,7 +150,7 @@ protected virtual void OnSetup()
         /// <param name="onError">A Func to call when there is an error. It this func returns true, carry on, otherwise abort.</param>
         /// <param name="resultRequired"><c>true</c> if the result of the insert is used in code; otherwise, <c>false</c>.</param>
         /// <returns>If possible, return the newly inserted rows, including any automatically-set values such as primary keys or timestamps.</returns>
-        /// <remarks>This method has a default implementation based on the <see cref="Insert(string,IDictionary{string, object})"/> method.
+        /// <remarks>This method has a default implementation based on the <see cref="Insert(string,IDictionary{TKey,TValue},bool)"/> method.
         /// You should override this method if your adapter can optimize the operation.</remarks>
         public virtual IEnumerable<IDictionary<string, object>> InsertMany(string tableName,
                                                                            IEnumerable<IDictionary<string, object>> dataList,
@@ -194,7 +194,6 @@ private void InsertManyWithoutReturn(string tableName, IEnumerable<IDictionary<s
         {
             foreach (var row in dataList)
             {
-                IDictionary<string, object> inserted;
                 try
                 {
                     Insert(tableName, row, false);

diff --git a/Simple.Data/BufferedEnumerable.cs b/Simple.Data/BufferedEnumerable.cs