* OdbcParameterTest.cs: Fixed compilation on 1.0 profile.

[mono.git] / mcs / class / System.Data / System.Data.SqlTypes / SqlBinary.cs

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
index fd926e8774fcdd86bc92421c531329fbafd3a39e..940436bfcfab3b1d63d5237509b71a0d1ce93e70 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
@@ -10,15 +10,48 @@
 // (C) Copyright 2002 Tim Coleman
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
+using System.Xml;
+using System.Xml.Schema;
 using System.Globalization;
+using System.Xml.Serialization;
 
 namespace System.Data.SqlTypes
 {
        /// <summary>
        /// Represents a variable-length stream of binary data to be stored in or retrieved from a database.
        /// </summary>
+#if NET_2_0
+       [SerializableAttribute]
+       [XmlSchemaProvider ("GetXsdType")]
+#endif
        public struct SqlBinary : INullable, IComparable
+#if NET_2_0
+                               , IXmlSerializable
+#endif
        {
 
                #region Fields
@@ -51,7 +84,7 @@ namespace System.Data.SqlTypes
                                if (this.IsNull)
                                        throw new SqlNullValueException ("The property contains Null.");
                                else if (index >= this.Length)
-                                       throw new SqlNullValueException ("The index parameter indicates a position beyond the length of the byte array.");
+                                       throw new IndexOutOfRangeException ("The index parameter indicates a position beyond the length of the byte array.");
                                else
                                        return value [index]; 
                        }
@@ -79,17 +112,31 @@ namespace System.Data.SqlTypes
                #endregion
 
                #region Methods
+#if NET_2_0
+               public static SqlBinary Add (SqlBinary x, SqlBinary y)
+               {
+                       return (x + y);
+               }
+#endif
 
-               public int CompareTo (object value) 
+               public int CompareTo (object value)
                {
                        if (value == null)
                                return 1;
-                       else if (!(value is SqlBinary))
+                       if (!(value is SqlBinary))
                                throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlBinary"));
-                       else if (((SqlBinary)value).IsNull)
+
+                       return CompareTo ((SqlBinary) value);
+               }
+#if NET_2_0
+               public
+#endif
+               int CompareTo (SqlBinary value) 
+               {
+                       if (value.IsNull)
                                return 1;
                        else
-                               return Compare (this, (SqlBinary)value);
+                               return Compare (this, value);
                }
 
                public static SqlBinary Concat (SqlBinary x, SqlBinary y) 
@@ -101,8 +148,8 @@ namespace System.Data.SqlTypes
                {
                        if (!(value is SqlBinary))
                                return false;
-                       else if (this.IsNull && ((SqlBinary)value).IsNull)
-                               return true;
+                       else if (this.IsNull)
+                               return ((SqlBinary)value).IsNull;
                        else if (((SqlBinary)value).IsNull)
                                return false;
                        else
@@ -162,6 +209,8 @@ namespace System.Data.SqlTypes
 
                public override string ToString () 
                {
+                       if (!notNull)
+                               return "Null";
                        return "SqlBinary(" + value.Length + ")";
                }
 
@@ -169,7 +218,6 @@ namespace System.Data.SqlTypes
 
                #region Operators
 
-               [MonoTODO]
                public static SqlBinary operator + (SqlBinary x, SqlBinary y) 
                {
                        byte [] b = new byte [x.Value.Length + y.Value.Length];
@@ -302,6 +350,30 @@ namespace System.Data.SqlTypes
                        // If we are here, x and y were same size
                        return 0;
                }
-
+#if NET_2_0
+               public static XmlQualifiedName GetXsdType (XmlSchemaSet schemaSet)
+               {
+                       XmlQualifiedName qualifiedName = new XmlQualifiedName ("base64Binary", "http://www.w3.org/2001/XMLSchema");
+                       return qualifiedName;
+               }
+               
+               [MonoTODO]
+               XmlSchema IXmlSerializable.GetSchema ()
+               {
+                       throw new NotImplementedException ();
+               }
+               
+               [MonoTODO]
+               void IXmlSerializable.ReadXml (XmlReader reader)
+               {
+                       throw new NotImplementedException ();
+               }
+               
+               [MonoTODO]
+               void IXmlSerializable.WriteXml (XmlWriter writer) 
+               {
+                       throw new NotImplementedException ();
+               }
+#endif
        }
 }