2003-12-01 Sebastien Pouliot <spouliot@videotron.ca>

[mono.git] / mcs / class / Mono.Data / DataTools.cs

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