Explorar o código

2007-05-25 Nidhi Rawal <[email protected]>
* OracleDateTime.cs: Wrote the methods CompareTo (object) and Equals (object).
* OracleClientFactory.cs: Wrote methods CreatePermission (PermissionState) and CreateDataSourceEnumerator ().
* OracleString.cs: Wrote methods GreaterThan (OracleString, OracleString) and
GreaterThanOrEqual (OracleString, OracleString).
* OracleDataAdapter.cs: Wrote the property UpdateBatchSize.

2007-05-25 Amit Biswas <[email protected]>
* OracleParameterCollection.cs: Fixed the bugs in properties IsFixedSize, IsReadOnly and IsSynchronized.
* OracleTimeSpan.cs: Implemented methods CompareTo (object) and Equals (object).
* OracleMonthSpan.cs: Implemented methods CompareTo (object) and Equals (object).


svn path=/trunk/mcs/; revision=78720

Nagappan Alagappan %!s(int64=18) %!d(string=hai) anos
pai
achega
a29d3d60ea

+ 12 - 0
mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog

@@ -1,3 +1,15 @@
+2007-05-25 Nidhi Rawal <[email protected]>
+	* OracleDateTime.cs: Wrote the methods CompareTo (object) and Equals (object).
+	* OracleClientFactory.cs: Wrote methods CreatePermission (PermissionState) and CreateDataSourceEnumerator ().
+	* OracleString.cs: Wrote methods GreaterThan (OracleString, OracleString) and 
+	GreaterThanOrEqual (OracleString, OracleString).
+	* OracleDataAdapter.cs: Wrote the property UpdateBatchSize.
+
+2007-05-25 Amit Biswas <[email protected]>
+	* OracleParameterCollection.cs: Fixed the bugs in properties IsFixedSize, IsReadOnly and IsSynchronized.
+	* OracleTimeSpan.cs: Implemented methods CompareTo (object) and Equals (object).
+	* OracleMonthSpan.cs: Implemented methods CompareTo (object) and Equals (object).
+
 2007-03-29 Leszek Ciesielski <[email protected]>
 	* OracleConnection.cs: consecutive calls to Open() do not spawn
 	multiple connections

+ 5 - 2
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleClientFactory.cs

@@ -65,13 +65,16 @@ namespace System.Data.OracleClient
 			return new OracleConnection ();
 		}
 
+		public override CodeAccessPermission CreatePermission (PermissionState state) {
+			return new OraclePermission (state);
+		}
+
 		public override DbDataAdapter CreateDataAdapter () {
 			return new OracleDataAdapter ();
 		}
 
-		[MonoTODO]
 		public override DbDataSourceEnumerator CreateDataSourceEnumerator () {
-			throw new NotImplementedException ();
+			return new OracleDataSourceEnumerator ();
 		}
 
 		public override DbParameter CreateParameter () {

+ 13 - 5
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDataAdapter.cs

@@ -40,6 +40,9 @@ namespace System.Data.OracleClient {
 		OracleCommand insertCommand;
 		OracleCommand selectCommand;
 		OracleCommand updateCommand;
+#if NET_2_0
+		int updateBatchSize;
+#endif
 
 		#endregion
 
@@ -74,32 +77,37 @@ namespace System.Data.OracleClient {
 
 		[DefaultValue (null)]
 		[Editor ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))]
-		public OracleCommand DeleteCommand {
+		public new OracleCommand DeleteCommand {
 			get { return deleteCommand; }
 			set { deleteCommand = value; }
 		}
 
 		[DefaultValue (null)]
 		[Editor ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))]
-		public OracleCommand InsertCommand {
+		public new OracleCommand InsertCommand {
 			get { return insertCommand; }
 			set { insertCommand = value; }
 		}
 
 		[DefaultValue (null)]
 		[Editor ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))]
-		public OracleCommand SelectCommand {
+		public new OracleCommand SelectCommand {
 			get { return selectCommand; }
 			set { selectCommand = value; }
 		}
 
 		[DefaultValue (null)]
 		[Editor ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))]
