Fixes ThatRendle#270

ThatRendle · ThatRendle · commit 6a58fa5f147e · 2013-05-21T13:25:21.000+01:00
diff --git a/Simple.Data.BehaviourTest/Query/QueryTest.cs b/Simple.Data.BehaviourTest/Query/QueryTest.cs
@@ -228,5 +228,17 @@ public void SpecifyingJoinTableShouldCreateDirectQuery()
             GeneratedSqlIs("select [dbo].[userbio].[userid],[dbo].[userbio].[text] from [dbo].[userbio]" +
                 " join [dbo].[users] on ([dbo].[users].[id] = [dbo].[userbio].[userid]) where [dbo].[users].[id] = @p1");
         }
+
+        [Test]
+        public void SpecifyOrderByWithoutReferenceThrowsException()
+        {
+            Assert.Throws<ArgumentException>(() => _db.Users.All().OrderBy(1));
+        }
+        
+        [Test]
+        public void SpecifyOrderByDescendingWithoutReferenceThrowsException()
+        {
+            Assert.Throws<ArgumentException>(() => _db.Users.All().OrderByDescending(1));
+        }
     }
 }
diff --git a/Simple.Data/SimpleQuery.cs b/Simple.Data/SimpleQuery.cs
@@ -650,9 +650,17 @@ private SimpleQuery AddNewJoin(JoinClause newJoin)
         private SimpleQuery ParseOrderBy(string methodName)
         {
             methodName = Regex.Replace(methodName, "^order_?by_?", "", RegexOptions.IgnoreCase);
+            if (string.IsNullOrWhiteSpace(methodName))
+            {
+                throw new ArgumentException("Invalid arguments to OrderBy");
+            }
             if (methodName.EndsWith("descending", StringComparison.OrdinalIgnoreCase))
             {
                 methodName = Regex.Replace(methodName, "_?descending$", "", RegexOptions.IgnoreCase);
+                if (string.IsNullOrWhiteSpace(methodName))
+                {
+                    throw new ArgumentException("Invalid arguments to OrderByDescending");
+                }
                 return OrderByDescending(ObjectReference.FromString(_tableName + "." + methodName));
             }
             return OrderBy(ObjectReference.FromString(_tableName + "." + methodName));

Original file line number	Diff line number	Diff line change
`@@ -228,5 +228,17 @@ public void SpecifyingJoinTableShouldCreateDirectQuery()`
`228`	`228`	`GeneratedSqlIs("select [dbo].[userbio].[userid],[dbo].[userbio].[text] from [dbo].[userbio]" +`
`229`	`229`	`" join [dbo].[users] on ([dbo].[users].[id] = [dbo].[userbio].[userid]) where [dbo].[users].[id] = @p1");`
`230`	`230`	`}`
	`231`	`+`
	`232`	`+ [Test]`
	`233`	`+ public void SpecifyOrderByWithoutReferenceThrowsException()`
	`234`	`+ {`
	`235`	`+ Assert.Throws<ArgumentException>(() => _db.Users.All().OrderBy(1));`
	`236`	`+ }`
	`237`	`+`
	`238`	`+ [Test]`
	`239`	`+ public void SpecifyOrderByDescendingWithoutReferenceThrowsException()`
	`240`	`+ {`
	`241`	`+ Assert.Throws<ArgumentException>(() => _db.Users.All().OrderByDescending(1));`
	`242`	`+ }`
`231`	`243`	`}`
`232`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -650,9 +650,17 @@ private SimpleQuery AddNewJoin(JoinClause newJoin)`
`650`	`650`	`private SimpleQuery ParseOrderBy(string methodName)`
`651`	`651`	`{`
`652`	`652`	`methodName = Regex.Replace(methodName, "^order_?by_?", "", RegexOptions.IgnoreCase);`
	`653`	`+ if (string.IsNullOrWhiteSpace(methodName))`
	`654`	`+ {`
	`655`	`+ throw new ArgumentException("Invalid arguments to OrderBy");`
	`656`	`+ }`
`653`	`657`	`if (methodName.EndsWith("descending", StringComparison.OrdinalIgnoreCase))`
`654`	`658`	`{`
`655`	`659`	`methodName = Regex.Replace(methodName, "_?descending$", "", RegexOptions.IgnoreCase);`
	`660`	`+ if (string.IsNullOrWhiteSpace(methodName))`
	`661`	`+ {`
	`662`	`+ throw new ArgumentException("Invalid arguments to OrderByDescending");`
	`663`	`+ }`
`656`	`664`	`return OrderByDescending(ObjectReference.FromString(_tableName + "." + methodName));`
`657`	`665`	`}`
`658`	`666`	`return OrderBy(ObjectReference.FromString(_tableName + "." + methodName));`