Author: anagappan
Date: 2007-06-06 06:39:33 -0400 (Wed, 06 Jun 2007)
New Revision: 78717
Modified:
trunk/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection.cs
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnectionStringBuilder.cs
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
Log:
2007-06-06 Nagappan A <[EMAIL PROTECTED]>
* SqlCommand.cs, SqlConnectionStringBuilder.cs, SqlConnection.cs:
Fixed 1.0 and 2.0 extras, errors as stated in class status page.
* SqlDataAdapter.cs, SqlParameter.cs:Fixed 1.0 and 2.0 extras,
errors as stated in class status page.
* SqlBulkCopyColumnMappingCollection.cs: Fixed 1.0 and 2.0 extras,
errors as stated in class status page.
Modified: trunk/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient/ChangeLog 2007-06-06
10:39:26 UTC (rev 78716)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient/ChangeLog 2007-06-06
10:39:33 UTC (rev 78717)
@@ -1,3 +1,14 @@
+2007-06-06 Nagappan A <[EMAIL PROTECTED]>
+
+ * SqlCommand.cs, SqlConnectionStringBuilder.cs, SqlConnection.cs:
+ Fixed 1.0 and 2.0 extras, errors as stated in class status page.
+
+ * SqlDataAdapter.cs, SqlParameter.cs:Fixed 1.0 and 2.0 extras,
+ errors as stated in class status page.
+
+ * SqlBulkCopyColumnMappingCollection.cs: Fixed 1.0 and 2.0 extras,
+ errors as stated in class status page.
+
2007-05-30 Nagappan A <[EMAIL PROTECTED]>
* SqlParameter.cs (SqlParameter): Updated constructor to use the
Modified:
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection.cs
===================================================================
---
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection.cs
2007-06-06 10:39:26 UTC (rev 78716)
+++
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopyColumnMappingCollection.cs
2007-06-06 10:39:33 UTC (rev 78717)
@@ -39,42 +39,12 @@
{
public sealed class SqlBulkCopyColumnMappingCollection : CollectionBase
{
- #region Fields
-
- private SqlBulkCopyColumnMappingCollection _collection = new
SqlBulkCopyColumnMappingCollection ();
-
- #endregion
-
- #region Properties
-
- public new int Capacity {
- get { return _collection.Capacity; }
- set { _collection.Capacity = value; }
- }
-
- public new int Count {
- get { return _collection.Count; }
- }
-
- public SqlBulkCopyColumnMapping this [int index] {
- get { return _collection [index]; }
- }
-
- protected new ArrayList InnerList {
- get { return _collection.InnerList; }
- }
-
- protected new IList List {
- get { return _collection.List; }
- }
-
- #endregion
-
#region Methods
+ [MonoTODO]
public SqlBulkCopyColumnMapping Add (SqlBulkCopyColumnMapping
bulkCopyColumnMapping)
{
- return _collection.Add (bulkCopyColumnMapping);
+ throw new NotImplementedException ();
}
[MonoTODO]
@@ -108,33 +78,33 @@
public bool Contains (SqlBulkCopyColumnMapping value)
{
- return _collection.Contains (value);
+ return List.Contains (value);
}
public int IndexOf (SqlBulkCopyColumnMapping value)
{
- return _collection.IndexOf (value);
+ return List.IndexOf (value);
}
- public int Insert (int index, SqlBulkCopyColumnMapping value)
+ public void Insert (int index, SqlBulkCopyColumnMapping value)
{
- if (index < 0 || index > _collection.Count)
+ if (index < 0 || index > base.Count)
throw new ArgumentOutOfRangeException ("Index
is out of range");
- return _collection.Insert (index, value);
+ List.Insert (index, value);
}
- public int Remove (SqlBulkCopyColumnMapping value)
+ public void Remove (SqlBulkCopyColumnMapping value)
{
- return _collection.Remove (value);
+ List.Remove (value);
}
[MonoTODO]
- public new int RemoveAt (int index)
+ public new void RemoveAt (int index)
{
- if (index < 0 || index > _collection.Count)
+ if (index < 0 || index > base.Count)
throw new ArgumentOutOfRangeException ("Index
is out of range");
// FIXME: Implement WriteToServer
- return _collection.RemoveAt (index);
+ base.RemoveAt (index);
}
#endregion
Modified: trunk/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
2007-06-06 10:39:26 UTC (rev 78716)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
2007-06-06 10:39:33 UTC (rev 78717)
@@ -132,7 +132,6 @@
get { return behavior; }
}
- [DataCategory ("Data")]
#if !NET_2_0
[DataSysDescription ("Command text to execute.")]
#endif
@@ -169,7 +168,6 @@
}
}
- [DataCategory ("Data")]
#if !NET_2_0
[DataSysDescription ("How to interpret the CommandText.")]
#endif
@@ -201,7 +199,6 @@
}
}
- [DataCategory ("Behavior")]
[DefaultValue (null)]
#if !NET_2_0
[DataSysDescription ("Connection used by the command.")]
@@ -236,7 +233,6 @@
set { designTimeVisible = value; }
}
- [DataCategory ("Data")]
#if !NET_2_0
[DataSysDescription ("The parameters collection.")]
#endif
@@ -285,7 +281,6 @@
set { transaction = value; }
}
- [DataCategory ("Behavior")]
#if !NET_2_0
[DataSysDescription ("When used by a DataAdapter.Update, how
command results are applied to the current DataRow.")]
#endif
Modified: trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
2007-06-06 10:39:26 UTC (rev 78716)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
2007-06-06 10:39:33 UTC (rev 78717)
@@ -126,7 +126,6 @@
#region Properties
- [DataCategory ("Data")]
#if !NET_2_0
[DataSysDescription ("Information used to connect to a
DataSource, such as 'Data Source=x;Initial Catalog=x;Integrated
Security=SSPI'.")]
#endif
@@ -277,22 +276,17 @@
#region Events
- [DataCategory ("InfoMessage")]
#if !NET_2_0
[DataSysDescription ("Event triggered when messages arrive from
the DataSource.")]
#endif
public event SqlInfoMessageEventHandler InfoMessage;
- [DataCategory ("StateChange")]
#if !NET_2_0
[DataSysDescription ("Event triggered when the connection
changes state.")]
-#endif
public
-#if NET_2_0
- override
#endif // NET_2_0
- event StateChangeEventHandler StateChange;
-
+ new event StateChangeEventHandler StateChange;
+
#endregion // Events
#region Delegates
Modified:
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnectionStringBuilder.cs
===================================================================
---
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnectionStringBuilder.cs
2007-06-06 10:39:26 UTC (rev 78716)
+++
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnectionStringBuilder.cs
2007-06-06 10:39:33 UTC (rev 78717)
@@ -187,7 +187,8 @@
}
}
- [EditorBrowsable (EditorBrowsableState.Never)]
+ [Editor ("Microsoft.VSDesigner.Data.Design.DBParametersEditor,
" + Consts.AssemblyMicrosoft_VSDesigner,
+ "System.Drawing.Design.UITypeEditor, " +
Consts.AssemblySystem_Drawing)]
[DisplayNameAttribute ("AttachDbFilename")]
[RefreshPropertiesAttribute (RefreshProperties.All)]
public string AttachDBFilename {
@@ -229,7 +230,6 @@
}
[DisplayNameAttribute ("Data Source")]
- [TypeConverterAttribute (typeof (string))]
[RefreshPropertiesAttribute (RefreshProperties.All)]
public string DataSource {
get { return _dataSource; }
@@ -260,7 +260,6 @@
}
[DisplayNameAttribute ("Failover Partner")]
- [TypeConverterAttribute (typeof (string))]
[RefreshPropertiesAttribute (RefreshProperties.All)]
public string FailoverPartner {
get { return _failoverPartner; }
@@ -271,7 +270,6 @@
}
[DisplayNameAttribute ("Initial Catalog")]
- [TypeConverterAttribute (typeof (string))]
[RefreshPropertiesAttribute (RefreshProperties.All)]
public string InitialCatalog {
get { return _initialCatalog; }
@@ -348,7 +346,6 @@
}
[DisplayNameAttribute ("Network Library")]
- [TypeConverterAttribute (typeof (string))]
[RefreshPropertiesAttribute (RefreshProperties.All)]
public string NetworkLibrary {
get { return _networkLibrary; }
Modified: trunk/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
2007-06-06 10:39:26 UTC (rev 78716)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
2007-06-06 10:39:33 UTC (rev 78717)
@@ -88,7 +88,6 @@
#region Properties
- [DataCategory ("Update")]
#if !NET_2_0
[DataSysDescription ("Used during Update for deleted rows in
DataSet.")]
#endif
@@ -99,7 +98,6 @@
set { deleteCommand = value; }
}
- [DataCategory ("Update")]
#if !NET_2_0
[DataSysDescription ("Used during Update for new rows in
DataSet.")]
#endif
@@ -110,7 +108,6 @@
set { insertCommand = value; }
}
- [DataCategory ("Fill")]
#if !NET_2_0
[DataSysDescription ("Used during Fill/FillSchema.")]
#endif
@@ -121,7 +118,6 @@
set { selectCommand = value; }
}
- [DataCategory ("Update")]
#if !NET_2_0
[DataSysDescription ("Used during Update for modified rows in
DataSet.")]
#endif
@@ -226,13 +222,11 @@
#region Events and Delegates
- [DataCategory ("Update")]
#if !NET_2_0
[DataSysDescription ("Event triggered before every DataRow
during Update.")]
#endif
public event SqlRowUpdatedEventHandler RowUpdated;
- [DataCategory ("Update")]
#if !NET_2_0
[DataSysDescription ("Event triggered after every DataRow
during Update.")]
#endif
Modified: trunk/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
2007-06-06 10:39:26 UTC (rev 78716)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
2007-06-06 10:39:33 UTC (rev 78717)
@@ -207,8 +207,8 @@
[DataSysDescription ("The parameter generic type.")]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
[RefreshProperties (RefreshProperties.All)]
-#endif
[DataCategory ("Data")]
+#endif
public
#if NET_2_0
override
@@ -221,8 +221,8 @@
}
}
- [DataCategory ("Data")]
#if ONLY_1_0 || ONLY_1_1
+ [DataCategory ("Data")]
[DataSysDescription ("Input, output, or bidirectional
parameter.")]
[DefaultValue (ParameterDirection.Input)]
#endif
@@ -272,8 +272,8 @@
}
[Browsable (false)]
- [DataCategory ("Data")]
#if ONLY_1_0 || ONLY_1_1
+ [DataCategory ("Data")]
[DataSysDescription ("Offset in variable length data types.")]
[DefaultValue (0)]
#endif
@@ -298,11 +298,10 @@
set { metaParameter.ParameterName = value; }
}
- [DataCategory ("Data")]
[DefaultValue (0)]
#if ONLY_1_0 || ONLY_1_1
+ [DataCategory ("Data")]
[DataSysDescription ("For decimal, numeric, varnumeric
DBTypes.")]
-#else
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
#endif
@@ -311,11 +310,10 @@
set { metaParameter.Precision = value; }
}
- [DataCategory ("Data")]
[DefaultValue (0)]
#if ONLY_1_0 || ONLY_1_1
+ [DataCategory ("Data")]
[DataSysDescription ("For decimal, numeric, varnumeric
DBTypes.")]
-#else
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
#endif
@@ -324,8 +322,8 @@
set { metaParameter.Scale = value; }
}
- [DataCategory ("Data")]
#if ONLY_1_0 || ONLY_1_1
+ [DataCategory ("Data")]
[DataSysDescription ("Size of variable length data types
(string & arrays).")]
[DefaultValue (0)]
#endif
@@ -338,8 +336,8 @@
set { metaParameter.Size = value; }
}
- [DataCategory ("Data")]
#if ONLY_1_0 || ONLY_1_1
+ [DataCategory ("Data")]
[DataSysDescription ("When used by a DataAdapter.Update, the
source column name that is used to find the DataSetColumn name in the
ColumnMappings. This is to copy a value between the parameter and a datarow.")]
[DefaultValue ("")]
#endif
@@ -352,8 +350,8 @@
set { sourceColumn = value; }
}
- [DataCategory ("Data")]
#if ONLY_1_0 || ONLY_1_1
+ [DataCategory ("Data")]
[DataSysDescription ("When used by a DataAdapter.Update
(UpdateCommand only), the version of the DataRow value that is used to update
the data source.")]
[DefaultValue (DataRowVersion.Current)]
#endif
@@ -366,8 +364,8 @@
set { sourceVersion = value; }
}
- [DataCategory ("Data")]
#if ONLY_1_0 || ONLY_1_1
+ [DataCategory ("Data")]
[DataSysDescription ("The parameter native type.")]
[DefaultValue (SqlDbType.NVarChar)]
#endif
@@ -383,13 +381,12 @@
}
}
- [DataCategory ("Data")]
+ [TypeConverterAttribute (typeof (StringConverter))]
#if ONLY_1_0 || ONLY_1_1
+ [DataCategory ("Data")]
[DataSysDescription ("Value of the parameter.")]
[DefaultValue (null)]
-#endif
- [TypeConverterAttribute (typeof (StringConverter))]
-#if NET_2_0
+#else
[RefreshProperties (RefreshProperties.All)]
#endif
public
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
