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

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

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
index 7191b72b78ed3beb6b037b82506a506a71ee99d7..8de3e49794cb44f52eef899a778651a9023631c5 100644 (file)
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
@@ -13,6 +13,7 @@ using System.ComponentModel;
 using System.Data;
 using System.Data.Common;
 using System.Collections;
+using System.Runtime.InteropServices;
 
 namespace System.Data.OleDb
 {
@@ -52,8 +53,7 @@ namespace System.Data.OleDb
                        gdaCommand = IntPtr.Zero;
                }
 
-               public OleDbCommand (string cmdText)
-                       : this ()
+               public OleDbCommand (string cmdText) : this ()
                {
                        CommandText = cmdText;
                }
@@ -64,8 +64,9 @@ namespace System.Data.OleDb
                        Connection = connection;
                }
 
-               public OleDbCommand (string cmdText, OleDbConnection connection, OleDbTransaction transaction)
-                       : this (cmdText, connection)
+               public OleDbCommand (string cmdText,
+                                    OleDbConnection connection,
+                                    OleDbTransaction transaction) : this (cmdText, connection)
                {
                        this.transaction = transaction;
                }
@@ -229,9 +230,9 @@ namespace System.Data.OleDb
                public int ExecuteNonQuery ()
                {
                        if (connection == null)
-                               throw new InvalidOperationException ();
+                               throw new InvalidOperationException ("connection == null");
                        if (connection.State == ConnectionState.Closed)
-                               throw new InvalidOperationException ();
+                               throw new InvalidOperationException ("State == Closed");
                        // FIXME: a third check is mentioned in .NET docs
 
                        IntPtr gdaConnection = connection.GdaConnection;
@@ -256,25 +257,37 @@ namespace System.Data.OleDb
                public OleDbDataReader ExecuteReader (CommandBehavior behavior)
                {
                        ArrayList results = new ArrayList ();
+                       IntPtr rs_list;
+                       GdaList glist_node;
 
                        if (connection.State != ConnectionState.Open)
-                               throw new InvalidOperationException ();
+                               throw new InvalidOperationException ("State != Open");
 
                        this.behavior = behavior;
 
                        IntPtr gdaConnection = connection.GdaConnection;
                        IntPtr gdaParameterList = parameters.GdaParameterList;
 
+                       /* execute the command */
                        SetupGdaCommand ();
-                       /* FIXME: split all returned resultsets into the array
-                          list of results */
-                       results.Add (libgda.gda_connection_execute_command (
-                                               gdaConnection,
-                                               gdaCommand,
-                                               gdaParameterList));
-
-                       dataReader = new OleDbDataReader (this, results);
-                       dataReader.NextResult ();
+                       rs_list = libgda.gda_connection_execute_command (
+                               gdaConnection,
+                               gdaCommand,
+                               gdaParameterList);
+                       if (rs_list != IntPtr.Zero) {
+                               glist_node = (GdaList) Marshal.PtrToStructure (rs_list, typeof (GdaList));
+
+                               while (glist_node != null) {
+                                       results.Add (glist_node.data);
+                                       if (glist_node.next == IntPtr.Zero)
+                                               break;
+
+                                       glist_node = (GdaList) Marshal.PtrToStructure (glist_node.next,
+                                                                                      typeof (GdaList));
+                               }
+                               dataReader = new OleDbDataReader (this, results);
+                               dataReader.NextResult ();
+                       }
 
                        return dataReader;
                }
@@ -288,7 +301,16 @@ namespace System.Data.OleDb
                {
                        SetupGdaCommand ();
                        OleDbDataReader reader = ExecuteReader ();
-                       return reader.GetValue (0);
+                       if (reader == null) {
+                               return null;
+                       }
+                       if (!reader.Read ()) {
+                               reader.Close ();
+                               return null;
+                       }
+                       object o = reader.GetValue (0);
+                       reader.Close ();
+                       return o;
                }
 
                [MonoTODO]