Supports generate C# code for class FetchExpression. Closed #1109

rappen · rappen · commit a623776f340a · 2025-03-03T15:47:32.000+01:00
diff --git a/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs b/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs
@@ -39,7 +39,14 @@ public static string GetCSharpQueryExpression(QueryExpression QEx, List<EntityMe
             }
 
             var coder = new CSharpCodeGenerator(QEx, entities, settings);
-            var result = coder.GetQueryCode();
+            var result = coder.GetQueryExpressionCode();
+            result = string.Join("\n", result.Split('\n').Select(l => Indent(settings.CodeGenerators.Indents) + l));
+            return result;
+        }
+
+        internal static string GetCSharpFetchExpression(string fetch, FXBSettings settings)
+        {
+            var result = $"var query = new FetchExpression(@\"{fetch.Replace("\"", "'")}\");";
             result = string.Join("\n", result.Split('\n').Select(l => Indent(settings.CodeGenerators.Indents) + l));
             return result;
         }
@@ -57,7 +64,7 @@ private CSharpCodeGenerator(QueryExpression QEx, List<EntityMetadata> entities,
 
         #region General
 
-        private string GetQueryCode()
+        private string GetQueryExpressionCode()
         {
             var qename = GetVarName(GetQueryObjectName(settings.QExStyle));
             var queryclass = QExStyle.StyleClassName(settings.QExStyle);
@@ -1424,6 +1431,12 @@ internal static QExStyle[] GetComboBoxItems()
                     ClassName = "Microsoft.CrmSdk.CoreAssemblies",
                     HelpUrl = "https://learn.microsoft.com/en-us/power-apps/developer/data-platform/org-service/samples/retrieve-multiple-queryexpression-class",
                 },
+                new QExStyle {
+                    Tag = QExStyleEnum.FetchExpression,
+                    Creator = "Microsoft",
+                    ClassName = "Microsoft.CrmSdk.CoreAssemblies",
+                    HelpUrl = "https://learn.microsoft.com/power-apps/developer/data-platform/org-service/entity-operations-query-data",
+                },
                 new QExStyle
                 {
                     Tag = QExStyleEnum.QueryByAttribute,
diff --git a/FetchXmlBuilder/DockControls/XmlContentControl.cs b/FetchXmlBuilder/DockControls/XmlContentControl.cs
@@ -7,7 +7,6 @@
 using Rappen.XTB.FetchXmlBuilder.Extensions;
 using Rappen.XTB.FetchXmlBuilder.Forms;
 using Rappen.XTB.FetchXmlBuilder.Settings;
-using Rappen.XTB.Helpers;
 using Rappen.XTB.XmlEditorUtils;
 using System;
 using System.Collections.Generic;
@@ -1012,6 +1011,7 @@ Do you like that idea?
                             "https://github.com/rappen/FetchXMLBuilder/issues/859");
                         break;
 
+                    case QExStyleEnum.FetchExpression:
                     case QExStyleEnum.FetchXML:
                         rbQExObjectinitializer.Enabled = false;
                         cmbQExFlavor.Enabled = false;
@@ -1022,8 +1022,6 @@ Do you like that idea?
                         {
                             cmbQExFlavor.SelectedIndex = 0;
                         }
-                        numQExIndent.Value = 0;
-                        numQExIndent.Enabled = false;
                         break;
                 }
                 UpdateXML(initializating ? waitmessage : fxb.GetCSharpCode());
diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs
@@ -337,10 +337,19 @@ internal string GetCSharpCode()
                     var fetch = dockControlBuilder.GetFetchString(true, false);
                     return CSharpCodeGeneratorFetchXML.GetCSharpFetchXMLCode(fetch, settings.CodeGenerators);
 
+                case QExStyleEnum.FetchExpression:
+                    try
+                    {
+                        return CSharpCodeGenerator.GetCSharpFetchExpression(dockControlBuilder.GetFetchString(true, false), settings);
+                    }
+                    catch (Exception ex)
+                    {
+                        return $"/*\nFailed to generate C# FetchExpression code.\n\n{ex.Message}\n*/";
+                    }
                 default:
                     try
                     {
-                        var QEx = dockControlBuilder.GetQueryExpression(false);
+                        var QEx = dockControlBuilder.GetQueryExpression();
                         return CSharpCodeGenerator.GetCSharpQueryExpression(QEx, entities, settings);
                     }
                     catch (FetchIsAggregateException ex)
diff --git a/FetchXmlBuilder/Settings/FXBSettings.cs b/FetchXmlBuilder/Settings/FXBSettings.cs
@@ -312,6 +312,7 @@ public class CodeGenerators
     public enum QExStyleEnum
     {
         QueryExpression,
+        FetchExpression,
         QueryByAttribute,
         OrganizationServiceContext,
         QueryExpressionFactory,

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ public class CodeGenerators`
`312`	`312`	`public enum QExStyleEnum`
`313`	`313`	`{`
`314`	`314`	`QueryExpression,`
	`315`	`+ FetchExpression,`
`315`	`316`	`QueryByAttribute,`
`316`	`317`	`OrganizationServiceContext,`
`317`	`318`	`QueryExpressionFactory,`