* DbCommandBuilder.cs: Fixed default value for ConflicOption.

* OdbcCommandBuilder.cs: Added test for ConflictOption default value.

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

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

@@ -1,3 +1,7 @@
+2008-12-30  Gert Driesen  <[email protected]>
+
+	* DbCommandBuilder.cs: Fixed default value for ConflicOption.
+
 2008-12-30  Gert Driesen  <[email protected]>
 
 	* DbCommandBuilder.cs: Return a zero-length string when QuotePrefix or

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

@@ -45,7 +45,7 @@ namespace System.Data.Common {
 		DataTable _dbSchemaTable;
 		DbDataAdapter _dbDataAdapter = null;
 		private CatalogLocation _catalogLocation = CatalogLocation.Start;
-		private ConflictOption _conflictOption;
+		private ConflictOption _conflictOption = ConflictOption.CompareAllSearchableValues;
 
 		private string _tableName;
 		private string _catalogSeperator = ".";

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

@@ -1,3 +1,7 @@
+2008-12-30  Gert Driesen  <[email protected]>
+
+	* OdbcCommandBuilder.cs: Added test for ConflictOption default value.
+
 2008-12-29  Gert Driesen  <[email protected]>
 
 	* OdbcCommandBuilderTest.cs: Added tests for QuotePrefix and

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

@@ -310,7 +310,7 @@ namespace MonoTests.System.Data.Odbc
 		{
 			OdbcCommandBuilder cb = new OdbcCommandBuilder ();
 			Assert.AreEqual (".", cb.CatalogSeparator, "#2");
-			//Assert.AreEqual ("", cb.DecimalSeparator, "#3");
+			Assert.AreEqual (ConflictOption.CompareAllSearchableValues, cb.ConflictOption, "#3");
 			Assert.AreEqual (".", cb.SchemaSeparator, "#4");
 			Assert.AreEqual (CatalogLocation.Start, cb.CatalogLocation, "#1");
 		}