Fixes ThatRendle#289

ThatRendle · ThatRendle · commit 7bf50d866ed7 · 2013-05-21T14:10:54.000+01:00
diff --git a/Simple.Data.InMemoryTest/InMemoryTests.cs b/Simple.Data.InMemoryTest/InMemoryTests.cs
@@ -750,7 +750,7 @@ public void UpsertShouldUpdateExistingRecord()
         }
 
         [Test]
-        public void UpsertWithoutDefinedKeyColumnsSHouldThrowMeaningfulException()
+        public void UpsertWithoutDefinedKeyColumnsShouldThrowMeaningfulException()
         {
             var adapter = new InMemoryAdapter();
             Database.UseMockAdapter(adapter);
diff --git a/Simple.Data/DataStrategy.cs b/Simple.Data/DataStrategy.cs
@@ -101,7 +101,7 @@ internal DynamicTable SetMemberAsTable(ObjectReference reference, DynamicTable t
 
         internal DynamicSchema SetMemberAsSchema(ObjectReference reference)
         {
-            if (reference == null) throw new ArgumentNullException("reference");
+            if (ReferenceEquals(reference, null)) throw new ArgumentNullException("reference");
             _members.TryUpdate(reference.GetName(), new DynamicSchema(reference.GetName(), this), reference);
             return (DynamicSchema) _members[reference.GetName()];
         }
diff --git a/Simple.Data/DynamicTable.cs b/Simple.Data/DynamicTable.cs
@@ -100,7 +100,9 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
                 return true;
             }
 
-            return base.TryInvokeMember(binder, args, out result);
+            if (base.TryInvokeMember(binder, args, out result)) return true;
+
+            throw new InvalidOperationException(string.Format("Method {0} not recognised", binder.Name));
         }
 
         private Func<object[],object> CreateMemberDelegate(string signature, InvokeMemberBinder binder, object[] args)
diff --git a/Simple.Data/ObjectReference.cs b/Simple.Data/ObjectReference.cs
@@ -119,10 +119,20 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
             if (_dataStrategy != null)
             {
                 var table = new DynamicTable(_name, _dataStrategy);
-                if (table.TryInvokeMember(binder, args, out result))
+                try
                 {
-                    _dataStrategy.SetMemberAsTable(this, table);
-                    return true;
+                    if (table.TryInvokeMember(binder, args, out result))
+                    {
+                        _dataStrategy.SetMemberAsTable(this, table);
+                        return true;
+                    }
+                }
+                catch (InvalidOperationException ex)
+                {
+                    if (!ex.Message.StartsWith("Method"))
+                    {
+                        throw;
+                    }
                 }
 
                 // Or it could be a schema reference...
@@ -140,9 +150,16 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
                 var command = CommandFactory.GetCommandFor(binder.Name);
                 if (command != null)
                 {
-                    var schema = dataStrategy.SetMemberAsSchema(_owner);
-                    var table = schema.GetTable(_name);
-                    table.TryInvokeMember(binder, args, out result);
+                    if (!ReferenceEquals(_owner, null))
+                    {
+                        var schema = dataStrategy.SetMemberAsSchema(_owner);
+                        var table = schema.GetTable(_name);
+                        table.TryInvokeMember(binder, args, out result);
+                    }
+                    else
+                    {
+                        throw new InvalidOperationException(string.Format("Method {0} not recognised", binder.Name));
+                    }
                     //result = command.Execute(dataStrategy, table, binder, args);
                 }
                 else
@@ -158,7 +175,7 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
                 }
                 return true;
             }
-            throw new InvalidOperationException();
+            throw new InvalidOperationException(string.Format("Method {0} not recognised", binder.Name));
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ public void UpsertShouldUpdateExistingRecord()`
`750`	`750`	`}`
`751`	`751`
`752`	`752`	`[Test]`
`753`		`- public void UpsertWithoutDefinedKeyColumnsSHouldThrowMeaningfulException()`
	`753`	`+ public void UpsertWithoutDefinedKeyColumnsShouldThrowMeaningfulException()`
`754`	`754`	`{`
`755`	`755`	`var adapter = new InMemoryAdapter();`
`756`	`756`	`Database.UseMockAdapter(adapter);`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ internal DynamicTable SetMemberAsTable(ObjectReference reference, DynamicTable t`
`101`	`101`
`102`	`102`	`internal DynamicSchema SetMemberAsSchema(ObjectReference reference)`
`103`	`103`	`{`
`104`		`- if (reference == null) throw new ArgumentNullException("reference");`
	`104`	`+ if (ReferenceEquals(reference, null)) throw new ArgumentNullException("reference");`
`105`	`105`	`_members.TryUpdate(reference.GetName(), new DynamicSchema(reference.GetName(), this), reference);`
`106`	`106`	`return (DynamicSchema) _members[reference.GetName()];`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,9 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o`
`100`	`100`	`return true;`
`101`	`101`	`}`
`102`	`102`
`103`		`- return base.TryInvokeMember(binder, args, out result);`
	`103`	`+ if (base.TryInvokeMember(binder, args, out result)) return true;`
	`104`	`+`
	`105`	`+ throw new InvalidOperationException(string.Format("Method {0} not recognised", binder.Name));`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`private Func<object[],object> CreateMemberDelegate(string signature, InvokeMemberBinder binder, object[] args)`