Fixes issue ThatRendle#206

ThatRendle · ThatRendle · commit 9fa4d06709d4 · 2012-07-13T13:06:36.000+01:00
diff --git a/Simple.Data.SqlTest/QueryTest.cs b/Simple.Data.SqlTest/QueryTest.cs
@@ -82,6 +82,14 @@ public void ColumnAliasShouldChangeDynamicPropertyName()
             Assert.AreEqual("Bob", actual.Alias);
         }
 
+        [Test]
+        public void MissingColumnShouldHaveColumnNotFoundMessage()
+        {
+            var db = DatabaseHelper.Open();
+            var actual = db.Users.QueryById(1).Select(db.Users.Name).First();
+            Assert.Throws<UnresolvableObjectException>(() => Console.WriteLine(actual.Bobbins), "Column not found.");
+        }
+
         [Test]
         public void ShouldSelectFromOneToTen()
         {
diff --git a/Simple.Data/SimpleRecord.cs b/Simple.Data/SimpleRecord.cs
@@ -64,11 +64,18 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
 
             if (_database != null)
             {
-                var relatedAdapter = _database.GetAdapter() as IAdapterWithRelation;
-                if (relatedAdapter != null && relatedAdapter.IsValidRelation(_tableName, binder.Name))
+                try
                 {
-                    result = GetRelatedData(binder, relatedAdapter);
-                    return true;
+                    var relatedAdapter = _database.GetAdapter() as IAdapterWithRelation;
+                    if (relatedAdapter != null && relatedAdapter.IsValidRelation(_tableName, binder.Name))
+                    {
+                        result = GetRelatedData(binder, relatedAdapter);
+                        return true;
+                    }
+                }
+                catch (UnresolvableObjectException)
+                {
+                    throw new UnresolvableObjectException("Column not found.");
                 }
             }
             return base.TryGetMember(binder, out result);

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,14 @@ public void ColumnAliasShouldChangeDynamicPropertyName()`
`82`	`82`	`Assert.AreEqual("Bob", actual.Alias);`
`83`	`83`	`}`
`84`	`84`
	`85`	`+ [Test]`
	`86`	`+ public void MissingColumnShouldHaveColumnNotFoundMessage()`
	`87`	`+ {`
	`88`	`+ var db = DatabaseHelper.Open();`
	`89`	`+ var actual = db.Users.QueryById(1).Select(db.Users.Name).First();`
	`90`	`+ Assert.Throws<UnresolvableObjectException>(() => Console.WriteLine(actual.Bobbins), "Column not found.");`
	`91`	`+ }`
	`92`	`+`
`85`	`93`	`[Test]`
`86`	`94`	`public void ShouldSelectFromOneToTen()`
`87`	`95`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,18 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)`
`64`	`64`
`65`	`65`	`if (_database != null)`
`66`	`66`	`{`
`67`		`- var relatedAdapter = _database.GetAdapter() as IAdapterWithRelation;`
`68`		`- if (relatedAdapter != null && relatedAdapter.IsValidRelation(_tableName, binder.Name))`
	`67`	`+ try`
`69`	`68`	`{`
`70`		`- result = GetRelatedData(binder, relatedAdapter);`
`71`		`- return true;`
	`69`	`+ var relatedAdapter = _database.GetAdapter() as IAdapterWithRelation;`
	`70`	`+ if (relatedAdapter != null && relatedAdapter.IsValidRelation(_tableName, binder.Name))`
	`71`	`+ {`
	`72`	`+ result = GetRelatedData(binder, relatedAdapter);`
	`73`	`+ return true;`
	`74`	`+ }`
	`75`	`+ }`
	`76`	`+ catch (UnresolvableObjectException)`
	`77`	`+ {`
	`78`	`+ throw new UnresolvableObjectException("Column not found.");`
`72`	`79`	`}`
`73`	`80`	`}`
`74`	`81`	`return base.TryGetMember(binder, out result);`