Fixes ThatRendle#291

ThatRendle · ThatRendle · commit 7203b26a6019 · 2013-05-21T14:30:33.000+01:00
diff --git a/Simple.Data.BehaviourTest/Query/QueryTest.cs b/Simple.Data.BehaviourTest/Query/QueryTest.cs
@@ -240,5 +240,11 @@ public void SpecifyOrderByDescendingWithoutReferenceThrowsException()
         {
             Assert.Throws<ArgumentException>(() => _db.Users.All().OrderByDescending(1));
         }
+
+        [Test]
+        public void CallingFirstOnTableShouldThrowInvalidOperationException()
+        {
+            Assert.Throws<InvalidOperationException>(() => _db.Users.First());
+        }
     }
 }
diff --git a/Simple.Data/ObjectReference.cs b/Simple.Data/ObjectReference.cs
@@ -137,10 +137,17 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
 
                 // Or it could be a schema reference...
                 var schema = new DynamicSchema(_name, _dataStrategy);
-                if (schema.TryInvokeMember(binder, args, out result))
+                try
+                {
+                    if (schema.TryInvokeMember(binder, args, out result))
+                    {
+                        _dataStrategy.SetMemberAsSchema(this);
+                        return true;
+                    }
+                }
+                catch (KeyNotFoundException)
                 {
-                    _dataStrategy.SetMemberAsSchema(this); 
-                    return true;
+                    throw new InvalidOperationException(string.Format("Method {0} not recognised", binder.Name));
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -240,5 +240,11 @@ public void SpecifyOrderByDescendingWithoutReferenceThrowsException()`
`240`	`240`	`{`
`241`	`241`	`Assert.Throws<ArgumentException>(() => _db.Users.All().OrderByDescending(1));`
`242`	`242`	`}`
	`243`	`+`
	`244`	`+ [Test]`
	`245`	`+ public void CallingFirstOnTableShouldThrowInvalidOperationException()`
	`246`	`+ {`
	`247`	`+ Assert.Throws<InvalidOperationException>(() => _db.Users.First());`
	`248`	`+ }`
`243`	`249`	`}`
`244`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,17 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o`
`137`	`137`
`138`	`138`	`// Or it could be a schema reference...`
`139`	`139`	`var schema = new DynamicSchema(_name, _dataStrategy);`
`140`		`- if (schema.TryInvokeMember(binder, args, out result))`
	`140`	`+ try`
	`141`	`+ {`
	`142`	`+ if (schema.TryInvokeMember(binder, args, out result))`
	`143`	`+ {`
	`144`	`+ _dataStrategy.SetMemberAsSchema(this);`
	`145`	`+ return true;`
	`146`	`+ }`
	`147`	`+ }`
	`148`	`+ catch (KeyNotFoundException)`
`141`	`149`	`{`
`142`		`- _dataStrategy.SetMemberAsSchema(this);`
`143`		`- return true;`
	`150`	`+ throw new InvalidOperationException(string.Format("Method {0} not recognised", binder.Name));`
`144`	`151`	`}`
`145`	`152`	`}`
`146`	`153`