X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMono.Data%2FDataTools.cs;h=713ba118c5ded69c23ea68ea4cc0ac7e34f01000;hb=de7338760b6ea58e5e828a81563bc696dc809db7;hp=1298a734e982a21c260ef8a48e0e6a6b311aef4b;hpb=2ebe31e07fed83f5813be652180afa3d99038b48;p=mono.git

diff --git a/mcs/class/Mono.Data/DataTools.cs b/mcs/class/Mono.Data/DataTools.cs
index 1298a734e98..713ba118c5d 100755
--- a/mcs/class/Mono.Data/DataTools.cs
+++ b/mcs/class/Mono.Data/DataTools.cs
@@ -46,6 +46,8 @@ namespace Mono.Data
 		{
 			DataSet ds=new DataSet();
 			IDbDataAdapter adapter=ProviderFactory.CreateDataAdapter(conn, SelectCommand);
+			if (conn.State!=ConnectionState.Open)
+				conn.Open();
 			adapter.Fill(ds);
 			return ds;
 		}
@@ -54,8 +56,30 @@ namespace Mono.Data
 		{
 			DataSet ds=new DataSet();
 			IDbDataAdapter adapter=ProviderFactory.CreateDataAdapter(SelectCommand);
+			if (adapter.SelectCommand.Connection.State!=ConnectionState.Open)
+				adapter.SelectCommand.Connection.Open();
 			adapter.Fill(ds);
 			return ds;
 		}
+
+		static public DataSet FillDataSet(string ConfigSetting, string SelectCommand)
+		{
+			IDbConnection conn=ProviderFactory.CreateConnectionFromConfig(ConfigSetting);
+			conn.Open();
+			DataSet ds=null;
+			try
+			{
+				ds=new DataSet();
+				IDbDataAdapter adapter=ProviderFactory.CreateDataAdapter(SelectCommand);
+				adapter.Fill(ds);
+			}
+			finally
+			{
+				conn.Close();
+			}
+			return ds;
+		}
+
+
 	}
 }