2004-03-12 Andreas Nahr <ClassDevelopment@A-SoftTech.com>

[mono.git] / mcs / class / System.Data / System.Data.OleDb / OleDbConnection.cs

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
index a172246bfc5e7d0231832e5455b1b96f4fe0f61b..a079c6f9b959a600c4b535d202bed3bf4da4e704 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
@@ -21,8 +21,6 @@ namespace System.Data.OleDb
 
                string connectionString;
                int connectionTimeout;
-               OleDbDataReader dataReader;
-               bool dataReaderOpen;
                IntPtr gdaConnection;
 
                #endregion
@@ -123,7 +121,7 @@ namespace System.Data.OleDb
                                return gdaConnection;
                        }
                }
-
+               
                #endregion // Properties
        
                #region Methods
@@ -167,7 +165,7 @@ namespace System.Data.OleDb
 
                public void Close ()
                {
-                       if (gdaConnection != IntPtr.Zero) {
+                       if (State == ConnectionState.Open) {
                                libgda.gda_connection_close (gdaConnection);
                                gdaConnection = IntPtr.Zero;
                        }
@@ -175,8 +173,7 @@ namespace System.Data.OleDb
 
                public OleDbCommand CreateCommand ()
                {
-                       if (gdaConnection != IntPtr.Zero
-                           && libgda.gda_connection_is_open (gdaConnection))
+                       if (State == ConnectionState.Open)
                                return new OleDbCommand (null, this);
 
                        return null;
@@ -207,12 +204,54 @@ namespace System.Data.OleDb
 
                public void Open ()
                {
+                       string provider = "Default";
+                       string gdaCncStr = "";
+                       string[] args;
+                       int len;
+                       char [] separator = { ';' };
+                       
                        if (State == ConnectionState.Open)
                                throw new InvalidOperationException ();
 
                        gdaConnection = libgda.gda_client_open_connection (libgda.GdaClient,
-                                                                          connectionString,
-                                                                          "", "");
+                                                                          connectionString,
+                                                                          "", "", 0);
+                       
+                       /* 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], ";");
+                       //}
+
+                       /* 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);
                }
 
                [MonoTODO]