Author: leszek
Date: 2006-09-11 13:15:07 -0400 (Mon, 11 Sep 2006)
New Revision: 65243
Modified:
trunk/mcs/class/System.Data.OracleClient/ChangeLog
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDefineHandle.cs
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataReader.cs
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleParameterTest.cs
Log:
Fix for bug 79284, number handling now takes into consideration NLS from Oracle
database.
Modified: trunk/mcs/class/System.Data.OracleClient/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data.OracleClient/ChangeLog 2006-09-11 16:45:06 UTC
(rev 65242)
+++ trunk/mcs/class/System.Data.OracleClient/ChangeLog 2006-09-11 17:15:07 UTC
(rev 65243)
@@ -1,11 +1,14 @@
2006-08-21 Leszek Ciesielski <[EMAIL PROTECTED]>
- * OracleCommand.cs : fix for bug 78765
- * OracleParameter.cs : fix for bug 78509
+ * OracleCommand.cs : fix for bug 78765 and 79284
+ * OracleParameter.cs : fix for bug 78509 and 79284
* README.tests : New : information about running on-line tests from
Test/System.Data.OracleClient
* System.Data.OracleClient_test_default.dll.config.example : New :
Example configuration
for on-line tests from Test/System.Data.OracleClient
+ * OracleDataReader.cs : fix for bug 79284
+ * OracleConnection.cs : fix for bug 79284
+ * OciDefineHandle.cs : fix for bug 79284
2006-08-21 Boris Kirzner <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs
2006-09-11 16:45:06 UTC (rev 65242)
+++
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommand.cs
2006-09-11 17:15:07 UTC (rev 65243)
@@ -380,7 +380,7 @@
if (statement.Fetch ()) {
OciDefineHandle defineHandle =
(OciDefineHandle) statement.Values [0];
if (!defineHandle.IsNull)
- output =
defineHandle.GetOracleValue ();
+ output =
defineHandle.GetOracleValue (Connection.SessionFormatProvider);
switch (defineHandle.DataType) {
case OciDataType.Blob:
case OciDataType.Clob:
@@ -492,13 +492,15 @@
switch
(defineHandle.DataType) {
case OciDataType.Blob:
case OciDataType.Clob:
- OracleLob lob =
(OracleLob) defineHandle.GetValue ();
+ OracleLob lob
= (OracleLob) defineHandle.GetValue (
+
Connection.SessionFormatProvider);
lob.connection
= Connection;
output =
lob.Value;
lob.Close ();
break;
default:
- output =
defineHandle.GetValue ();
+ output =
defineHandle.GetValue (
+
Connection.SessionFormatProvider);
break;
}
}
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs
2006-09-11 16:45:06 UTC (rev 65242)
+++
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs
2006-09-11 17:15:07 UTC (rev 65243)
@@ -65,6 +65,7 @@
int maxPoolSize = 100;
byte persistSecurityInfo = 1;
bool disposed = false;
+ IFormatProvider format_info;
#endregion // Fields
@@ -314,6 +315,14 @@
return ret.ToString ();
}
+ // An instance of IFormatProvider for locale - independent
IFormattable.ToString () in Bind ()
+ internal IFormatProvider SessionFormatProvider {
+ get {
+ return format_info;
+ }
+ }
+
+ [MonoTODO("Handle other culture-specific informations,
restrict buffer sizes")]
public void Open ()
{
PersistSecurityInfo ();
@@ -327,6 +336,18 @@
oci = pool.GetConnection ();
}
state = ConnectionState.Open;
+
+ NumberFormatInfo numberFormatInfo = new
NumberFormatInfo ();
+ numberFormatInfo.NumberGroupSeparator
+ = GetNlsInfo (Session,
(uint)OciNlsServiceType.MAXBUFSZ, OciNlsServiceType.GROUP);
+ numberFormatInfo.NumberDecimalSeparator
+ = GetNlsInfo (Session,
(uint)OciNlsServiceType.MAXBUFSZ, OciNlsServiceType.DECIMAL);
+ numberFormatInfo.CurrencyGroupSeparator
+ = GetNlsInfo (Session,
(uint)OciNlsServiceType.MAXBUFSZ, OciNlsServiceType.MONGROUP);
+ numberFormatInfo.CurrencyDecimalSeparator
+ = GetNlsInfo (Session,
(uint)OciNlsServiceType.MAXBUFSZ, OciNlsServiceType.MONDECIMAL);
+ format_info = numberFormatInfo;
+
CreateStateChange (ConnectionState.Closed,
ConnectionState.Open);
}
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataReader.cs
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataReader.cs
2006-09-11 16:45:06 UTC (rev 65242)
+++
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataReader.cs
2006-09-11 17:15:07 UTC (rev 65243)
@@ -291,7 +291,8 @@
if (IsDBNull (i))
throw new InvalidOperationException("The value
is null");
- OracleLob output = (OracleLob) ((OciDefineHandle)
statement.Values [i]).GetValue();
+ OracleLob output = (OracleLob) ((OciDefineHandle)
statement.Values [i]).GetValue (
+ command.Connection.SessionFormatProvider);
output.connection = command.Connection;
return output;
}
@@ -680,7 +681,7 @@
lob.Close ();
return value;
default:
- return defineHandle.GetValue ();
+ return defineHandle.GetValue
(command.Connection.SessionFormatProvider);
}
}
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs
2006-09-11 16:45:06 UTC (rev 65242)
+++
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs
2006-09-11 17:15:07 UTC (rev 65243)
@@ -474,9 +474,17 @@
Marshal.Copy (val, 0, bindValue,
val.Length);
bindSize = val.Length;
}
- else if (oracleType == OracleType.Number) {
- // TODO: move number type to a
non-locale specific way
- string svalue = v.ToString ();
+ else if (oracleType == OracleType.Number
+ || oracleType == OracleType.Double
+ || oracleType == OracleType.Int32
+ || oracleType == OracleType.Int16
+ || oracleType == OracleType.Byte
+ || oracleType == OracleType.Float) {
+ string svalue = null;
+ if(v is IFormattable)
+ svalue =
((IFormattable)v).ToString (null, con.SessionFormatProvider);
+ else
+ svalue = v.ToString();
rsize = 0;
// Get size of buffer
@@ -487,7 +495,7 @@
OciCalls.OCIUnicodeToCharSet
(statement.Parent, bytes, svalue, out rsize);
bindType = OciDataType.VarChar2;
- bindSize = v.ToString ().Length;
+ bindSize = svalue.Length;
}
else {
string svalue = v.ToString () + '\0';
@@ -501,7 +509,7 @@
OciCalls.OCIUnicodeToCharSet
(statement.Parent, bytes, svalue, out rsize);
bindType = OciDataType.String;
- bindSize = v.ToString ().Length + 1;
+ bindSize = svalue.Length;
}
}
@@ -908,7 +916,7 @@
case OciDataType.Float:
tmp = Marshal.PtrToStringAnsi (bindOutValue,
bindSize);
if (tmp != null)
- value = Decimal.Parse (String.Copy
((string) tmp));
+ value = Decimal.Parse (String.Copy
((string) tmp), cmd.Connection.SessionFormatProvider);
break;
case OciDataType.TimeStamp:
value = dateTimeDesc.GetDateTime
(connection.Environment, dateTimeDesc.ErrorHandle);
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDefineHandle.cs
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDefineHandle.cs
2006-09-11 16:45:06 UTC (rev 65242)
+++
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDefineHandle.cs
2006-09-11 17:15:07 UTC (rev 65243)
@@ -412,7 +412,7 @@
return new OracleLob (lobLocator, ociType);
}
- public object GetValue ()
+ public object GetValue (IFormatProvider formatProvider)
{
object tmp;
@@ -445,9 +445,9 @@
Marshal.Copy (Value, buffer, 0, buffer.Length);
int longSize = 0;
- if (BitConverter.IsLittleEndian)
- longSize = BitConverter.ToInt32 (new
byte[]{buffer[0], buffer[1], buffer[2], buffer[3]}, 0);
- else
+ if (BitConverter.IsLittleEndian)
+ longSize = BitConverter.ToInt32 (new
byte[]{buffer[0], buffer[1], buffer[2], buffer[3]}, 0);
+ else
longSize = BitConverter.ToInt32 (new
byte[]{buffer[3], buffer[2], buffer[1], buffer[0]}, 0);
ASCIIEncoding encoding = new ASCIIEncoding ();
@@ -458,7 +458,7 @@
case OciDataType.Float:
tmp = Marshal.PtrToStringAnsi (Value, Size);
if (tmp != null)
- return Decimal.Parse (String.Copy
((string) tmp));
+ return Decimal.Parse (String.Copy
((string) tmp), formatProvider);
break;
case OciDataType.TimeStamp:
return dateTimeDesc.GetDateTime (Parent.Parent,
dateTimeDesc.ErrorHandle);
@@ -476,9 +476,9 @@
return DBNull.Value;
}
- internal object GetOracleValue ()
+ internal object GetOracleValue (IFormatProvider formatProvider)
{
- object ovalue = GetValue ();
+ object ovalue = GetValue (formatProvider);
switch (DataType) {
case OciDataType.Raw:
Modified:
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleParameterTest.cs
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleParameterTest.cs
2006-09-11 16:45:06 UTC (rev 65242)
+++
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient/OracleParameterTest.cs
2006-09-11 17:15:07 UTC (rev 65243)
@@ -29,6 +29,8 @@
using NUnit.Framework;
using System.Configuration;
+using System.Globalization;
+using System.Threading;
using System.Data.OracleClient;
using System.Data;
using System;
@@ -61,10 +63,14 @@
connection.Open ();
command = connection.CreateCommand ();
- // create the table
+ // create the tables
command.CommandText =
"create table oratest (id number(10),
text varchar2(64), text2 varchar2(64) )";
command.ExecuteNonQuery ();
+
+ command.CommandText =
+ "create table culture_test (id
number(10), value1 float, value2 number(20,10))";
+ command.ExecuteNonQuery ();
}
[TearDown]
@@ -73,6 +79,8 @@
command = connection.CreateCommand ();
command.CommandText = "drop table oratest";
command.ExecuteNonQuery ();
+ command.CommandText = "drop table culture_test";
+ command.ExecuteNonQuery ();
connection.Close ();
connection.Dispose ();
@@ -102,9 +110,78 @@
Assert.AreEqual (test_value,
reader.GetString (0), "Passed through bind value mismatched");
}
else {
- Assert.Fail("Expected records not
found.");
+ Assert.Fail ("Expected records not
found.");
}
}
}
+
+ [Test] // regression for bug #79284
+ public void CultureSensitiveNumbersTest ()
+ {
+ CultureInfo currentCulture =
Thread.CurrentThread.CurrentCulture;
+
+ Thread.CurrentThread.CurrentCulture = new CultureInfo
("en-GB", false);
+ CultureSensitiveNumbersInsertTest (1);
+ CultureSensitiveNumbersSelectTest (1);
+
+ Thread.CurrentThread.CurrentCulture = new CultureInfo
("pl-PL", false);
+ CultureSensitiveNumbersInsertTest (2);
+ CultureSensitiveNumbersSelectTest (2);
+
+ Thread.CurrentThread.CurrentCulture = new CultureInfo
("ja-JP", false);
+ CultureSensitiveNumbersInsertTest (3);
+ CultureSensitiveNumbersSelectTest (3);
+
+ Thread.CurrentThread.CurrentCulture = currentCulture;
+ }
+
+ // regression for bug #79284
+ protected void CultureSensitiveNumbersInsertTest (int id)
+ {
+ command = connection.CreateCommand (); // reusing
command from SetUp causes parameter names mismatch
+ // insert test values
+ command.CommandText =
+ "insert into culture_test
(id,value1,value2) values (:id,:value1,:value2)";
+ command.Parameters.Add (new OracleParameter ("ID",
OracleType.Int32));
+ command.Parameters.Add( new OracleParameter ("VALUE1",
OracleType.Float));
+ command.Parameters.Add( new OracleParameter ("VALUE2",
OracleType.Double));
+ command.Parameters ["ID"].Value = id;
+ command.Parameters ["VALUE1"].Value = 2346.2342f;
+ command.Parameters ["VALUE2"].Value = 4567456.23412m;
+ try {
+ command.ExecuteNonQuery ();
+ }
+ catch (OracleException e) {
+ if (e.Code == 1722)
+ Assert.Fail("Culture incompatibility
error while inserting [" + id + ']');
+ else throw;
+ }
+ }
+
+ // regression for bug #79284
+ protected void CultureSensitiveNumbersSelectTest (int id)
+ {
+ command = connection.CreateCommand (); // reusing
command from SetUp causes parameter names mismatch
+ // read test values
+ command.CommandText =
+ "select value1,value2 from
culture_test where id = " + id;
+ command.Parameters.Clear ();
+ try {
+ using (OracleDataReader reader =
command.ExecuteReader ()) {
+ if (reader.Read ()) {
+ Assert.AreEqual
(2346.2342f,reader.GetFloat(0),
+ "Float value
improperly stored [" + id + ']');
+ Assert.AreEqual
(4567456.23412m, reader.GetDecimal (1),
+ "Decimal value
improperly stored [" + id + ']');
+ }
+ else {
+ Assert.Fail ("Expected records
not found [" + id + ']');
+ }
+ }
+ }
+ catch (FormatException) {
+ Assert.Fail("Culture incompatibility error
while reading [" + id + ']');
+ }
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches