In class/System.Data:

	* System.Data.dll.sources: Add new OleDbMetaDataCollectionNames.cs
	* System.Data_test.dll.sources: Add the new OdbcMetaDataColumnNamesTest,
	OleDbMetaDataCollectionNamesTest and SqlClientMetaDataCollectionNamesTest.

In class/System.Data/System.Data.Odbc:

	* OdbcMetaDataCollectionNames.cs: Set the field values.

In class/System.Data/System.Data.OleDb:

	* OleDbMetaDataCollectionNames.cs: New.

In class/System.Data/System.Data.SqlClient:

	* SqlClientMetaDataCollectionNames.cs: Set the field values.

In class/System.Data/Test/System.Data.Odbc:

	* OdbcMetaDataCollectionNamesTest.cs: New.

In class/System.Data/Test/System.Data.OleDb:

	* OleDbMetaDataCollectionNamesTest.cs: New.

In class/System.Data/Test/System.Data.SqlClient:

	* SqlClientMetaDataCollectionNamesTest.cs: New.

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

mcs/class/System.Data/ChangeLog

@@ -1,3 +1,9 @@
+2008-03-03  Ankit Jain  <[email protected]>
+
+	* System.Data.dll.sources: Add new OleDbMetaDataCollectionNames.cs
+	* System.Data_test.dll.sources: Add the new OdbcMetaDataColumnNamesTest,
+	OleDbMetaDataCollectionNamesTest and SqlClientMetaDataCollectionNamesTest.
+
 2007-11-14  Atsushi Enomoto  <[email protected]>
 
 	* System.Data_test.dll.sources: added MonkeyDataSet.cs, test helper.

mcs/class/System.Data/System.Data.Odbc/ChangeLog

@@ -1,3 +1,7 @@
+2008-03-03  Ankit Jain  <[email protected]>
+
+	* OdbcMetaDataCollectionNames.cs: Set the field values.
+
 2008-02-26  Veerapuram Varadhan  <[email protected]>
 
 	** Fixes BNC#364432.

mcs/class/System.Data/System.Data.Odbc/OdbcMetaDataCollectionNames.cs

@@ -35,13 +35,13 @@ namespace System.Data.Odbc
 	/// Collection names
 	/// </summary>
 	public static class OdbcMetaDataCollectionNames {
-		public static readonly string Columns;
-		public static readonly string Indexes;
-		public static readonly string ProcedureColumns;
-		public static readonly string ProcedureParameters;
-		public static readonly string Procedures;
-		public static readonly string Tables;
-		public static readonly string Views;
+		public static readonly string Columns = "Columns";
+		public static readonly string Indexes = "Indexes";
+		public static readonly string ProcedureColumns = "ProcedureColumns";
+		public static readonly string ProcedureParameters = "ProcedureParameters";
+		public static readonly string Procedures = "Procedures";
+		public static readonly string Tables = "Tables";
+		public static readonly string Views = "Views";
 	}
 }
 

mcs/class/System.Data/System.Data.OleDb/ChangeLog

@@ -1,3 +1,7 @@
+2008-03-03  Ankit Jain  <[email protected]>
+
+	* OleDbMetaDataCollectionNames.cs: New.
+
 2007-10-21  Gert Driesen  <[email protected]>
 
 	* OleDbCommand.cs: Use ExceptionHelper.CheckEnumValue for enum checks.

mcs/class/System.Data/System.Data.OleDb/OleDbMetaDataCollectionNames.cs

@@ -0,0 +1,50 @@
+//
+// System.Data.OleDb.OleDbMetaDataCollectionNames.cs
+//
+// Author:
+//   Ankit Jain <[email protected]>
+//
+//
+// Copyright (C) 2008 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.OleDb
+{
+	/// <summary>
+	/// Collection names
+	/// </summary>
+	public static class OleDbMetaDataCollectionNames {
+		public static readonly string Catalogs = "Catalogs";
+		public static readonly string Collations = "Collations";
+		public static readonly string Columns = "Columns";
+		public static readonly string Indexes = "Indexes";
+		public static readonly string ProcedureColumns = "ProcedureColumns";
+		public static readonly string ProcedureParameters = "ProcedureParameters";
+		public static readonly string Procedures = "Procedures";
+		public static readonly string Tables = "Tables";
+		public static readonly string Views = "Views";
+	}
+}
+
+#endif

mcs/class/System.Data/System.Data.SqlClient/ChangeLog

@@ -1,3 +1,7 @@
+2008-03-03  Ankit Jain  <[email protected]>
+
+	* SqlClientMetaDataCollectionNames.cs: Set the field values.
+
 2007-10-21  Gert Driesen  <[email protected]>
 
 	* SqlCommand.cs: Use ExceptionHelper.CheckEnumValue for enum checks.

mcs/class/System.Data/System.Data.SqlClient/SqlClientMetaDataCollectionNames.cs

@@ -37,19 +37,19 @@ namespace System.Data.SqlClient
 	/// </summary>
 	public static class SqlClientMetaDataCollectionNames {
 
-	public static readonly string Columns;
-	public static readonly string Databases;
-	public static readonly string ForeignKeys;
-	public static readonly string IndexColumns;
-	public static readonly string Indexes;
-	public static readonly string Parameters;
-	public static readonly string ProcedureColumns;
-	public static readonly string Procedures;
-	public static readonly string Tables;
-	public static readonly string UserDefinedTypes;
-	public static readonly string Users;
-	public static readonly string ViewColumns;
-	public static readonly string Views;
+		public static readonly string Columns = "Columns";
+		public static readonly string Databases = "Databases";
+		public static readonly string ForeignKeys = "ForeignKeys";
+		public static readonly string IndexColumns = "IndexColumns";
+		public static readonly string Indexes = "Indexes";
+		public static readonly string Parameters = "Parameters";
+		public static readonly string ProcedureColumns = "ProcedureColumns";
+		public static readonly string Procedures = "Procedures";
+		public static readonly string Tables = "Tables";
+		public static readonly string UserDefinedTypes = "UserDefinedTypes";
+		public static readonly string Users = "Users";
+		public static readonly string ViewColumns = "ViewColumns";
+		public static readonly string Views = "Views";
 
 	}
 }

mcs/class/System.Data/System.Data.dll.sources

@@ -188,6 +188,7 @@ System.Data.OleDb/OleDbException.cs
 System.Data.OleDb/OleDbInfoMessageEventArgs.cs
 System.Data.OleDb/OleDbInfoMessageEventHandler.cs
 System.Data.OleDb/OleDbLiteral.cs
+System.Data.OleDb/OleDbMetaDataCollectionNames.cs
 System.Data.OleDb/OleDbParameter.cs
 System.Data.OleDb/OleDbParameterCollection.cs
 System.Data.OleDb/OleDbPermission.cs

mcs/class/System.Data/System.Data_test.dll.sources

@@ -93,6 +93,7 @@ System.Data.Common/DbTransactionTest.cs
 System.Data.Odbc/OdbcCommandTest.cs
 System.Data.Odbc/OdbcConnectionTest.cs
 System.Data.Odbc/OdbcDataAdapterTest.cs
+System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs
 System.Data.Odbc/OdbcParameterCollectionTest.cs
 System.Data.Odbc/OdbcParameterTest.cs
 System.Data.Odbc/OdbcPermissionAttributeTest.cs
@@ -100,12 +101,14 @@ System.Data.Odbc/OdbcPermissionTest.cs
 System.Data.OleDb/OleDbCommandTest.cs
 System.Data.OleDb/OleDbConnectionTest.cs
 System.Data.OleDb/OleDbDataAdapterTest.cs
+System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs
 System.Data.OleDb/OleDbParameterCollectionTest.cs
 System.Data.OleDb/OleDbPermissionAttributeTest.cs
 System.Data.OleDb/OleDbPermissionTest.cs
 System.Data.SqlClient/SqlCommandTest.cs
 System.Data.SqlClient/SqlConnectionTest.cs
 System.Data.SqlClient/SqlConnectionStringBuilderTest.cs
+System.Data.SqlClient/SqlClientMetaDataCollectionNamesTest.cs
 System.Data.SqlClient/SqlClientPermissionAttributeTest.cs
 System.Data.SqlClient/SqlClientPermissionTest.cs
 System.Data.SqlClient/SqlDataAdapterTest.cs

mcs/class/System.Data/Test/System.Data.Odbc/ChangeLog

@@ -1,3 +1,7 @@
+2008-03-03  Ankit Jain  <[email protected]>
+
+	* OdbcMetaDataCollectionNamesTest.cs: New.
+
 2007-10-21  Gert Driesen  <[email protected]>
 
 	* OdbcDataAdapterTest.cs: Added tests for ctors, DeleteCommand,

mcs/class/System.Data/Test/System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs

@@ -0,0 +1,51 @@
+//
+// OdbcMetaDataCollectionNamesTest.cs - NUnit Test Cases for testing the
+//                          OdbcMetaDataCollectionNames class
+// Author:
+//      Ankit Jain <[email protected]>
+//
+// Copyright (C) 2008 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.Data.Odbc;
+using NUnit.Framework;
+
+#if NET_2_0
+namespace MonoTests.System.Data.Odbc
+{
+        [TestFixture]
+        public class OdbcMetaDataCollectioNamesTest
+        {
+                [Test]
+                public void ValuesTest ()
+                {
+                        Assert.AreEqual (OdbcMetaDataCollectionNames.Columns, "Columns");
+                        Assert.AreEqual (OdbcMetaDataCollectionNames.Indexes, "Indexes");
+                        Assert.AreEqual (OdbcMetaDataCollectionNames.ProcedureColumns, "ProcedureColumns");
+                        Assert.AreEqual (OdbcMetaDataCollectionNames.ProcedureParameters, "ProcedureParameters");
+                        Assert.AreEqual (OdbcMetaDataCollectionNames.Procedures, "Procedures");
+                        Assert.AreEqual (OdbcMetaDataCollectionNames.Tables, "Tables");
+                        Assert.AreEqual (OdbcMetaDataCollectionNames.Views, "Views");
+                }
+        }
+}
+#endif

mcs/class/System.Data/Test/System.Data.OleDb/ChangeLog

@@ -1,3 +1,7 @@
+2008-03-03  Ankit Jain  <[email protected]>
+
+	* OleDbMetaDataCollectionNamesTest.cs: New.
+
 2007-10-21  Gert Driesen  <[email protected]>
 
 	* OleDbDataAdapterTest.cs: Added tests for ctors, DeleteCommand,

mcs/class/System.Data/Test/System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs

@@ -0,0 +1,53 @@
+//
+// OleDbMetaDataCollectionNamesTest.cs - NUnit Test Cases for testing the
+//                          OleDbMetaDataCollectionNames class
+// Author:
+//      Ankit Jain <[email protected]>
+//
+// Copyright (C) 2008 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.Data.OleDb;
+using NUnit.Framework;
+
+#if NET_2_0
+namespace MonoTests.System.Data.OleDb
+{
+        [TestFixture]
+        public class OleDbMetaDataCollectionNamesTest
+        {
+                [Test]
+                public void ValuesTest ()
+                {
+                        Assert.AreEqual (OleDbMetaDataCollectionNames.Catalogs, "Catalogs");
+                        Assert.AreEqual (OleDbMetaDataCollectionNames.Collations, "Collations");
+                        Assert.AreEqual (OleDbMetaDataCollectionNames.Columns, "Columns");
+                        Assert.AreEqual (OleDbMetaDataCollectionNames.Indexes, "Indexes");
+                        Assert.AreEqual (OleDbMetaDataCollectionNames.ProcedureColumns, "ProcedureColumns");
+                        Assert.AreEqual (OleDbMetaDataCollectionNames.ProcedureParameters, "ProcedureParameters");
+                        Assert.AreEqual (OleDbMetaDataCollectionNames.Procedures, "Procedures");
+                        Assert.AreEqual (OleDbMetaDataCollectionNames.Tables, "Tables");
+                        Assert.AreEqual (OleDbMetaDataCollectionNames.Views, "Views");
+                }
+        }
+}
+#endif

mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog

@@ -1,3 +1,7 @@
+2008-03-03  Ankit Jain  <[email protected]>
+
+	* SqlClientMetaDataCollectionNamesTest.cs: New.
+
 2007-10-21  Gert Driesen  <[email protected]>
 
 	* SqlCommandTest.cs: Added tests for ctors and CommantText.

mcs/class/System.Data/Test/System.Data.SqlClient/SqlClientMetaDataCollectionNamesTest.cs

@@ -0,0 +1,57 @@
+//
+// SqlClientMetaDataCollectionNamesTest.cs - NUnit Test Cases for testing the
+//                          SqlClientMetaDataCollectionNames class
+// Author:
+//      Ankit Jain <[email protected]>
+//
+// Copyright (C) 2008 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.Data.SqlClient;
+using NUnit.Framework;
+
+#if NET_2_0
+namespace MonoTests.System.Data.SqlClient
+{
+        [TestFixture]
+        public class SqlClientMetaDataCollectionNamesTest
+        {
+                [Test]
+                public void ValuesTest ()
+                {
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.Columns, "Columns");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.Databases, "Databases");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.ForeignKeys, "ForeignKeys");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.IndexColumns, "IndexColumns");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.Indexes, "Indexes");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.Parameters, "Parameters");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.ProcedureColumns, "ProcedureColumns");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.Procedures, "Procedures");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.Tables, "Tables");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.UserDefinedTypes, "UserDefinedTypes");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.Users, "Users");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.ViewColumns, "ViewColumns");
+                        Assert.AreEqual (SqlClientMetaDataCollectionNames.Views, "Views");
+                }
+        }
+}
+#endif