From 5d1f26a5546520fc6e877e760a74d9c862689459 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 1 Oct 2002 23:14:53 +0000 Subject: [PATCH] 2002-10-01 Rodrigo Moya * System.Data.OleDb/OleDbConnection.cs (Open): commented code from last commit, which wasn't supposed to be in CVS yet. svn path=/trunk/mcs/; revision=7924 --- mcs/class/System.Data/ChangeLog | 5 ++ .../System.Data.OleDb/OleDbConnection.cs | 68 ++++++++++--------- 2 files changed, 41 insertions(+), 32 deletions(-) diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog index afffdfb5681..ea9190a4292 100644 --- a/mcs/class/System.Data/ChangeLog +++ b/mcs/class/System.Data/ChangeLog @@ -1,3 +1,8 @@ +2002-10-01 Rodrigo Moya + + * System.Data.OleDb/OleDbConnection.cs (Open): commented code from + last commit, which wasn't supposed to be in CVS yet. + 2002-10-01 Luis Fernandez * System.Data/DataColumn.cs: diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs index 33769203127..f88f5988af5 100644 --- a/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs +++ b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs @@ -228,41 +228,45 @@ namespace System.Data.OleDb if (State == ConnectionState.Open) throw new InvalidOperationException (); + gdaConnection = libgda.gda_client_open_connection (libgda.GdaClient, + connectionString, + "", ""); + /* convert the connection string to its GDA equivalent */ - args = connectionString.Split (';'); - len = args.Length; - for (int i = 0; i < len; i++) { - string[] values = args[i].Split (separator, 2); - if (values[0] == "Provider") { - if (values[1] == "SQLOLEDB") - provider = "FreeTDS"; - else if (values[1] == "MSDAORA") - provider = "Oracle"; - else if (values[2] == "Microsoft.Jet.OLEDB.4.0") - provider = "MS Access"; - else - provider = values[2]; - } - else if (values[0] == "Addr" || values[0] == "Address") - gdaCncStr = String.Concat (gdaCncStr, "HOST=", values[1], ";"); - else if (values[0] == "Database") - gdaCncStr = String.Concat (gdaCncStr, "DATABASE=", values[1], ";"); - else if (values[0] == "Connection Lifetime") - connectionTimeout = System.Convert.ToInt32 (values[1]); - else if (values[0] == "File Name") - gdaCncStr = String.Concat (gdaCncStr, "FILENAME=", values[1], ";"); - else if (values[0] == "Password" || values[0] == "Pwd") - gdaCncStr = String.Concat (gdaCncStr, "PASSWORD=", values[1], ";"); - else if (values[0] == "User ID") - gdaCncStr = String.Concat (gdaCncStr, "USERNAME=", values[1], ";"); - } + //args = connectionString.Split (';'); + //len = args.Length; + //for (int i = 0; i < len; i++) { + // string[] values = args[i].Split (separator, 2); + // if (values[0] == "Provider") { + // if (values[1] == "SQLOLEDB") + // provider = "FreeTDS"; + // else if (values[1] == "MSDAORA") + // provider = "Oracle"; + // else if (values[2] == "Microsoft.Jet.OLEDB.4.0") + // provider = "MS Access"; + // else + // provider = values[2]; + // } + // else if (values[0] == "Addr" || values[0] == "Address") + // gdaCncStr = String.Concat (gdaCncStr, "HOST=", values[1], ";"); + // else if (values[0] == "Database") + // gdaCncStr = String.Concat (gdaCncStr, "DATABASE=", values[1], ";"); + // else if (values[0] == "Connection Lifetime") + // connectionTimeout = System.Convert.ToInt32 (values[1]); + // else if (values[0] == "File Name") + // gdaCncStr = String.Concat (gdaCncStr, "FILENAME=", values[1], ";"); + // else if (values[0] == "Password" || values[0] == "Pwd") + // gdaCncStr = String.Concat (gdaCncStr, "PASSWORD=", values[1], ";"); + // else if (values[0] == "User ID") + // gdaCncStr = String.Concat (gdaCncStr, "USERNAME=", values[1], ";"); + //} /* open the connection */ - System.Console.WriteLine ("Opening connection for provider " + - provider + " with " + gdaCncStr); - gdaConnection = libgda.gda_client_open_connection_from_string (libgda.GdaClient, - provider, - gdaCncStr); + //System.Console.WriteLine ("Opening connection for provider " + + // provider + " with " + gdaCncStr); + //gdaConnection = libgda.gda_client_open_connection_from_string (libgda.GdaClient, + // provider, + // gdaCncStr); } [MonoTODO] -- 2.25.1