Update sp_DatabaseRestore.sql

fixed ticket 3156 sp_databaserestore don't see backups which consists of more than 10 backupfiles when using @StoPAt
BrentOzarULTD · Nov 28, 2022 · f812b71 · f812b71
1 parent ebec3dd
commit f812b71
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/sp_DatabaseRestore.sql b/sp_DatabaseRestore.sql
@@ -636,15 +636,19 @@ BEGIN
 	/*End folder sanity check*/
 
 	IF @StopAt IS NOT NULL
-	BEGIN
-		DELETE
-		FROM @FileList
-		WHERE BackupFile LIKE N'%.bak'
-			AND
-			BackupFile LIKE N'%' + @Database + N'%'
-			AND
-			(REPLACE( RIGHT( REPLACE( BackupFile, RIGHT( BackupFile, PATINDEX( '%_[0-9][0-9]%', REVERSE( BackupFile ) ) ), '' ), 16 ), '_', '' ) > @StopAt);
-	END
+		BEGIN
+			DELETE
+			FROM @FileList
+			WHERE BackupFile LIKE N'%[_][0-9].bak'
+			AND	BackupFile LIKE N'%' + @Database + N'%'
+			AND	(REPLACE( RIGHT( REPLACE( BackupFile, RIGHT( BackupFile, PATINDEX( '%_[0-9][0-9]%', REVERSE( BackupFile ) ) ), '' ), 16 ), '_', '' ) > @StopAt);
+
+			DELETE
+			FROM @FileList
+			WHERE BackupFile LIKE N'%[_][0-9][0-9].bak'
+			AND	BackupFile LIKE N'%' + @Database + N'%'
+			AND	(REPLACE( RIGHT( REPLACE( BackupFile, RIGHT( BackupFile, PATINDEX( '%_[0-9][0-9]%', REVERSE( BackupFile ) ) ), '' ), 18 ), '_', '' ) > @StopAt);
+		END;
 
     -- Find latest full backup 
     SELECT @LastFullBackup = MAX(BackupFile)