Fix for issue ThatRendle#178

ThatRendle · ThatRendle · commit d2c6796d77c2 · 2012-05-09T22:38:43.000+01:00
diff --git a/Simple.Data.Ado/Schema/DatabaseSchema.cs b/Simple.Data.Ado/Schema/DatabaseSchema.cs
@@ -44,6 +44,18 @@ public IEnumerable<Table> Tables
             get { return _lazyTables.Value.AsEnumerable(); }
         }
 
+        public bool IsTable(string name)
+        {
+            try
+            {
+                var table = FindTable(name);
+                return table != null;
+            }
+            catch (UnresolvableObjectException)
+            {
+                return false;
+            }
+        }
         public Table FindTable(string tableName)
         {
             if (!string.IsNullOrWhiteSpace(DefaultSchema) && !(tableName.Contains(".")))
diff --git a/Simple.Data.Ado/UpdateHelper.cs b/Simple.Data.Ado/UpdateHelper.cs
@@ -32,7 +32,7 @@ public ICommandBuilder GetUpdateCommand(string tableName, IDictionary<string, ob
             if (criteria != null )
             {
                 string whereStatement = null;
-                if (criteria.GetOperandsOfType<ObjectReference>().Any(o => !o.GetOwner().GetName().Equals(tableName)))
+                if (criteria.GetOperandsOfType<ObjectReference>().Any(o => IsTableChain(tableName, o)))
                 {
                     if (table.PrimaryKey.Length == 1)
                     {
@@ -54,6 +54,12 @@ public ICommandBuilder GetUpdateCommand(string tableName, IDictionary<string, ob
             return _commandBuilder;
         }
 
+        private bool IsTableChain(string tableName, ObjectReference o)
+        {
+            var ownerName = tableName.Contains(".") ? o.GetOwner().GetAllObjectNamesDotted() : o.GetOwner().GetName();
+            return (!ownerName.Equals(tableName, StringComparison.InvariantCultureIgnoreCase)) && _schema.IsTable(ownerName);
+        }
+
         private string CreateWhereInStatement(SimpleExpression criteria, Table table)
         {
             var inClauseBuilder = new CommandBuilder(_schema);
diff --git a/Simple.Data.SqlServer/SqlSchemaProvider.cs b/Simple.Data.SqlServer/SqlSchemaProvider.cs
@@ -176,10 +176,9 @@ private DataTable GetForeignKeys()
 
         private DataTable GetPrimaryKeys(string tableName)
         {
-            return GetPrimaryKeys().AsEnumerable()
-                .Where(
-                    row => row["TABLE_NAME"].ToString().Equals(tableName, StringComparison.InvariantCultureIgnoreCase))
-                .CopyToDataTable();
+            var primaryKeys = GetPrimaryKeys();
+            var dataTable = primaryKeys.AsEnumerable().Where(row => row["TABLE_NAME"].ToString().Equals(tableName, StringComparison.InvariantCultureIgnoreCase)).CopyToDataTable();
+            return dataTable;
         }
 
         private EnumerableRowCollection<DataRow> GetForeignKeys(string tableName)
diff --git a/Simple.Data.SqlTest/UpdateTests.cs b/Simple.Data.SqlTest/UpdateTests.cs
@@ -96,6 +96,15 @@ public void TestUpdateWithJoinCriteria()
             Assert.AreEqual("Updated", customer.Name);
         }
 
+        [Test]
+        public void TestUpdateAllWithNoMatchingRows()
+        {
+            var db = DatabaseHelper.Open();
+            db.test.SchemaTable.UpdateAll(db.test.SchemaTable.Id == 1138, Description: "Updated");
+            var test = db.test.SchemaTable.FindById(1138);
+            Assert.IsNull(test);
+        }
+
         [Test]
         public void TestUpdateWithJoinCriteriaOnCompoundKeyTable()
         {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public ICommandBuilder GetUpdateCommand(string tableName, IDictionary<string, ob`
`32`	`32`	`if (criteria != null )`
`33`	`33`	`{`
`34`	`34`	`string whereStatement = null;`
`35`		`- if (criteria.GetOperandsOfType<ObjectReference>().Any(o => !o.GetOwner().GetName().Equals(tableName)))`
	`35`	`+ if (criteria.GetOperandsOfType<ObjectReference>().Any(o => IsTableChain(tableName, o)))`
`36`	`36`	`{`
`37`	`37`	`if (table.PrimaryKey.Length == 1)`
`38`	`38`	`{`
`@@ -54,6 +54,12 @@ public ICommandBuilder GetUpdateCommand(string tableName, IDictionary<string, ob`
`54`	`54`	`return _commandBuilder;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ private bool IsTableChain(string tableName, ObjectReference o)`
	`58`	`+ {`
	`59`	`+ var ownerName = tableName.Contains(".") ? o.GetOwner().GetAllObjectNamesDotted() : o.GetOwner().GetName();`
	`60`	`+ return (!ownerName.Equals(tableName, StringComparison.InvariantCultureIgnoreCase)) && _schema.IsTable(ownerName);`
	`61`	`+ }`
	`62`	`+`
`57`	`63`	`private string CreateWhereInStatement(SimpleExpression criteria, Table table)`
`58`	`64`	`{`
`59`	`65`	`var inClauseBuilder = new CommandBuilder(_schema);`
Original file line number	Diff line number	Diff line change
`@@ -176,10 +176,9 @@ private DataTable GetForeignKeys()`
`176`	`176`
`177`	`177`	`private DataTable GetPrimaryKeys(string tableName)`
`178`	`178`	`{`
`179`		`- return GetPrimaryKeys().AsEnumerable()`
`180`		`- .Where(`
`181`		`- row => row["TABLE_NAME"].ToString().Equals(tableName, StringComparison.InvariantCultureIgnoreCase))`
`182`		`- .CopyToDataTable();`
	`179`	`+ var primaryKeys = GetPrimaryKeys();`
	`180`	`+ var dataTable = primaryKeys.AsEnumerable().Where(row => row["TABLE_NAME"].ToString().Equals(tableName, StringComparison.InvariantCultureIgnoreCase)).CopyToDataTable();`
	`181`	`+ return dataTable;`
`183`	`182`	`}`
`184`	`183`
`185`	`184`	`private EnumerableRowCollection<DataRow> GetForeignKeys(string tableName)`