make sp_sizeoptimiser Azure SQL compatible

Author: lowlydba

sp_sizeoptimiser.sql

@@ -95,6 +95,7 @@ BEGIN
 		DECLARE @HasTempStat BIT = 0
 			,@HasPersistedSamplePercent BIT	= 0
 			,@CheckNumber TINYINT = 0
+            ,@EngineEdition TINYINT
 			,@LastUpdated NVARCHAR(20) = '2020-08-04'
 			,@CheckSQL NVARCHAR(MAX) = N''
 			,@Msg NVARCHAR(MAX)	= N''
@@ -176,7 +177,7 @@ BEGIN
 			END
 
 		/* Find edition */
-		IF (@IsExpress IS NULL AND CAST(SERVERPROPERTY('EDITION') AS VARCHAR(50)) LIKE 'Express%')
+		IF (@IsExpress IS NULL AND CAST(SERVERPROPERTY('Edition') AS VARCHAR(50)) LIKE 'Express%')
 			BEGIN
 				SET @IsExpress = 1;
 			END;
@@ -185,6 +186,12 @@ BEGIN
 				SET @IsExpress = 0;
 			END;
 
+        /* Find engine edition */
+		IF (@EngineEdition IS NULL)
+			BEGIN
+				SET @EngineEdition = CAST(SERVERPROPERTY('EditionEdition') AS TINYINT);
+			END;
+
 		/* Find Version */
 		IF (@SqlMajorVersion IS NULL)
         	BEGIN;
@@ -673,20 +680,23 @@ BEGIN
 				RAISERROR(@Msg, 10, 1) WITH NOWAIT;
 			END;
 		BEGIN;
-			INSERT INTO #results ([check_num], [check_type], [obj_type], [db_name], [obj_name], [col_name], [message], [ref_link])
-			SELECT @CheckNumber
-					,N'File Growth'
-					,N'DATABASE'
-					,QUOTENAME(DB_NAME([sd].[database_id]))
-					,[mf].[name]
-					,NULL
-					,N'Database file '+[mf].[name]+' has growth set to % instead of a fixed amount. This may grow quickly.'
-					,N'http://expresssql.lowlydba.com/sp_sizeoptimiser.html#database-growth-type'
-			FROM [sys].[master_files] AS [mf]
-				INNER JOIN [sys].[databases] AS [sd] ON [sd].[database_id] = [mf].[database_id]
-				INNER JOIN #Databases AS [d] ON [d].[database_name] = [sd].[name]
-			WHERE [mf].[is_percent_growth] = 1
-					AND [mf].[data_space_id] = 1; --ignore log files
+            IF (@EngineEdition <> 5) --Azure SQL
+                BEGIN
+			        INSERT INTO #results ([check_num], [check_type], [obj_type], [db_name], [obj_name], [col_name], [message], [ref_link])
+			        SELECT @CheckNumber
+					        ,N'File Growth'
+					        ,N'DATABASE'
+					        ,QUOTENAME(DB_NAME([sd].[database_id]))
+					        ,[mf].[name]
+					        ,NULL
+					        ,N'Database file '+[mf].[name]+' has growth set to % instead of a fixed amount. This may grow quickly.'
+					        ,N'http://expresssql.lowlydba.com/sp_sizeoptimiser.html#database-growth-type'
+			        FROM [sys].[master_files] AS [mf]
+				        INNER JOIN [sys].[databases] AS [sd] ON [sd].[database_id] = [mf].[database_id]
+				        INNER JOIN #Databases AS [d] ON [d].[database_name] = [sd].[name]
+			        WHERE [mf].[is_percent_growth] = 1
+					        AND [mf].[data_space_id] = 1; --ignore log files
+                END;
 		 END; -- User DB or model db growth set to % Check
 
 		/* Default fill factor (EXPRESS ONLY)*/

tests/build/sp_sizeoptimiser_tests.sql

@@ -115,14 +115,10 @@ BEGIN;
 
 --Build
 DECLARE @version TINYINT = 10;
-DECLARE @IncludeDatabases [dbo].[SizeOptimiserTableType]; 
-
-INSERT INTO @IncludeDatabases
-VALUES ('master');
 
 --Assert
 EXEC [tSQLt].[ExpectException] @ExpectedMessage = N'SQL Server versions below 2012 are not supported, sorry!', @ExpectedSeverity = 16, @ExpectedState = 1, @ExpectedErrorNumber = 50000
-EXEC [dbo].[sp_sizeoptimiser] @IncludeDatabases = @IncludeDatabases, @SqlMajorVersion = @version, @Verbose = 0;
+EXEC [dbo].[sp_sizeoptimiser] @SqlMajorVersion = @version, @Verbose = 0;
 
 END;
 GO
@@ -157,9 +153,10 @@ BEGIN;
 --Build
 DECLARE @version TINYINT = 13;
 DECLARE @IncludeDatabases [dbo].[SizeOptimiserTableType]; 
+DECLARE @DbName SYSNAME = DB_NAME(DB_ID());
 
 INSERT INTO @IncludeDatabases
-VALUES ('master');
+VALUES (@DbName);
 
 --Assert
 EXEC [tSQLt].[ExpectNoException]
@@ -219,13 +216,18 @@ CREATE PROCEDURE [sp_sizeoptimiser].[test sp succeeds in Express Mode]
 AS
 BEGIN;
 
---Build
-DECLARE @IsExpress BIT = 1;
+--Check if testing on Azure SQL
+DECLARE @EngineEdition TINYINT = CAST(ServerProperty('EngineEdition') AS TINYINT);
 
---Assert
-EXEC [tSQLt].[ExpectNoException]
-EXEC [dbo].[sp_sizeoptimiser] @IsExpress = @IsExpress, @Verbose = 0;
+IF (@EngineEdition <> 5) -- Not Azure SQL
+    BEGIN
+        --Build
+        DECLARE @IsExpress BIT = 1;
 
+        --Assert
+        EXEC [tSQLt].[ExpectNoException]
+        EXEC [dbo].[sp_sizeoptimiser] @IsExpress = @IsExpress, @Verbose = 0;
+    END;
 END;
 GO