Merge pull request #3047 from dalehhirt/dalehirt-MoveFiles

feat:  Enable configuration item to allow data/log files to be moved …

Author: BrentOzar

sp_AllNightLog.sql

@@ -124,6 +124,7 @@ DECLARE @servercertificate NVARCHAR(MAX); --Config table: server certificate tha
 DECLARE @restore_path_base NVARCHAR(MAX); --Used to hold the base backup path in our configuration table
 DECLARE @restore_path_full NVARCHAR(MAX); --Used to hold the full backup path in our configuration table
 DECLARE @restore_path_log NVARCHAR(MAX); --Used to hold the log backup path in our configuration table
+DECLARE @restore_move_files INT; -- used to hold the move files bit in our configuration table
 DECLARE @db_sql NVARCHAR(MAX) = N''; --Used to hold the dynamic SQL to create msdbCentral
 DECLARE @tbl_sql NVARCHAR(MAX) = N''; --Used to hold the dynamic SQL that creates tables in msdbCentral
 DECLARE @database_name NVARCHAR(256) = N'msdbCentral'; --Used to hold the name of the database we create to centralize data
@@ -243,7 +244,17 @@ IF (@PollDiskForNewDatabases = 1 OR @Restore = 1) AND OBJECT_ID('msdb.dbo.restor
                     END;
 
             END /* IF CHARINDEX('**', @restore_path_base) <> 0 */
-                    
+		
+		SELECT @restore_move_files = CONVERT(BIT, configuration_setting)
+		FROM msdb.dbo.restore_configuration c
+		WHERE configuration_name = N'move files';
+		
+		IF @restore_move_files is NULL
+		BEGIN
+			-- Set to default value of 1
+			SET @restore_move_files = 1
+		END
+
     END /* IF @PollDiskForNewDatabases = 1 OR @Restore = 1 */
 
 
@@ -1324,6 +1335,7 @@ IF @Restore = 1
 																				   @ContinueLogs = 1,
 																				   @RunRecovery = 0,
 																				   @OnlyLogsAfter = @only_logs_after,
+																				   @MoveFiles = @restore_move_files,
 																				   @Debug = @Debug
 	
 											END
@@ -1340,6 +1352,7 @@ IF @Restore = 1
 																				   @BackupPathLog = @restore_path_log,
 																				   @ContinueLogs = 0,
 																				   @RunRecovery = 0,
+																				   @MoveFiles = @restore_move_files,
 																				   @Debug = @Debug
 	
 											END

sp_AllNightLog_Setup.sql

@@ -26,6 +26,7 @@ ALTER PROCEDURE dbo.sp_AllNightLog_Setup
 				@Debug BIT = 0,
 				@FirstFullBackup BIT = 0,
 				@FirstDiffBackup BIT = 0,
+				@MoveFiles BIT = 1,
 				@Help BIT = 0,
 				@Version     VARCHAR(30) = NULL OUTPUT,
 				@VersionDate DATETIME = NULL OUTPUT,
@@ -72,6 +73,7 @@ BEGIN
 				* Holds variables used by stored proc to make runtime decisions
 					* RTO: Seconds, how often to look for log backups to restore
 					* Restore Path: The path we feed to sp_DatabaseRestore 
+					* Move Files: Whether to move files to default data/log directories.
 			* dbo.restore_worker
 				* Holds list of databases and some information that helps our Agent jobs figure out if they need to look for files to restore
 	
@@ -102,6 +104,7 @@ BEGIN
 		  @UpdateSetup BIT, defaults to 0. When set to 1, will update existing configs for RPO/RTO and database backup/restore paths.
 		  @RPOSeconds BIGINT, defaults to 30. Value in seconds you want to use to determine if a new log backup needs to be taken.
 		  @BackupPath NVARCHAR(MAX), This is REQUIRED if @Runsetup=1. This tells Ola''s job where to put backups.
+		  @MoveFiles BIT, defaults to 1. When this is set to 1, it will move files to default data/log directories
 		  @Debug BIT, defaults to 0. Whent this is set to 1, it prints out dynamic SQL commands
 	
 	    Sample call:
@@ -626,6 +629,8 @@ BEGIN
 								INSERT msdb.dbo.restore_configuration (database_name, configuration_name, configuration_description, configuration_setting) 
 												  VALUES ('all', 'log restore path', 'The path to which Log Restores come from.', @RestorePath);	
 
+								INSERT msdb.dbo.restore_configuration (database_name, configuration_name, configuration_description, configuration_setting) 
+												  VALUES ('all', 'move files', 'Determines if we move database files to default data/log directories.', @MoveFiles);	
 
 						IF OBJECT_ID('msdb.dbo.restore_worker') IS NULL