Report all internal errors with consistent error number

MarkMpn · May 4, 2024 · 52b6ac4 · 52b6ac4
1 parent 9be3726
commit 52b6ac4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine/Ado/Sql4CdsError.cs b/MarkMpn.Sql4Cds.Engine/Ado/Sql4CdsError.cs
@@ -106,6 +106,11 @@ internal static Sql4CdsError Create(int number, TSqlFragment fragment, params ob
             return new Sql4CdsError(template.Class, template.Number, (string)ExpressionFunctions.FormatMessage(template.Message, null, values.Select(v => Collation.USEnglish.ToSqlString(v.ToString())).Cast<INullable>().ToArray()), fragment);
         }
 
+        internal static Sql4CdsError InternalError(string message, TSqlFragment fragment = null)
+        {
+            return new Sql4CdsError(16, 10337, message, fragment);
+        }
+
         internal static Sql4CdsError NotSupported(TSqlFragment fragment, string clause)
         {
             return Create(40517, fragment, (SqlInt32)clause.Length, Collation.USEnglish.ToSqlString(clause));

diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/QueryExecutionException.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/QueryExecutionException.cs
@@ -40,14 +40,14 @@ public QueryExecutionException(string message, Exception innerException) : base(
                     else if (innerEx is FaultException<OrganizationServiceFault> innerFaultEx)
                         errors.Add(new Sql4CdsError(16, FaultCodeToSqlError(innerFaultEx.Detail), innerFaultEx.Message));
                     else
-                        errors.Add(new Sql4CdsError(16, 10337, innerEx.Message));
+                        errors.Add(Sql4CdsError.InternalError(innerEx.Message));
                 }
 
                 Errors = errors;
             }
             else
             {
-                Errors = new[] { new Sql4CdsError(16, 10337, message) };
+                Errors = new[] { Sql4CdsError.InternalError(message) };
             }
         }
 

diff --git a/MarkMpn.Sql4Cds.Engine/NotSupportedQueryFragmentException.cs b/MarkMpn.Sql4Cds.Engine/NotSupportedQueryFragmentException.cs
@@ -30,6 +30,7 @@ public NotSupportedQueryFragmentException(string message, TSqlFragment fragment)
         public NotSupportedQueryFragmentException(string message, TSqlFragment fragment, Exception innerException) : base(message, innerException)
         {
             Fragment = fragment;
+            Errors = new[] { Sql4CdsError.InternalError(message, fragment) };
         }
 
         /// <summary>