2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / System.Data / System.Data.Common / DbEnumerator.cs

diff --git a/mcs/class/System.Data/System.Data.Common/DbEnumerator.cs b/mcs/class/System.Data/System.Data.Common/DbEnumerator.cs
index 411860a3f4c906753f3964ee4f17187d28999a20..50718c50ad2afbd80a819512204f81ff3692c8fd 100644 (file)
--- a/mcs/class/System.Data/System.Data.Common/DbEnumerator.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbEnumerator.cs
@@ -7,8 +7,32 @@
 // Copyright (C) Tim Coleman, 2002
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Collections;
+using System.ComponentModel;
 using System.Data;
 
 namespace System.Data.Common {
@@ -36,7 +60,7 @@ namespace System.Data.Common {
                        this.reader = reader;
                        this.closeReader = closeReader;
                        this.lookup = new FieldNameLookup ();
-                       this.fieldCount = 0;
+                       this.fieldCount = reader.FieldCount;
                        LoadSchema (reader.GetSchemaTable ());
                }
 
@@ -44,7 +68,7 @@ namespace System.Data.Common {
 
                #region Properties
 
-               public virtual object Current {
+               public object Current {
                        get { 
                                object[] values = new object[fieldCount];
                                reader.GetValues (values);
@@ -56,35 +80,40 @@ namespace System.Data.Common {
 
                #region Methods
 
-               public void LoadSchema (DataTable schemaTable)
+               private void LoadSchema (DataTable schemaTable)
                {
-                       ArrayList list = new ArrayList ();
+                       schema = new SchemaInfo [fieldCount];
+                       int index = 0;
                        foreach (DataRow row in schemaTable.Rows) {
                                SchemaInfo columnSchema = new SchemaInfo ();
+
                                lookup.Add ((string) row["ColumnName"]);
 
-                               columnSchema.ColumnName = (string) row ["ColumnName"];
+                               columnSchema.AllowDBNull = (bool) row ["AllowDBNull"];
+                               columnSchema.ColumnName = row ["ColumnName"].ToString ();
                                columnSchema.ColumnOrdinal = (int) row ["ColumnOrdinal"];
-                               columnSchema.TableName = (string) row ["BaseTableName"];
-                               columnSchema.Nullable = (bool) row ["AllowDBNull"];
-                               columnSchema.Writable = ! (bool) row ["IsReadOnly"];
-
-                               if (row["NumericPrecision"] != DBNull.Value)
-                                       columnSchema.NumericPrecision = (byte) row["NumericPrecision"];
+                               columnSchema.ColumnSize = (int) row ["ColumnSize"];
+                               columnSchema.DataTypeName = reader.GetDataTypeName (index);
+                               columnSchema.FieldType = reader.GetFieldType (index);
+                               columnSchema.IsReadOnly = (bool) row ["IsReadOnly"];
+                               columnSchema.TableName = row ["BaseTableName"].ToString ();
+
+                               if (row ["NumericPrecision"] != DBNull.Value)
+                                       columnSchema.NumericPrecision = Convert.ToByte (row ["NumericPrecision"]);
                                else
-                                       columnSchema.NumericPrecision = (byte) 0;
+                                       columnSchema.NumericPrecision = Convert.ToByte (0);
 
-                               if (row["NumericScale"] != DBNull.Value)
-                                       columnSchema.NumericScale = (byte) row["NumericScale"];
+                               if (row ["NumericScale"] != DBNull.Value)
+                                       columnSchema.NumericScale = Convert.ToByte (row ["NumericScale"]);
                                else
-                                       columnSchema.NumericScale = (byte) 0;
-                               list.Add (columnSchema);
-                               fieldCount += 1;
+                                       columnSchema.NumericScale = Convert.ToByte (0);
+
+                               schema [index] = columnSchema;
+                               index += 1;
                        }
-                       schema = (SchemaInfo[]) list.ToArray (typeof (SchemaInfo));
                }
 
-               public virtual bool MoveNext ()
+               public bool MoveNext ()
                {
                        if (reader.Read ()) 
                                return true;
@@ -93,9 +122,10 @@ namespace System.Data.Common {
                        return false;
                }
 
-               public virtual void Reset ()
+               [EditorBrowsable (EditorBrowsableState.Never)]
+               public void Reset ()
                {
-                       throw new InvalidOperationException ("This enumerator can only go forward.");   
+                       throw new NotSupportedException ();
                }
                
                #endregion // Methods