Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b

mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs

@@ -223,6 +223,41 @@ sqliteDataAdapter.Update (dataSet, "Primus");
                         dbConnection.Close();
                         dbConnection = null;
 		}
+
+		[Test]
+		[Category ("NotWorking")] // Requires newer sqlite than is on wrench
+		public void UpdateResetRowErrorCorrectly ()
+		{
+			const string connectionString = "URI = file::memory:; Version = 3";
+			using (var dbConnection = new SqliteConnection (connectionString)) {
+				dbConnection.Open ();
+
+				using (var cmd = dbConnection.CreateCommand ()) {
+					cmd.CommandText = "CREATE TABLE data (id PRIMARY KEY, name TEXT)";
+					cmd.ExecuteNonQuery ();
+				}
+
+
+				var ts = dbConnection.BeginTransaction ();
+				var da = new SqliteDataAdapter ("SELECT * FROM data", dbConnection);
+				var builder = new SqliteCommandBuilder (da);
+				da.UpdateCommand = builder.GetUpdateCommand ();
+				da.UpdateCommand.Transaction = ts;
+
+				var ds1 = new DataSet ();
+				da.Fill (ds1, "data");
+
+				var table = ds1.Tables [0];
+				var row = table.NewRow ();
+				row ["id"] = 10;
+				row ["name"] = "Bart";
+				table.Rows.Add (row);
+
+				var ds2 = ds1.GetChanges ();
+				da.Update (ds2, "data");
+				Assert.IsFalse (ds2.HasErrors);
+			}
+		}
 #endif
 
 #endif