implemented AuthenticationService, ProxyGenerator

[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 6322fc088787dad791b928ce836d01ef8763a265..fda68b08da11d2137446e16426da0542b15e3778 100644 (file)
--- a/mcs/class/Mono.Data/DataTools.cs
+++ b/mcs/class/Mono.Data/DataTools.cs
@@ -46,57 +46,80 @@ namespace Mono.Data
                static public IDataParameter AddParameter(IDbCommand Cmd, string ParameterName, DbType DbType, \r
                        ParameterDirection Direction)\r
                {\r
-                       IDataParameter param=Cmd.CreateParameter();\r
-                       Cmd.Parameters.Add(param);\r
-                       param.ParameterName=ParameterName;\r
-                       param.Direction=Direction;\r
-                       param.DbType=DbType;\r
+                       if (Cmd == null) \r
+                               throw new System.ArgumentNullException ("Cmd");\r
+                       if (ParameterName == null) \r
+                               throw new System.ArgumentNullException ("ParameterName");\r
+\r
+                       IDataParameter param = Cmd.CreateParameter ();\r
+                       Cmd.Parameters.Add (param);\r
+                       param.ParameterName = ParameterName;\r
+                       param.Direction = Direction;\r
+                       param.DbType = DbType;\r
                        return param;\r
                }\r
 \r
                static public IDataParameter AddParameter(IDbCommand Cmd, string ParameterName, DbType DbType)\r
                {\r
-                       IDataParameter param=Cmd.CreateParameter();\r
-                       Cmd.Parameters.Add(param);\r
-                       param.ParameterName=ParameterName;\r
-                       param.DbType=DbType;\r
+                       if (Cmd == null) \r
+                               throw new System.ArgumentNullException ("Cmd");\r
+                       if (ParameterName == null) \r
+                               throw new System.ArgumentNullException("ParameterName");\r
+\r
+                       IDataParameter param = Cmd.CreateParameter ();\r
+                       Cmd.Parameters.Add (param);\r
+                       param.ParameterName = ParameterName;\r
+                       param.DbType = DbType;\r
                        return param;\r
                }\r
 \r
-               static public DataSet FillDataSet(IDbConnection conn, string SelectCommand)\r
+               static public DataSet FillDataSet (IDbConnection conn, string SelectCommand)\r
                {\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
+                       if (conn == null) \r
+                               throw new System.ArgumentNullException ("conn");\r
+                       if (SelectCommand == null) \r
+                               throw new System.ArgumentNullException ("SelectCommand");\r
+\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
 \r
                static public DataSet FillDataSet(IDbCommand SelectCommand)\r
                {\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
+                       if (SelectCommand == null) \r
+                               throw new System.ArgumentNullException ("SelectCommand");\r
+\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
+                       if (ConfigSetting == null) \r
+                               throw new System.ArgumentNullException ("ConfigSetting");\r
+                       if (SelectCommand == null) \r
+                               throw new System.ArgumentNullException ("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(conn, SelectCommand);\r
-                               adapter.Fill(ds);\r
+                               ds = new DataSet ();\r
+                               IDbDataAdapter adapter = ProviderFactory.CreateDataAdapter (conn, SelectCommand);\r
+                               adapter.Fill (ds);\r
                        }\r
                        finally\r
                        {\r
-                               conn.Close();\r
+                               conn.Close ();\r
                        }\r
                        return ds;\r
                }\r
@@ -104,3 +127,4 @@ namespace Mono.Data
 \r
        }\r
 }\r
+\r