Added BadExpressionException

ThatRendle · ThatRendle · commit 20f3fe7efb9b · 2012-07-13T09:44:25.000+01:00
diff --git a/Simple.Data.BehaviourTest/FindTest.cs b/Simple.Data.BehaviourTest/FindTest.cs
@@ -208,6 +208,18 @@ public void TestFindAllWithLike()
             Parameter(0).Is("Foo");
         }
 
+        [Test]
+        public void FindAllWithNoParametersThrowsBadExpressionException()
+        {
+            Assert.Throws<BadExpressionException>(() => _db.Users.FindAll().ToList());
+        }
+
+        [Test]
+        public void FindAllWithStringParameterThrowsBadExpressionException()
+        {
+            Assert.Throws<BadExpressionException>(() => _db.Users.FindAll("Answer").ToList());
+        }
+
         [Test]
         public void TestFindAllWithNotLike()
         {
diff --git a/Simple.Data/BadExpressionException.cs b/Simple.Data/BadExpressionException.cs
@@ -0,0 +1,37 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace Simple.Data
+{
+    [Serializable]
+    public class BadExpressionException : Exception
+    {
+        //
+        // For guidelines regarding the creation of new exception types, see
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
+        // and
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
+        //
+
+        public BadExpressionException()
+        {
+        }
+
+        public BadExpressionException(string message) : base(message)
+        {
+        }
+
+        public BadExpressionException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected BadExpressionException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
diff --git a/Simple.Data/Commands/FindAllCommand.cs b/Simple.Data/Commands/FindAllCommand.cs
@@ -35,7 +35,7 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe
                 return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where((SimpleExpression)args[0]);
             }
 
-            return null;
+            throw new BadExpressionException("FindAll only accepts a criteria expression.");
         }
     }
 }
diff --git a/Simple.Data/Commands/FindCommand.cs b/Simple.Data/Commands/FindCommand.cs
@@ -36,7 +36,7 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe
                 return data != null ? new SimpleRecord(data, table.GetQualifiedName(), dataStrategy) : null;
             }
 
-            return null;
+            throw new BadExpressionException("Find only accepts a criteria expression.");
         }
 
         public object Execute(DataStrategy dataStrategy, SimpleQuery query, InvokeMemberBinder binder, object[] args)
diff --git a/Simple.Data/Simple.Data.csproj b/Simple.Data/Simple.Data.csproj
@@ -92,6 +92,7 @@
     <Compile Include="FunctionSignature.cs" />
     <Compile Include="InMemoryAdapter.cs" />
     <Compile Include="InMemoryAdapterIAdapterWithTransactions.cs" />
+    <Compile Include="BadExpressionException.cs" />
     <Compile Include="JoinType.cs" />
     <Compile Include="OfTypeEnumerable.cs" />
     <Compile Include="OptimizingDelegateFactory.cs" />

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe`
`35`	`35`	`return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where((SimpleExpression)args[0]);`
`36`	`36`	`}`
`37`	`37`
`38`		`- return null;`
	`38`	`+ throw new BadExpressionException("FindAll only accepts a criteria expression.");`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe`
`36`	`36`	`return data != null ? new SimpleRecord(data, table.GetQualifiedName(), dataStrategy) : null;`
`37`	`37`	`}`
`38`	`38`
`39`		`- return null;`
	`39`	`+ throw new BadExpressionException("Find only accepts a criteria expression.");`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public object Execute(DataStrategy dataStrategy, SimpleQuery query, InvokeMemberBinder binder, object[] args)`