2002-08-15 Rodrigo Moya <rodrigo@ximian.com>

* System.Data.OleDb/OleDbCommand.cs (ExecuteReader): check values for NULL before passing them to Marshal.PtrToStructure, which issues an exception if the value is NULL. svn path=/trunk/mcs/; revision=6660
mono · Aug 16, 2002 · 6a793a7 · 6a793a7
1 parent 58da214
commit 6a793a7
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-15  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbCommand.cs (ExecuteReader): check values
+	for NULL before passing them to Marshal.PtrToStructure, which issues
+	an exception if the value is NULL.
+
 2002-08-15  Rodrigo Moya <rodrigo@ximian.com>
 
 	* System.Data/UniqueConstraint.cs (UniqueConstraint): commented

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
@@ -279,6 +279,9 @@ public OleDbDataReader ExecuteReader (CommandBehavior behavior)
 
 				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));
 				}

diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs
@@ -67,16 +67,28 @@ object IList.this[int index] {
 			set { list[index] = value; }
 		}
 
-		object IDataParameterCollection.this[string name] {
+		object IDataParameterCollection.this[string name]
+		{
 			[MonoTODO]
-			get { throw new NotImplementedException (); }
+			get {
+				throw new NotImplementedException ();
+			}
 			[MonoTODO]
-			set { throw new NotImplementedException (); }
+			set {
+				throw new NotImplementedException ();
+			}
 		}
 
 		internal IntPtr GdaParameterList {
 			[MonoTODO]
-			get { throw new NotImplementedException (); }
+			get {
+				IntPtr param_list;
+
+				param_list = libgda.gda_parameter_list_new ();
+				// FIXME: add parameters to list
+
+				return param_list;
+			}
 		}
 
 		#endregion // Properties

diff --git a/mcs/class/System.Data/System.Data.OleDb/libgda.cs b/mcs/class/System.Data/System.Data.OleDb/libgda.cs
@@ -81,7 +81,10 @@ public static IntPtr GdaClient
 
 		[DllImport("gda-2")]
 		public static extern bool gda_value_get_boolean (IntPtr value);
-
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_parameter_list_new ();
+
 		[DllImport("gda-2")]
 		public static extern int gda_data_model_get_n_rows (IntPtr model);