Improved error reporting on aggregate parameter counts

MarkMpn · Jun 25, 2024 · e0dd417 · e0dd417
1 parent 6008bb4
commit e0dd417
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/MarkMpn.Sql4Cds.Engine.Tests/AdoProviderTests.cs b/MarkMpn.Sql4Cds.Engine.Tests/AdoProviderTests.cs
@@ -2105,5 +2105,22 @@ public void InSelectStarError()
                 }
             }
         }
+
+        [TestMethod]
+        public void MissingCountParameter()
+        {
+            using (var con = new Sql4CdsConnection(_localDataSources))
+            {
+                try
+                {
+                    con.Execute("SELECT count() FROM account");
+                    Assert.Fail();
+                }
+                catch (Sql4CdsException ex)
+                {
+                    Assert.AreEqual(174, ex.Number);
+                }
+            }
+        }
     }
 }
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlanBuilder.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlanBuilder.cs
@@ -3347,30 +3347,46 @@ private IDataExecutionPlanNodeInternal ConvertGroupByAggregates(IDataExecutionPl
                     Distinct = aggregate.Expression.UniqueRowFilter == UniqueRowFilter.Distinct
                 };
 
-                converted.SqlExpression = aggregate.Expression.Parameters[0].Clone();
+                if (aggregate.Expression.Parameters.Count > 0)
+                    converted.SqlExpression = aggregate.Expression.Parameters[0].Clone();
 
                 switch (aggregate.Expression.FunctionName.Value.ToUpper())
                 {
                     case "AVG":
+                        if (aggregate.Expression.Parameters.Count != 1)
+                            throw new NotSupportedQueryFragmentException(Sql4CdsError.InvalidFunctionParameterCount(aggregate.Expression.FunctionName, 1));
+
                         converted.AggregateType = AggregateType.Average;
                         break;
 
                     case "COUNT":
+                        if (aggregate.Expression.Parameters.Count != 1)
+                            throw new NotSupportedQueryFragmentException(Sql4CdsError.InvalidFunctionParameterCount(aggregate.Expression.FunctionName, 1));
+
                         if ((converted.SqlExpression is ColumnReferenceExpression countCol && countCol.ColumnType == ColumnType.Wildcard) || (converted.SqlExpression is Literal && !(converted.SqlExpression is NullLiteral)))
                             converted.AggregateType = AggregateType.CountStar;
                         else
                             converted.AggregateType = AggregateType.Count;
                         break;
 
                     case "MAX":
+                        if (aggregate.Expression.Parameters.Count != 1)
+                            throw new NotSupportedQueryFragmentException(Sql4CdsError.InvalidFunctionParameterCount(aggregate.Expression.FunctionName, 1));
+
                         converted.AggregateType = AggregateType.Max;
                         break;
 
                     case "MIN":
+                        if (aggregate.Expression.Parameters.Count != 1)
+                            throw new NotSupportedQueryFragmentException(Sql4CdsError.InvalidFunctionParameterCount(aggregate.Expression.FunctionName, 1));
+
                         converted.AggregateType = AggregateType.Min;
                         break;
 
                     case "SUM":
+                        if (aggregate.Expression.Parameters.Count != 1)
+                            throw new NotSupportedQueryFragmentException(Sql4CdsError.InvalidFunctionParameterCount(aggregate.Expression.FunctionName, 1));
+
                         if (converted.SqlExpression is IntegerLiteral sumLiteral && sumLiteral.Value == "1")
                             converted.AggregateType = AggregateType.CountStar;
                         else