Add Dispose calls to Database

1 files changed, 9 insertions, 0 deletions

diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data/Database.cs b/mcs/class/WebMatrix.Data/WebMatrix.Data/Database.cs
index 9b5da04b974..6c9287ce302 100644
--- a/mcs/class/WebMatrix.Data/WebMatrix.Data/Database.cs
+++ b/mcs/class/WebMatrix.Data/WebMatrix.Data/Database.cs
@@ -70,7 +70,13 @@ namespace WebMatrix.Data
 
 		public void Dispose ()
 		{
+			Dispose (true);
+		}
 
+		protected virtual void Dispose (bool disposing)
+		{
+			if (disposing)
+				connection.Dispose ();
 		}
 
 		public int Execute (string commandText, params object[] args)
@@ -81,6 +87,7 @@ namespace WebMatrix.Data
 			connection.Open ();
 			var result = command.ExecuteNonQuery ();
 			connection.Close ();
+			command.Dispose ();
 
 			return result;
 		}
@@ -127,6 +134,7 @@ namespace WebMatrix.Data
 			}
 
 			connection.Close ();
+			command.Dispose ();
 
 			return result;
 		}
@@ -139,6 +147,7 @@ namespace WebMatrix.Data
 			connection.Open ();
 			var result = command.ExecuteScalar ();
 			connection.Close ();
+			command.Dispose ();
 
 			return result;
 		}