X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Data%2FSystem.Data.Common%2FRecordCache.cs;fp=mcs%2Fclass%2FSystem.Data%2FSystem.Data.Common%2FRecordCache.cs;h=7338240e1e03f66c6e417d4b7d85bbecf497ea2b;hb=2a8259225695032220537b3c90a99d7a2686f214;hp=92bf0d239bcabe2c93acf1d5b4a08cb5b236fc24;hpb=039e748b6ef283c355b3b28cc6968556aca4ddb4;p=mono.git

diff --git a/mcs/class/System.Data/System.Data.Common/RecordCache.cs b/mcs/class/System.Data/System.Data.Common/RecordCache.cs
index 92bf0d239bc..7338240e1e0 100644
--- a/mcs/class/System.Data/System.Data.Common/RecordCache.cs
+++ b/mcs/class/System.Data/System.Data.Common/RecordCache.cs
@@ -36,6 +36,7 @@ namespace System.Data.Common
 		int _nextFreeIndex = 0;
 		int _currentCapacity = 0;
 		DataTable _table;
+		DataRow[] _rowsToRecords;
 
 		#endregion // Fields
 
@@ -44,6 +45,7 @@ namespace System.Data.Common
 		internal RecordCache(DataTable table)
 		{
 			_table = table;
+			_rowsToRecords = table.NewRowArray(16);
 		}
 
 		#endregion //Constructors
@@ -57,6 +59,19 @@ namespace System.Data.Common
 			}
 		}
 
+		internal DataRow this[int index]
+		{
+			get {
+				return _rowsToRecords[index];
+			}
+
+			set {
+				if (index >= 0) {
+					_rowsToRecords[index] = value;
+				}
+			}
+		}
+
 		#endregion // Properties
 
 		#region Methods
@@ -76,6 +91,10 @@ namespace System.Data.Common
 					foreach(DataColumn col in cols) {
 						col.DataContainer.Capacity = _currentCapacity;
 					}
+
+					DataRow[] old = _rowsToRecords;
+					_rowsToRecords = _table.NewRowArray(_currentCapacity);
+					Array.Copy(old,0,_rowsToRecords,0,old.Length);
 				}
 				return _nextFreeIndex++;
 			}
@@ -86,9 +105,8 @@ namespace System.Data.Common
 			if ( index < 0 ) {
 				throw new ArgumentException();
 			}
-                        if (! _records.Contains (index)) {
-                                _records.Push(index);
-                        }
+			_records.Push(index);
+			this[index] = null;
 		}
 
 		internal int CopyRecord(DataTable fromTable,int fromRecordIndex,int toRecordIndex)
@@ -98,30 +116,49 @@ namespace System.Data.Common
 				recordIndex = NewRecord();
 			}
 
-			foreach(DataColumn fromColumn in fromTable.Columns) {
-				DataColumn column = _table.Columns[fromColumn.ColumnName];
-				if (column != null) {
-					column.DataContainer.CopyValue(fromColumn.DataContainer,fromRecordIndex,recordIndex);
+			try
+			{
+				foreach(DataColumn fromColumn in fromTable.Columns) 
+				{
+					DataColumn column = _table.Columns[fromColumn.ColumnName];
+					if (column != null) 
+					{
+						column.DataContainer.CopyValue(fromColumn.DataContainer,fromRecordIndex,recordIndex);
+					}
 				}
+
+				return recordIndex;
 			}
+			catch
+			{
+				if (toRecordIndex == -1)
+					DisposeRecord(recordIndex);
 
-			return recordIndex;
+				throw;
+			}
 		}
 
-                /// <summary>
-                ///     Compares two records in the given data table. The numbers are the offset
-                ///     into the container tables.
-                /// </summary>
-                internal static bool CompareRecords (DataTable table, int x, int y)
-                {
-                        foreach (DataColumn dc in table.Columns) {
-                                if (dc.DataContainer.CompareValues (x, y) != 0)
-                                        return false;
-                        }
-                        return true;
-                }
-                
-		#endregion // Methods
+		internal void ReadIDataRecord(int recordIndex, IDataRecord record, int[] mapping, int length)
+		{
+			if ( mapping.Length > _table.Columns.Count)
+				throw new ArgumentException ();
+
+			int i=0;
+			for(; i < length; i++) {
+				DataColumn column = _table.Columns[mapping[i]];
+				column.DataContainer.SetItemFromDataRecord(recordIndex, record,i);
+			}
 
+			for (; i < mapping.Length; i++)
+			{
+				DataColumn column = _table.Columns[mapping[i]];
+				if ( column.AutoIncrement ) 
+					column.DataContainer[recordIndex] = column.AutoIncrementValue ();
+				else
+					column.DataContainer[recordIndex] = column.DefaultValue;
+			}
+		}
+
+		#endregion // Methods
 	}
 }