Fixed #800 Convert in SDK does not support NoLock. Here it does.

rappen · Oct 25, 2022 · 38167ec · 38167ec
1 parent 068da9f
commit 38167ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/FetchXmlBuilder/DockControls/TreeBuilderControl.cs b/FetchXmlBuilder/DockControls/TreeBuilderControl.cs
@@ -248,8 +248,7 @@ internal string GetFetchString(bool format, bool validate)
                 }
                 if (format)
                 {
-                    XDocument doc = XDocument.Parse(xml);
-                    xml = doc.ToString();
+                    xml = XDocument.Parse(xml).ToString();
                 }
             }
             return xml;
@@ -272,22 +271,24 @@ internal MetadataBase SelectedMetadata()
             return ctrl?.Metadata();
         }
 
-        internal QueryExpression GetQueryExpression(string fetch = null, bool validate = true)
+        internal QueryExpression GetQueryExpression(bool validate = true)
         {
             if (fxb.Service == null)
             {
-                throw new Exception("Must be connected to CRM to convert to QueryExpression.");
-            }
-            if (string.IsNullOrWhiteSpace(fetch))
-            {
-                fetch = GetFetchString(false, validate);
+                throw new Exception("Must be connected to Dataverse to convert to QueryExpression.");
             }
+            var fetchdoc = GetFetchDocument();
+            var fetch = fetchdoc.OuterXml;
             if (TreeNodeHelper.IsFetchAggregate(fetch))
             {
                 throw new FetchIsAggregateException("QueryExpression does not support aggregate queries.");
             }
-            var convert = (FetchXmlToQueryExpressionResponse)fxb.Execute(new FetchXmlToQueryExpressionRequest() { FetchXml = fetch });
-            return convert.Query;
+            var query = ((FetchXmlToQueryExpressionResponse)fxb.Execute(new FetchXmlToQueryExpressionRequest() { FetchXml = fetch })).Query;
+            if (fetchdoc.SelectSingleNode("fetch").AttributeBool("no-lock") == true && !query.NoLock)
+            {
+                query.NoLock = true;
+            }
+            return query;
         }
 
         internal void Init(string fetchStr, string layoutStr, string action, bool validate)

diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs
@@ -390,7 +390,7 @@ private string GetQueryExpressionCode()
             var code = string.Empty;
             try
             {
-                var QEx = dockControlBuilder.GetQueryExpression(null, false);
+                var QEx = dockControlBuilder.GetQueryExpression(false);
                 code = QueryExpressionCodeGenerator.GetCSharpQueryExpression(QEx);
             }
             catch (FetchIsAggregateException ex)