Allow using native SQL conversion when using FetchXML feature not sup…

…ported by serializer
MarkMpn · Mar 18, 2022 · a6b9845 · a6b9845
1 parent b33235a
commit a6b9845
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/MarkMpn.Sql4Cds/PluginControl.cs b/MarkMpn.Sql4Cds/PluginControl.cs
@@ -314,7 +314,6 @@ public void OnIncomingMessage(MessageBusEventArgs message)
 
             if (param.TryGetValue("FetchXml", out var xml) && xml is string xmlStr && !String.IsNullOrEmpty(xmlStr))
             {
-                var fetch = DeserializeFetchXml(xmlStr);
                 var options = new FetchXml2SqlOptions();
 
                 if ((bool)param["ConvertOnly"])
@@ -338,11 +337,13 @@ public void OnIncomingMessage(MessageBusEventArgs message)
                     }
                     catch
                     {
+                        var fetch = DeserializeFetchXml(xmlStr);
                         sql = FetchXml2Sql.Convert(con.ServiceClient, metadata, fetch, options, out _);
                     }
                 }
                 else
                 {
+                    var fetch = DeserializeFetchXml(xmlStr);
                     sql = FetchXml2Sql.Convert(con.ServiceClient, metadata, fetch, options, out _);
                 }