Fix handling of NOEXEC option (#2380)

* Fix handling of NOEXEC option * Fix batch for NOEXEC OFF statement
microsoft · Jul 18, 2024 · bc07e65 · bc07e65
1 parent 2259db5
commit bc07e65
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs
@@ -684,9 +684,9 @@ private void ApplyExecutionSettings(
                 // corresponding "set noexec on" is not executed until "set noexec off"
                 // is encounted
                 // NOEXEC is not currently supported by SqlOnDemand servers
-                if (!settings.NoExec && connection.EngineEdition != SqlServer.Management.Common.DatabaseEngineEdition.SqlOnDemand)
+                if (settings.NoExec && connection.EngineEdition != SqlServer.Management.Common.DatabaseEngineEdition.SqlOnDemand)
                 {
-                    builderBefore.AppendFormat("{0} ", helper.SetNoExecString);
+                    builderAfter.AppendFormat("{0} ", helper.GetSetNoExecString(false));
                 }
 
                 if (settings.StatisticsIO)
@@ -715,7 +715,7 @@ private void ApplyExecutionSettings(
                 // NOEXEC is not currently supported by SqlOnDemand servers
                 if (settings.NoExec && connection.EngineEdition != SqlServer.Management.Common.DatabaseEngineEdition.SqlOnDemand)
                 {
-                    builderBefore.AppendFormat("{0} ", helper.SetNoExecString);
+                    builderBefore.AppendFormat("{0} ", helper.GetSetNoExecString(true));
                 }
             }
 

diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QuerySettingsHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QuerySettingsHelper.cs
@@ -196,30 +196,24 @@ public string SetQuotedIdentifierString
             }
         }
 
-        public string SetNoExecString
+        public string GetSetNoExecString(bool on)
         {
-            get
-            {
-                return string.Format(System.Globalization.CultureInfo.InvariantCulture, s_SetNoExec, (this.settings.NoExec ? s_On : s_Off));
-            }
+            return string.Format(System.Globalization.CultureInfo.InvariantCulture, s_SetNoExec, (on ? s_On : s_Off));
         }
 
-        public string GetSetStatisticsTimeString(bool? on)
+        public string GetSetStatisticsTimeString(bool on)
         {
-            on = on ?? this.settings.StatisticsTime;
-            return string.Format(System.Globalization.CultureInfo.InvariantCulture, s_SetStatisticsTime, (on.Value ? s_On : s_Off));
+            return string.Format(System.Globalization.CultureInfo.InvariantCulture, s_SetStatisticsTime, (on ? s_On : s_Off));
         }
 
-        public string GetSetStatisticsIOString(bool? on)
+        public string GetSetStatisticsIOString(bool on)
         {
-            on = on ?? this.settings.StatisticsIO;
-            return string.Format(System.Globalization.CultureInfo.InvariantCulture, s_SetStatisticsIO, (on.Value ? s_On : s_Off));
+            return string.Format(System.Globalization.CultureInfo.InvariantCulture, s_SetStatisticsIO, (on ? s_On : s_Off));
         }
 
-        public string GetSetParseOnlyString(bool? on)
+        public string GetSetParseOnlyString(bool on)
         {
-            on = on ?? this.settings.ParseOnly;
-            return string.Format(System.Globalization.CultureInfo.InvariantCulture, s_SetParseOnly, (on.Value ? s_On : s_Off));            
+            return string.Format(System.Globalization.CultureInfo.InvariantCulture, s_SetParseOnly, (on ? s_On : s_Off));            
         }
     }
 }