2006-02-17 Chris Toshok <[email protected]>

	* DbProviderFactory.cs: remove two methods.  and mark the
	DbProviderSupportedClasses ctor as internal since it's not part of
	the public api.

	* DbTable.cs: remove this class from 2.0 build.. leave it for the
	JVM build, I guess?

	* RowUpdatingEventArgs.cs: this class isn't abstract in 2.0.

	* RowUpdatedEventArgs.cs: this class isn't abstract in 2.0.

	* SupportedJoinOperators.cs: new 2.0 enum.

	* CatalogLocation.cs: fix enum values.

	* GroupByBehavior.cs: same.

	* IdentifierCase.cs: same.

	* SchemaTableColumn.cs: class is static, not sealed.  and add
	missing elements.
	
	* SchemaTableOptionalColumn.cs: same.


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

mcs/class/System.Data/System.Data.Common/CatalogLocation.cs

@@ -35,8 +35,8 @@
 namespace System.Data.Common {
 	public enum CatalogLocation 
 	{
-		End,
-		Start
+		End = 2,
+		Start = 1
 	}
 }
 

mcs/class/System.Data/System.Data.Common/ChangeLog

@@ -1,5 +1,29 @@
 2006-02-17  Chris Toshok  <[email protected]>
 
+	* DbProviderFactory.cs: remove two methods.  and mark the
+	DbProviderSupportedClasses ctor as internal since it's not part of
+	the public api.
+
+	* DbTable.cs: remove this class from 2.0 build.. leave it for the
+	JVM build, I guess?
+
+	* RowUpdatingEventArgs.cs: this class isn't abstract in 2.0.
+
+	* RowUpdatedEventArgs.cs: this class isn't abstract in 2.0.
+
+	* SupportedJoinOperators.cs: new 2.0 enum.
+
+	* CatalogLocation.cs: fix enum values.
+
+	* GroupByBehavior.cs: same.
+
+	* IdentifierCase.cs: same.
+
+	* SchemaTableColumn.cs: class is static, not sealed.  and add
+	missing elements.
+	
+	* SchemaTableOptionalColumn.cs: same.
+	
 	* DbDataReader.cs: oops, add back in VisibleFieldCount (i missed
 	it in the corcompare output), add EditorBrowsable attributes all
 	over the place, and fix some method signatures.

mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs

@@ -46,7 +46,7 @@ namespace System.Data.Common {
 		}
 
 		[MonoTODO]
-		protected DbProviderFactory (DbProviderSupportedClasses supportedClasses)
+		internal DbProviderFactory (DbProviderSupportedClasses supportedClasses)
 		{
 		}
 
