Author: anagappan
Date: 2007-10-19 01:24:09 -0400 (Fri, 19 Oct 2007)
New Revision: 87810
Modified:
trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs
Log:
* OdbcCommandBuilder.cs, OdbcParameterCollection.cs: Code alignment.
* OdbcDataReader.cs: Fixes numeric columns, bug # 332404.
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog 2007-10-19
05:05:16 UTC (rev 87809)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog 2007-10-19
05:24:09 UTC (rev 87810)
@@ -1,5 +1,10 @@
2007-10-19 Nagappan <[EMAIL PROTECTED]>
+ * OdbcCommandBuilder.cs, OdbcParameterCollection.cs: Code alignment.
+ * OdbcDataReader.cs: Fixes numeric columns, bug # 332404.
+
+2007-10-19 Nagappan <[EMAIL PROTECTED]>
+
* OdbcCommand.cs: (Clone): Implemented new method. Code alignment.
2007-10-12 Nagappan <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs
2007-10-19 05:05:16 UTC (rev 87809)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs
2007-10-19 05:24:09 UTC (rev 87810)
@@ -43,14 +43,14 @@
/// </summary>
#if NET_2_0
- public sealed class OdbcCommandBuilder : DbCommandBuilder
+ public sealed class OdbcCommandBuilder : DbCommandBuilder
#else // 1_1
public sealed class OdbcCommandBuilder : Component
#endif // NET_2_0
{
#region Fields
- private OdbcDataAdapter _adapter;
+ private OdbcDataAdapter _adapter;
private string _quotePrefix;
private string _quoteSuffix;
@@ -87,9 +87,9 @@
[DefaultValue (null)]
public
#if NET_2_0
- new
+ new
#endif // NET_2_0
- OdbcDataAdapter DataAdapter {
+ OdbcDataAdapter DataAdapter {
get {
return _adapter;
}
@@ -102,7 +102,6 @@
_adapter = value;
if (_adapter != null)
_adapter.RowUpdating += new
OdbcRowUpdatingEventHandler (OnRowUpdating);
-
}
}
@@ -147,13 +146,13 @@
[BrowsableAttribute (false)]
[OdbcDescriptionAttribute ("The prefix string wrapped around
sql objects")]
- [DesignerSerializationVisibilityAttribute
(DesignerSerializationVisibility.Hidden)]
+ [DesignerSerializationVisibilityAttribute
(DesignerSerializationVisibility.Hidden)]
#if ONLY_1_1
public
#else
- new
+ new
#endif
- string QuotePrefix {
+ string QuotePrefix {
get {
return _quotePrefix;
}
@@ -163,8 +162,8 @@
}
[BrowsableAttribute (false)]
- [OdbcDescriptionAttribute ("The suffix string wrapped around
sql objects")]
- [DesignerSerializationVisibilityAttribute
(DesignerSerializationVisibility.Hidden)]
+ [OdbcDescriptionAttribute ("The suffix string wrapped around
sql objects")]
+ [DesignerSerializationVisibilityAttribute
(DesignerSerializationVisibility.Hidden)]
#if ONLY_1_1
public
#else
@@ -287,9 +286,9 @@
public
#if NET_2_0
- new
+ new
#endif // NET_2_0
- OdbcCommand GetInsertCommand ()
+ OdbcCommand GetInsertCommand ()
{
// FIXME: check validity of adapter
if (_insertCommand != null)
@@ -415,7 +414,7 @@
#if NET_2_0
[MonoTODO]
- public new OdbcCommand GetUpdateCommand (bool option)
+ public new OdbcCommand GetUpdateCommand (bool option)
{
// FIXME: check validity of adapter
if (_updateCommand != null)
@@ -461,7 +460,7 @@
#if NET_2_0
[MonoTODO]
- public new OdbcCommand GetDeleteCommand (bool option)
+ public new OdbcCommand GetDeleteCommand (bool option)
{
// FIXME: check validity of adapter
if (_deleteCommand != null)
@@ -509,11 +508,11 @@
}
#if NET_2_0
- protected override void ApplyParameterInfo (DbParameter
dbParameter,
- DataRow row,
- StatementType
statementType,
- bool whereClause)
- {
+ protected override void ApplyParameterInfo (DbParameter
dbParameter,
+ DataRow row,
+ StatementType
statementType,
+ bool whereClause)
+ {
OdbcParameter parameter = (OdbcParameter) dbParameter;
parameter.Size = int.Parse (row ["ColumnSize"].ToString
());
if (row ["NumericPrecision"] != DBNull.Value) {
@@ -523,28 +522,28 @@
parameter.Scale = byte.Parse (row
["NumericScale"].ToString ());
}
parameter.DbType = (DbType) row ["ProviderType"];
- }
+ }
- protected override string GetParameterName (int position)
- {
+ protected override string GetParameterName (int position)
+ {
return String.Format("@p{0}", position);
- }
+ }
- protected override string GetParameterName (string
parameterName)
- {
+ protected override string GetParameterName (string
parameterName)
+ {
return String.Format("@{0}", parameterName);
- }
+ }
- protected override string GetParameterPlaceholder (int
position)
- {
+ protected override string GetParameterPlaceholder (int position)
+ {
return GetParameterName (position);
- }
+ }
- [MonoTODO]
- protected override void SetRowUpdatingHandler (DbDataAdapter
adapter)
- {
- throw new NotImplementedException ();
- }
+ [MonoTODO]
+ protected override void SetRowUpdatingHandler (DbDataAdapter
adapter)
+ {
+ throw new NotImplementedException ();
+ }
#endif // NET_2_0
@@ -558,7 +557,7 @@
if (unquotedIdentifier == null || unquotedIdentifier ==
String.Empty)
return unquotedIdentifier;
return String.Format ("{0}{1}{2}", QuotePrefix,
- unquotedIdentifier, QuoteSuffix);
+
unquotedIdentifier, QuoteSuffix);
}
#if NET_2_0
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
2007-10-19 05:05:16 UTC (rev 87809)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
2007-10-19 05:24:09 UTC (rev 87810)
@@ -653,7 +653,8 @@
byte [] temp = new byte
[outsize];
for (int i = 0;i<outsize;i++)
temp[i] = buffer[i];
- DataValue =
Decimal.Parse(System.Text.Encoding.Default.GetString(temp));
+ DataValue = Decimal.Parse
(System.Text.Encoding.Default.GetString (temp),
+
System.Globalization.CultureInfo.InvariantCulture);
}
break;
case OdbcType.TinyInt:
Modified:
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs
2007-10-19 05:05:16 UTC (rev 87809)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs
2007-10-19 05:24:09 UTC (rev 87810)
@@ -43,7 +43,7 @@
[ListBindable (false)]
[EditorAttribute
("Microsoft.VSDesigner.Data.Design.DBParametersEditor, "+
Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+
Consts.AssemblySystem_Drawing )]
#if NET_2_0
- public sealed class OdbcParameterCollection : DbParameterCollection
+ public sealed class OdbcParameterCollection : DbParameterCollection
#else
public sealed class OdbcParameterCollection : MarshalByRefObject,
IDataParameterCollection, IList, ICollection, IEnumerable
@@ -67,7 +67,7 @@
#if ONLY_1_1
[Browsable (false)]
- [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
+ [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
#endif
public
#if NET_2_0
@@ -77,28 +77,27 @@
get { return list.Count; }
}
- [Browsable (false)]
- [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
+ [Browsable (false)]
+ [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
public new OdbcParameter this [int index] {
get { return (OdbcParameter) list[index]; }
set { list[index] = value; }
}
- [Browsable (false)]
- [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
+ [Browsable (false)]
+ [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
public new OdbcParameter this [string parameterName] {
get {
- foreach (OdbcParameter p in list)
- if (p.ParameterName.Equals
(parameterName))
- return p;
- throw new IndexOutOfRangeException ("The
specified name does not exist: " + parameterName);
- }
- set {
- if (!Contains (parameterName))
- throw new
IndexOutOfRangeException("The specified name does not exist: " + parameterName);
- this [IndexOf (parameterName)] = value;
- }
-
+ foreach (OdbcParameter p in list)
+ if (p.ParameterName.Equals
(parameterName))
+ return p;
+ throw new IndexOutOfRangeException ("The
specified name does not exist: " + parameterName);
+ }
+ set {
+ if (!Contains (parameterName))
+ throw new IndexOutOfRangeException("The
specified name does not exist: " + parameterName);
+ this [IndexOf (parameterName)] = value;
+ }
}
#if ONLY_1_1
@@ -135,19 +134,19 @@
}
#if ONLY_1_1
- object IList.this[int index] {
- get { return list[index]; }
- set { list[index] = value; }
+ object IList.this [int index] {
+ get { return list [index]; }
+ set { list [index] = value; }
}
- object IDataParameterCollection.this[string name]
+ object IDataParameterCollection.this [string name]
{
- get { return this[name]; }
- set {
- if (!(value is OdbcParameter))
- throw new InvalidCastException ("Only
OdbcParameter objects can be used.");
- this [name] = (OdbcParameter) value;
- }
+ get { return this [name]; }
+ set {
+ if (!(value is OdbcParameter))
+ throw new InvalidCastException ("Only
OdbcParameter objects can be used.");
+ this [name] = (OdbcParameter) value;
+ }
}
#endif // ONLY_1_1
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
