Include details in QueryTranslator NotSupportedExceptions

OctopusDeploy · Feb 2, 2023 · 3912902 · 3912902
1 parent c307a0f
commit 3912902
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/source/Nevermore.IntegrationTests/QueryableIntegrationFixture.cs b/source/Nevermore.IntegrationTests/QueryableIntegrationFixture.cs
@@ -1364,5 +1364,27 @@ public async Task ToListAsync()
 
             customers.Select(c => c.LastName).Should().BeEquivalentTo("Apple");
         }
+
+        [Test]
+        public async Task UnsupportedMethod_ShouldThrowNotSupportedException()
+        {
+            using var t = Store.BeginTransaction();
+
+            var runQueryWithUnsupportedMethod =
+                async () => _ = await t.Queryable<Customer>().Prepend(new()).ToListAsync();
+
+            await runQueryWithUnsupportedMethod.Should().ThrowAsync<NotSupportedException>();
+        }
+
+        [Test]
+        public async Task UnsupportedWhereExpression_ShouldThrowNotSupportedException()
+        {
+            using var t = Store.BeginTransaction();
+
+            var runQueryWithUnsupportedWhereExpression =
+                async () => _ = await t.Queryable<Customer>().Where(_ => "".IsNormalized()).ToListAsync();
+
+            await runQueryWithUnsupportedWhereExpression.Should().ThrowAsync<NotSupportedException>();
+        }
     }
 }
diff --git a/source/Nevermore/Advanced/Queryable/QueryTranslator.cs b/source/Nevermore/Advanced/Queryable/QueryTranslator.cs
@@ -183,7 +183,7 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
                     return node;
                 }
                 default:
-                    throw new NotSupportedException();
+                    throw new NotSupportedException($"Specified method is not supported: {methodInfo}");
             }
         }
 
@@ -222,7 +222,7 @@ IWhereClause CreateWhereClause(Expression expression, bool invert = false)
                 return sqlBuilder.CreateWhere(fieldReference, UnarySqlOperand.Equal, !invert);
             }
 
-            throw new NotSupportedException();
+            throw new NotSupportedException($"Where expression not supported: {expression}");
         }
 
         IWhereClause CreateMethodCallWhere(MethodCallExpression expression, bool invert = false)
@@ -262,7 +262,7 @@ IWhereClause CreateMethodCallWhere(MethodCallExpression expression, bool invert
                 }
             }
 
-            throw new NotSupportedException();
+            throw new NotSupportedException($"Where expression not supported: {expression}");
         }
 
         IWhereClause CreateStringMethodWhere(MethodCallExpression expression, bool invert = false)
@@ -285,7 +285,7 @@ IWhereClause CreateStringMethodWhere(MethodCallExpression expression, bool inver
                 return sqlBuilder.CreateWhere(fieldReference, invert ? UnarySqlOperand.NotLike : UnarySqlOperand.Like, $"%{value}");
             }
 
-            throw new NotSupportedException();
+            throw new NotSupportedException($"Where expression not supported: {expression}");
         }
 
         IWhereClause CreateBinaryWhere(BinaryExpression expression, bool invert = false)
@@ -312,7 +312,7 @@ IWhereClause CreateBinaryWhere(BinaryExpression expression, bool invert = false)
                 ExpressionType.LessThanOrEqual => invert ? UnarySqlOperand.GreaterThan : UnarySqlOperand.LessThanOrEqual,
                 ExpressionType.GreaterThan => invert ? UnarySqlOperand.LessThanOrEqual : UnarySqlOperand.GreaterThan,
                 ExpressionType.GreaterThanOrEqual => invert ? UnarySqlOperand.LessThan : UnarySqlOperand.GreaterThanOrEqual,
-                _ => throw new NotSupportedException()
+                _ => throw new NotSupportedException($"Where expression not supported: {expression}")
             };
 
             var (fieldReference, propertyType) = GetFieldReferenceAndType(expression.Left);