Small Fixes

Author: GuyGlantser

SQLChecks/Auto Create Statistics is Off.sql

@@ -1,7 +1,3 @@
-
-		DECLARE
-			@AdditionalInfo					AS XML
-
 		SET @AdditionalInfo =
 			(
 				SELECT
@@ -29,7 +25,7 @@
 			AdditionalInfo
 		)
 		SELECT
-			CheckId					= '{CheckId}' ,
+			CheckId					= {CheckId} ,
 			Title					= N'{CheckTitle}' ,
 			RequiresAttention		=
 				CASE
@@ -41,4 +37,4 @@
 			CurrentStateImpact		= 3 ,	-- High
 			RecommendationEffort	= 1 ,	-- Low
 			RecommendationRisk		= 1 ,	-- Low
-			AdditionalInfo			= @AdditionalInfo;
+			AdditionalInfo			= @AdditionalInfo;

SQLChecks/Optimize for Ad-Hoc Workloads should be Enabled.sql

@@ -1,5 +1,4 @@
 		DECLARE
-			@AdditionalInfo				AS XML ,
 			@AdhocRatio					AS DECIMAL(3,2) ,
 			@OptimizeForAdhocWorkloads	AS BIT;
 

Template/Check_Footer.sql

@@ -1,4 +1,5 @@
 
+
 		BREAK;
 
 	END TRY
@@ -15,7 +16,7 @@
 			IsDeadlockRetry
 		)
 		SELECT
-			CheckId			= '{CheckId}' ,
+			CheckId			= {CheckId} ,
 			ErrorNumber		= ERROR_NUMBER () ,
 			ErrorMessage	= ERROR_MESSAGE () ,
 			ErrorSeverity	= ERROR_SEVERITY () ,

Template/Check_Header.sql

@@ -1,10 +1,12 @@
-DECLARE
-	  @CheckId			AS INT = {CheckId}
-	, @DeadlockRetry	AS BIT = 0
 
 
 -- Check #{CheckId} : {CheckTitle}
 
+DECLARE
+	@CheckId		AS INT	= {CheckId} ,
+	@DeadlockRetry	AS BIT	= 0 ,
+	@AdditionalInfo	AS XML;
+
 WHILE
 	1 = 1
 BEGIN

Template/Template_Footer.sql

@@ -1,6 +1,7 @@
 GO
 SET NOEXEC OFF;
 
+
 -- View the results
 
 SELECT

Template/Template_Header.sql

@@ -2,11 +2,15 @@ USE
 	[master];
 GO
 
-GO
+
 :setvar ThresholdParam 10
 GO
+
+
 :on error exit
 GO
+
+
 /*
 Detect SQLCMD mode and disable script execution if SQLCMD mode is not supported.
 To re-enable the script after enabling SQLCMD mode, execute the following:
@@ -21,17 +25,16 @@ BEGIN
 END
 GO
 
--- Local variables and temporary tables
 
 DECLARE
-	@CheckId						AS INT ,
-	@AdditionalInfo					AS XML ,
-	@DeadlockRetry					AS BIT ,
+	--@CheckId						AS INT ,
+	--@AdditionalInfo					AS XML ,
+	--@DeadlockRetry					AS BIT ,
 	@DatabaseName					AS SYSNAME ,
 	@Command						AS NVARCHAR(MAX) ,
 	@InstanceCompatibilityLevel		AS TINYINT ,
-	@AdhocRatio						AS DECIMAL(3,2) ,
-	@OptimizeForAdhocWorkloads		AS BIT ,
+	--@AdhocRatio						AS DECIMAL(3,2) ,
+	--@OptimizeForAdhocWorkloads		AS BIT ,
 	@OperatingSystemArchitecture	AS NVARCHAR(4) ,
 	@SQLServerArchitecture			AS NVARCHAR(4) ,
 	@CurrentMaxMemorySetting_MB		AS INT ,