Fixed Diff Restore, Added more Features

Updated the sp names for issue #851

Added @debug variable.  Debug level 0 is the default state of the
script, which will execute the commands.  Debug level 1 will print just
the commands so you can run at your leisure and Debug level 2 will print
other stuff (level 2 is handy for adding in new variables and
troubleshooting).  This addresses issue #850

Fixed the Differential restore.  I discovered during testing that I had
failed to check the LSNs against the differential.  Fixed that portion
of the code and tested.  This is in regards to issue #814

Author: digitalohm

sp_DatabaseRestore.sql

@@ -1,40 +1,52 @@
 /*
-EXEC dbo.DatabaseRestore 
+EXEC dbo.sp_DatabaseRestore 
 	@Database = 'LogShipMe', 
 	@BackupPathFull = 'D:\Backup\SQL2016PROD1A\LogShipMe\FULL\', 
 	@BackupPathLog = 'D:\Backup\SQL2016PROD1A\LogShipMe\LOG\', 
 	@ContinueLogs = 0, 
 	@RunRecovery = 0;
 
-EXEC dbo.DatabaseRestore 
+EXEC dbo.sp_DatabaseRestore 
 	@Database = 'LogShipMe', 
 	@BackupPathFull = 'D:\Backup\SQL2016PROD1A\LogShipMe\FULL\', 
 	@BackupPathLog = 'D:\Backup\SQL2016PROD1A\LogShipMe\LOG\', 
 	@ContinueLogs = 1, 
 	@RunRecovery = 0;
 
-EXEC dbo.DatabaseRestore 
+EXEC dbo.sp_DatabaseRestore 
 	@Database = 'LogShipMe', 
 	@BackupPathFull = 'D:\Backup\SQL2016PROD1A\LogShipMe\FULL\', 
 	@BackupPathLog = 'D:\Backup\SQL2016PROD1A\LogShipMe\LOG\', 
 	@ContinueLogs = 1, 
 	@RunRecovery = 1;
 
-EXEC dbo.DatabaseRestore 
+EXEC dbo.sp_DatabaseRestore 
 	@Database = 'LogShipMe', 
 	@BackupPathFull = 'D:\Backup\SQL2016PROD1A\LogShipMe\FULL\', 
 	@BackupPathLog = 'D:\Backup\SQL2016PROD1A\LogShipMe\LOG\', 
 	@ContinueLogs = 0, 
 	@RunRecovery = 1;
 
-EXEC dbo.DatabaseRestore 
+EXEC dbo.sp_DatabaseRestore 
 	@Database = 'LogShipMe', 
 	@BackupPathFull = 'D:\Backup\SQL2016PROD1A\LogShipMe\FULL\', 
 	@BackupPathDiff = 'D:\Backup\SQL2016PROD1A\LogShipMe\DIFF\',
 	@BackupPathLog = 'D:\Backup\SQL2016PROD1A\LogShipMe\LOG\', 
 	@RestoreDiff = 1,
 	@ContinueLogs = 0, 
 	@RunRecovery = 1;
+
+EXEC dbo.sp_DatabaseRestore 
+	@Database = 'LogShipMe', 
+	@BackupPathFull = '\\StorageServer\LogShipMe\FULL\', 
+	@BackupPathDiff = '\\StorageServer\LogShipMe\DIFF\',
+	@BackupPathLog = '\\StorageServer\LogShipMe\LOG\', 
+	@RestoreDiff = 1,
+	@ContinueLogs = 0, 
+	@RunRecovery = 1,
+	@TestRestore = 1,
+	@RunCheckDB = 1,
+	@Debug = 0;
 */
 
 IF OBJECT_ID('dbo.sp_DatabaseRestore') IS NULL
@@ -48,7 +60,7 @@ ALTER PROCEDURE [dbo].[sp_DatabaseRestore]
 AS
 SET NOCOUNT ON;
 