-		public OracleCommand UpdateCommand {
+		public new OracleCommand UpdateCommand {
 			get { return updateCommand; }
 			set { updateCommand = value; }
 		}
-
+#if NET_2_0
+		public override int UpdateBatchSize {
+			get { return updateBatchSize; }
+			set { updateBatchSize = value; }
+		}
+#endif
 		IDbCommand IDbDataAdapter.DeleteCommand {
 			get { return DeleteCommand; }
 			set {

+ 20 - 4
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleDateTime.cs

@@ -127,16 +127,32 @@ namespace System.Data.OracleClient {
 
 		#region Methods
 
-		[MonoTODO]
 		public int CompareTo (object obj)
 		{
-			throw new NotImplementedException ();
+			OracleDateTime o = (OracleDateTime) obj;
+			if (obj == null)
+				throw new NullReferenceException ("Object reference not set to an instance of an object");
+			else if (!(obj is OracleDateTime))
+				throw new ArgumentException ("Value is not a System.Data.OracleClient.OracleDateTime", obj.ToString ());
+			else if (o.IsNull && this.IsNull)
+				return 0;
+			else if (o.IsNull && !(this.IsNull))
+				return 1;
+			else
+				return value.CompareTo (o.Value);
 		}
 
-		[MonoTODO]
 		public override bool Equals (object value)
 		{
-			throw new NotImplementedException ();
+			if (value is OracleDateTime)
+			{
+				OracleDateTime d = (OracleDateTime) value;
+				if (!(this.IsNull) && !(d.IsNull))
+					return this.value == d.value;
+				else
+					throw new InvalidOperationException ("The value is null");
+			}
+			return false;
 		}
 
 		public static OracleBoolean Equals (OracleDateTime x, OracleDateTime y)

+ 16 - 4
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleMonthSpan.cs

@@ -71,16 +71,28 @@ namespace System.Data.OracleClient {
 
 		#region Methods
 
-		[MonoTODO]
 		public int CompareTo (object obj)
 		{
-			throw new NotImplementedException ();
+			OracleMonthSpan o = (OracleMonthSpan) obj;
+			if (obj == null)
+				throw new NullReferenceException ("Object reference not set to an instance of an object");
+			else if (!(obj is OracleMonthSpan))
+				throw new ArgumentException ("Value is not a System.Data.OracleClient.OracleMonthSpan", obj.ToString ());
+			else if (o.IsNull && this.IsNull)
+				return 0;
+			else if (o.IsNull && !(this.IsNull))
+				return 1;
+			else
+				return value.CompareTo (o.Value);
 		}
 
-		[MonoTODO]
 		public override bool Equals (object value)
 		{
-			throw new NotImplementedException ();
+			if (value is OracleMonthSpan) {
+				OracleMonthSpan m = (OracleMonthSpan) value;
+				return this.value == m.value;
+			}
+			return false;
 		}
 
 		public static OracleBoolean Equals (OracleMonthSpan x, OracleMonthSpan y)

+ 3 - 3
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameterCollection.cs

@@ -57,15 +57,15 @@ namespace System.Data.OracleClient {
 		}
 
 		public bool IsFixedSize {
-			get { return false; }
+			get { return list.IsFixedSize; }
 		}
 
 		public bool IsReadOnly {
-			get { return false; }
+			get { return list.IsReadOnly; }
 		}
 
 		public bool IsSynchronized {
-			get { return false; }
+			get { return list.IsSynchronized; }
 		}
 
 		public OracleParameter this [string parameterName] {

+ 6 - 4
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleString.cs

@@ -77,16 +77,18 @@ namespace System.Data.OracleClient
 				return value.CompareTo (((OracleString) obj).Value);
 		}
 
-		[MonoTODO]
 		public static OracleBoolean GreaterThan (OracleString x, OracleString y)
 		{
-			throw new NotImplementedException ();
+			if (x.IsNull || y.IsNull)
+				return OracleBoolean.Null;
+			return (x > y);
 		}
 
-		[MonoTODO]
 		public static OracleBoolean GreaterThanOrEqual (OracleString x, OracleString y)
 		{
-			throw new NotImplementedException ();
+			if (x.IsNull || y.IsNull)
+				return OracleBoolean.Null;
+			return (x  >= y);
 		}
 
 		public static OracleBoolean LessThan (OracleString x, OracleString y)

+ 20 - 4
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleTimeSpan.cs

@@ -100,16 +100,32 @@ namespace System.Data.OracleClient {
 
 		#region Methods
 
-		[MonoTODO]
 		public int CompareTo (object obj)
 		{
-			throw new NotImplementedException ();
+			OracleTimeSpan o = (OracleTimeSpan) obj;
+			if (obj == null)
+				throw new NullReferenceException ("Object reference not set to an instance of an object");
+			else if (!(obj is OracleTimeSpan))
+				throw new ArgumentException ("Value is not a System.Data.OracleClient.OracleTimeSpan", obj.ToString ());
+			else if (o.IsNull && this.IsNull)
+				return 0;
+			else if (o.IsNull && !(this.IsNull))
+				return 1;
+			else
+				return value.CompareTo (o.Value);
 		}
 
-		[MonoTODO]
 		public override bool Equals (object value)
 		{
-			throw new NotImplementedException ();
+			if (value is OracleTimeSpan)
+			{
+				OracleTimeSpan t = (OracleTimeSpan) value;
+				if (!(this.IsNull) && !(t.IsNull))
+					return this.value == t.value;
+				else
+					throw new InvalidOperationException ("The value is null");
+			}
+			return false;
 		}
 
 		public static OracleBoolean Equals (OracleTimeSpan x, OracleTimeSpan y)