@@ -74,12 +74,6 @@ namespace System.Data.Common {
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
-		protected virtual DbCommandSet CreateCommandSet ()
-		{
-			throw new NotImplementedException ();
-		}
-
 		[MonoTODO]
 		public virtual DbConnection CreateConnection ()
 		{
@@ -98,12 +92,6 @@ namespace System.Data.Common {
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
-		public virtual DbTable CreateDbTable ()
-		{
-			throw new NotImplementedException ();
-		}
-
 		[MonoTODO]
 		public virtual DbParameter CreateParameter ()
 		{

mcs/class/System.Data/System.Data.Common/DbTable.cs

@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
+#if TARGET_JVM
 
 using System.ComponentModel;
 

mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs

@@ -35,11 +35,11 @@
 namespace System.Data.Common {
 	public enum GroupByBehavior 
 	{
-		ExactMatch,
-		MustContainAll,
-		NotSupported,
-		Unknown,
-		Unrelated
+		ExactMatch = 4,
+		MustContainAll = 3,
+		NotSupported = 1,
+		Unknown = 0,
+		Unrelated = 2
 	}
 }
 

mcs/class/System.Data/System.Data.Common/IdentifierCase.cs

@@ -35,9 +35,9 @@
 namespace System.Data.Common {
 	public enum IdentifierCase 
 	{
-		Insensitive,
-		Sensitive,
-		Unknown
+		Insensitive = 1,
+		Sensitive = 2,
+		Unknown = 0
 	}
 }
 

mcs/class/System.Data/System.Data.Common/RowUpdatedEventArgs.cs

@@ -35,7 +35,11 @@
 using System.Data;
 
 namespace System.Data.Common {
-	public abstract class RowUpdatedEventArgs : EventArgs
+	public
+#if !NET_2_0
+	abstract
+#endif
+	class RowUpdatedEventArgs : EventArgs
 	{
 		#region Fields
 
@@ -52,7 +56,12 @@ namespace System.Data.Common {
 		#region Constructors
 
 		[MonoTODO]
-		protected RowUpdatedEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+#if NET_2_0
+		public
+#else
+		protected
+#endif
+		RowUpdatedEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
 		{
 			this.dataRow = dataRow;
 			this.command = command;

mcs/class/System.Data/System.Data.Common/RowUpdatingEventArgs.cs

@@ -33,7 +33,11 @@
 //
 
 namespace System.Data.Common {
-	public abstract class RowUpdatingEventArgs : EventArgs
+	public
+#if !NET_2_0
+	abstract
+#endif
+	class RowUpdatingEventArgs : EventArgs
 	{
 		#region Fields
 
@@ -49,7 +53,12 @@ namespace System.Data.Common {
 
 		#region Constructors
 
-		protected RowUpdatingEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+#if NET_2_0
+		public
+#else
+		protected
+#endif
+		RowUpdatingEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
 		{
 			this.dataRow = dataRow;
 			this.command = command;

mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs

@@ -33,7 +33,7 @@
 #if NET_2_0
 
 namespace System.Data.Common {
-	public sealed class SchemaTableColumn 
+	public static class SchemaTableColumn 
 	{
 		#region Fields
 			public static readonly string AllowDBNull = "AllowDBNull";
@@ -49,6 +49,7 @@ namespace System.Data.Common {
 			public static readonly string IsKey = "IsKey";
 			public static readonly string IsLong = "IsLong";
 			public static readonly string IsUnique = "IsUnique";
+			public static readonly string NonVersionedProviderType = "NonVersionedProviderType";
 			public static readonly string NumericPrecision = "NumericPrecision";
 			public static readonly string NumericScale = "NumericScale";
 			public static readonly string ProviderType = "ProviderType";

mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs

@@ -33,17 +33,25 @@
 #if NET_2_0
 
 namespace System.Data.Common {
-	public sealed class SchemaTableOptionalColumn 
+	public static class SchemaTableOptionalColumn 
 	{
 		#region Fields
+			public static readonly string AutoIncrementSeed = "AutoIncrementSeed";
+			public static readonly string AutoIncrementStep = "AutoIncrementStep";
 			public static readonly string BaseCatalogName = "BaseCatalogName";
+			public static readonly string BaseColumnNamespace = "BaseColumnNamespace";
 			public static readonly string BaseServerName = "BaseServerName";
+			public static readonly string BaseTableNamespace = "BaseTableNamespace";
+			public static readonly string ColumnMapping = "ColumnMapping";
+			public static readonly string DefaultValue = "DefaultValue";
+			public static readonly string Expression = "Expression";
 			public static readonly string IsAutoIncrement = "IsAutoIncrement";
 			public static readonly string IsHidden = "IsHidden";
 			public static readonly string IsReadOnly = "IsReadOnly";
 			public static readonly string IsRowVersion = "IsRowVersion";
 			public static readonly string ProviderSpecificDataType = "ProviderSpecificDataType";
 
+
 		#endregion // Fields
 	}
 }

mcs/class/System.Data/System.Data.Common/SupportedJoinOperators.cs

@@ -0,0 +1,46 @@
+//
+// System.Data.Common.SupportedJoinOperators.cs
+//
+// Author:
+//   Chris Toshok ([email protected])
+//
+
+//
+// Copyright (C) 2006 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.
+//
+
+#if NET_2_0
+
+namespace System.Data.Common {
+
+	[Flags]
+	public enum SupportedJoinOperators
+	{
+		None = 0,
+		Inner = 1 << 0,
+		LeftOuter = 1 << 1,
+		RightOuter = 1 << 2,
+		FullOuter = 1 << 3
+	}
+}
+
+#endif