-DECLARE @cmd NVARCHAR(4000), @sql NVARCHAR(MAX), @LastFullBackup NVARCHAR(500), @LastDiffBackup NVARCHAR(500), @BackupFile NVARCHAR(500), @BackupDateTime AS CHAR(15), @FullLastLSN NUMERIC(25, 0);
+DECLARE @cmd NVARCHAR(4000), @sql NVARCHAR(MAX), @LastFullBackup NVARCHAR(500), @LastDiffBackup NVARCHAR(500), @BackupFile NVARCHAR(500), @BackupDateTime AS CHAR(15), @FullLastLSN NUMERIC(25, 0), @DiffLastLSN NUMERIC(25, 0);
 DECLARE @FileList TABLE (BackupFile NVARCHAR(255));
 
 IF @RestoreDatabaseName IS NULL
@@ -122,7 +134,9 @@ SET @FileListParamSQL += ')' + CHAR(13) + CHAR(10);
 SET @FileListParamSQL += 'EXEC (''RESTORE FILELISTONLY FROM DISK=''''{Path}'''''')';
 
 SET @sql = REPLACE(@FileListParamSQL, '{Path}', @BackupPathFull + @LastFullBackup);
-PRINT @sql;
+IF @Debug = 2
+	PRINT @sql;
+
 EXEC (@sql);
 
 -- Build SQL for RESTORE HEADERONLY - this will be used a bit further below
@@ -192,11 +206,14 @@ BEGIN
 
   --get the backup completed data so we can apply tlogs from that point forwards                                                   
   SET @sql = REPLACE(@HeadersSQL, '{Path}', @BackupPathFull + @LastFullBackup);
-  PRINT @sql;
+  IF @Debug = 2
+	PRINT @sql;
+  
   EXECUTE (@sql);
 	--DECLARE @BackupDateTime AS CHAR(15), @FullLastLSN NUMERIC(25, 0); Commented out for testing
 	SELECT @BackupDateTime = RIGHT(@LastFullBackup, 19)
 	SELECT @FullLastLSN = CAST(LastLSN AS NUMERIC(25, 0)) FROM #Headers WHERE BackupType = 1;  
+  IF @Debug = 2
 	PRINT @BackupDateTime                                                
 END;
 ELSE
@@ -232,12 +249,14 @@ BEGIN
 		EXECUTE @sql = [dbo].[CommandExecute] @Command = @sql, @CommandType = 'RESTORE DATABASE', @Mode = 1, @DatabaseName = @Database, @LogToTable = 'Y', @Execute = 'Y';
 
   --get the backup completed data so we can apply tlogs from that point forwards                                                   
-  SET @sql = REPLACE(@HeadersSQL, '{Path}', @BackupPathFull + @LastFullBackup);
-  PRINT @sql;
+  SET @sql = REPLACE(@HeadersSQL, '{Path}', @BackupPathDiff + @LastDiffBackup);
+  IF @Debug = 2
+	PRINT @sql;
+  
   EXECUTE (@sql);
 	--DECLARE @BackupDateTime AS CHAR(15), @FullLastLSN NUMERIC(25, 0);
 	SELECT @BackupDateTime = RIGHT(@LastDiffBackup, 19)
-	SELECT @FullLastLSN = CAST(LastLSN AS NUMERIC(25, 0)) FROM #Headers WHERE BackupType = 1;                                                  
+	SELECT @DiffLastLSN = CAST(LastLSN AS NUMERIC(25, 0)) FROM #Headers WHERE BackupType = 5;                                                  
 END;
 
 --Clear out table variables for translogs
@@ -263,19 +282,24 @@ BEGIN
 	IF @i = 1
 	BEGIN
     SET @sql = REPLACE(@HeadersSQL, '{Path}', @BackupPathLog + @BackupFile);
-    PRINT @sql;
-    EXECUTE (@sql);
+	IF @Debug = 2
+		PRINT @sql;
+	EXECUTE (@sql);
 
 		SELECT @LogFirstLSN = CAST(FirstLSN AS NUMERIC(25, 0)), @LogLastLSN = CAST(LastLSN AS NUMERIC(25, 0)) FROM #Headers WHERE BackupType = 2;
-		IF (@ContinueLogs = 0 AND @LogFirstLSN <= @FullLastLSN AND @FullLastLSN <= @LogLastLSN) OR (@ContinueLogs = 1 AND @LogFirstLSN <= @DatabaseLastLSN AND @DatabaseLastLSN < @LogLastLSN)
+
+		IF (@ContinueLogs = 0 AND @LogFirstLSN <= @FullLastLSN AND @FullLastLSN <= @LogLastLSN AND @RestoreDiff = 0) OR (@ContinueLogs = 1 AND @LogFirstLSN <= @DatabaseLastLSN AND @DatabaseLastLSN < @LogLastLSN AND @RestoreDiff = 0)
+			SET @i = 2;
+		IF (@ContinueLogs = 0 AND @LogFirstLSN <= @DiffLastLSN AND @DiffLastLSN <= @LogLastLSN AND @RestoreDiff = 1) OR (@ContinueLogs = 1 AND @LogFirstLSN <= @DatabaseLastLSN AND @DatabaseLastLSN < @LogLastLSN AND @RestoreDiff = 1)
 			SET @i = 2;
 		DELETE FROM #Headers WHERE BackupType = 2;
 	END;
 	IF @i = 2
 	BEGIN
 		SET @sql = 'RESTORE LOG '+@RestoreDatabaseName+' FROM DISK = '''+@BackupPathLog + @BackupFile+''' WITH NORECOVERY'+CHAR(13);
 		PRINT @sql
-		EXECUTE @sql = [dbo].[CommandExecute] @Command = @sql, @CommandType = 'RESTORE LOG', @Mode = 1, @DatabaseName = @Database, @LogToTable = 'Y', @Execute = 'Y';
+		IF @Debug = 0
+			EXECUTE @sql = [dbo].[CommandExecute] @Command = @sql, @CommandType = 'RESTORE LOG', @Mode = 1, @DatabaseName = @Database, @LogToTable = 'Y', @Execute = 'Y';
 	END;
 	FETCH NEXT FROM BackupFiles INTO @BackupFile;
 END;
@@ -284,16 +308,25 @@ DEALLOCATE BackupFiles;
 -- put database in a useable state 
 IF @RunRecovery = 1
 BEGIN
-	SET @sql = 'RESTORE DATABASE '+@RestoreDatabaseName+' WITH RECOVERY';
-	EXECUTE sp_executesql @sql;
+	SET @sql = 'RESTORE DATABASE '+@RestoreDatabaseName+' WITH RECOVERY'+CHAR(13);
+	PRINT @sql
+	IF @Debug = 0
+		EXECUTE sp_executesql @sql;
 END;
 
  --Run checkdb against this database
 IF @RunCheckDB = 1
-	EXECUTE [dbo].[DatabaseIntegrityCheck] @Databases = @RestoreDatabaseName, @LogToTable = 'Y';
+BEGIN
+	SET @sql = 'EXECUTE [dbo].[DatabaseIntegrityCheck] @Databases = ' + @RestoreDatabaseName + ', @LogToTable = ''Y'''+CHAR(13);
+	PRINT @sql
+	IF @Debug = 0
+		EXECUTE sys.sp_executesql @sql
+END;
  --If test restore then blow the database away (be careful)
 IF @TestRestore = 1
 BEGIN
-	SET @sql = 'DROP DATABASE '+@RestoreDatabaseName;
-	EXECUTE sp_executesql @sql;
+	SET @sql = 'DROP DATABASE '+@RestoreDatabaseName+CHAR(13);
+	PRINT @sql
+	IF @Debug = 0
+		EXECUTE sp_executesql @sql;
 END;