Skip to content

Commit 0370dbc

Browse files
olahallengrenolahallengren
authored
Merge pull request #1123 from olahallengren/minor_fixes
Escape _ in directory check in DatabaseBackup
2 parents abcc77a + 91cb88f commit 0370dbc

7 files changed

Lines changed: 21 additions & 21 deletions

‎CommandExecute.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ BEGIN
3838
--// Source: https://ola.hallengren.com //--
3939
--// License: https://ola.hallengren.com/license.html //--
4040
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
41-
--// Version: 2026-07-22 21:56:04 //--
41+
--// Version: 2026-07-22 23:46:33 //--
4242
----------------------------------------------------------------------------------------------------
4343

4444
SET NOCOUNT ON

‎DatabaseBackup.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ BEGIN
9494
--// Source: https://ola.hallengren.com //--
9595
--// License: https://ola.hallengren.com/license.html //--
9696
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
97-
--// Version: 2026-07-22 21:56:04 //--
97+
--// Version: 2026-07-22 23:46:33 //--
9898
----------------------------------------------------------------------------------------------------
9999

100100
SET NOCOUNT ON
@@ -3239,7 +3239,7 @@ BEGIN
32393239
IF @Description IS NULL OR LTRIM(RTRIM(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@Description,'\',''),'/',''),':',''),'*',''),'?',''),'"',''),'<',''),'>',''),'|',''))) = '' SET @CurrentDirectoryStructure = REPLACE(@CurrentDirectoryStructure,'{Description}','')
32403240
IF @BackupSetName IS NULL OR LTRIM(RTRIM(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@BackupSetName,'\',''),'/',''),':',''),'*',''),'?',''),'"',''),'<',''),'>',''),'|',''))) = '' SET @CurrentDirectoryStructure = REPLACE(@CurrentDirectoryStructure,'{BackupSetName}','')
32413241

3242-
IF @Directory IS NULL AND @MirrorDirectory IS NULL AND @URL IS NULL AND @DefaultDirectory LIKE '%' + '.' + @@SERVICENAME + @DirectorySeparator + 'MSSQL' + @DirectorySeparator + 'Backup'
3242+
IF @Directory IS NULL AND @MirrorDirectory IS NULL AND @URL IS NULL AND @DefaultDirectory LIKE '%' + '.' + REPLACE(@@SERVICENAME,'_','[_]') + @DirectorySeparator + 'MSSQL' + @DirectorySeparator + 'Backup'
32433243
BEGIN
32443244
SET @CurrentDirectoryStructure = REPLACE(@CurrentDirectoryStructure,'{ServerName}','')
32453245
SET @CurrentDirectoryStructure = REPLACE(@CurrentDirectoryStructure,'{InstanceName}','')

‎DatabaseIntegrityCheck.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ BEGIN
4040
--// Source: https://ola.hallengren.com //--
4141
--// License: https://ola.hallengren.com/license.html //--
4242
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
43-
--// Version: 2026-07-22 21:56:04 //--
43+
--// Version: 2026-07-22 23:46:33 //--
4444
----------------------------------------------------------------------------------------------------
4545

4646
SET NOCOUNT ON

‎IndexOptimize.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ BEGIN
5656
--// Source: https://ola.hallengren.com //--
5757
--// License: https://ola.hallengren.com/license.html //--
5858
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
59-
--// Version: 2026-07-22 21:56:04 //--
59+
--// Version: 2026-07-22 23:46:33 //--
6060
----------------------------------------------------------------------------------------------------
6161

6262
SET NOCOUNT ON

‎MaintenanceSolution.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ License: https://ola.hallengren.com/license.html
1010

1111
GitHub: https://github.com/olahallengren/sql-server-maintenance-solution
1212

13-
Version: 2026-07-22 21:56:04
13+
Version: 2026-07-22 23:46:33
1414

1515
You can contact me by e-mail at ola@hallengren.com.
1616

@@ -133,7 +133,7 @@ BEGIN
133133
--// Source: https://ola.hallengren.com //--
134134
--// License: https://ola.hallengren.com/license.html //--
135135
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
136-
--// Version: 2026-07-22 21:56:04 //--
136+
--// Version: 2026-07-22 23:46:33 //--
137137
----------------------------------------------------------------------------------------------------
138138

139139
SET NOCOUNT ON
@@ -493,7 +493,7 @@ BEGIN
493493
--// Source: https://ola.hallengren.com //--
494494
--// License: https://ola.hallengren.com/license.html //--
495495
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
496-
--// Version: 2026-07-22 21:56:04 //--
496+
--// Version: 2026-07-22 23:46:33 //--
497497
----------------------------------------------------------------------------------------------------
498498

499499
SET NOCOUNT ON
@@ -3638,7 +3638,7 @@ BEGIN
36383638
IF @Description IS NULL OR LTRIM(RTRIM(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@Description,'\',''),'/',''),':',''),'*',''),'?',''),'"',''),'<',''),'>',''),'|',''))) = '' SET @CurrentDirectoryStructure = REPLACE(@CurrentDirectoryStructure,'{Description}','')
36393639
IF @BackupSetName IS NULL OR LTRIM(RTRIM(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@BackupSetName,'\',''),'/',''),':',''),'*',''),'?',''),'"',''),'<',''),'>',''),'|',''))) = '' SET @CurrentDirectoryStructure = REPLACE(@CurrentDirectoryStructure,'{BackupSetName}','')
36403640

3641-
IF @Directory IS NULL AND @MirrorDirectory IS NULL AND @URL IS NULL AND @DefaultDirectory LIKE '%' + '.' + @@SERVICENAME + @DirectorySeparator + 'MSSQL' + @DirectorySeparator + 'Backup'
3641+
IF @Directory IS NULL AND @MirrorDirectory IS NULL AND @URL IS NULL AND @DefaultDirectory LIKE '%' + '.' + REPLACE(@@SERVICENAME,'_','[_]') + @DirectorySeparator + 'MSSQL' + @DirectorySeparator + 'Backup'
36423642
BEGIN
36433643
SET @CurrentDirectoryStructure = REPLACE(@CurrentDirectoryStructure,'{ServerName}','')
36443644
SET @CurrentDirectoryStructure = REPLACE(@CurrentDirectoryStructure,'{InstanceName}','')
@@ -4975,7 +4975,7 @@ BEGIN
49754975
--// Source: https://ola.hallengren.com //--
49764976
--// License: https://ola.hallengren.com/license.html //--
49774977
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
4978-
--// Version: 2026-07-22 21:56:04 //--
4978+
--// Version: 2026-07-22 23:46:33 //--
49794979
----------------------------------------------------------------------------------------------------
49804980

49814981
SET NOCOUNT ON
@@ -6998,7 +6998,7 @@ BEGIN
69986998
--// Source: https://ola.hallengren.com //--
69996999
--// License: https://ola.hallengren.com/license.html //--
70007000
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
7001-
--// Version: 2026-07-22 21:56:04 //--
7001+
--// Version: 2026-07-22 23:46:33 //--
70027002
----------------------------------------------------------------------------------------------------
70037003

70047004
SET NOCOUNT ON

‎MaintenanceSolutionAzureSQLDatabase.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ License: https://ola.hallengren.com/license.html
99
1010
GitHub: https://github.com/olahallengren/sql-server-maintenance-solution
1111
12-
Version: 2026-07-22 21:56:04
12+
Version: 2026-07-22 23:46:33
1313
1414
You can contact me by e-mail at ola@hallengren.com.
1515
@@ -88,7 +88,7 @@ BEGIN
8888
--// Source: https://ola.hallengren.com //--
8989
--// License: https://ola.hallengren.com/license.html //--
9090
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
91-
--// Version: 2026-07-22 21:56:04 //--
91+
--// Version: 2026-07-22 23:46:33 //--
9292
----------------------------------------------------------------------------------------------------
9393

9494
SET NOCOUNT ON
@@ -394,7 +394,7 @@ BEGIN
394394
--// Source: https://ola.hallengren.com //--
395395
--// License: https://ola.hallengren.com/license.html //--
396396
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
397-
--// Version: 2026-07-22 21:56:04 //--
397+
--// Version: 2026-07-22 23:46:33 //--
398398
----------------------------------------------------------------------------------------------------
399399

400400
SET NOCOUNT ON
@@ -2417,7 +2417,7 @@ BEGIN
24172417
--// Source: https://ola.hallengren.com //--
24182418
--// License: https://ola.hallengren.com/license.html //--
24192419
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
2420-
--// Version: 2026-07-22 21:56:04 //--
2420+
--// Version: 2026-07-22 23:46:33 //--
24212421
----------------------------------------------------------------------------------------------------
24222422

24232423
SET NOCOUNT ON

‎SHA256SUMS.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
255cec4c899f02f166d6a53133dfe75d6aa1c13715913b09a2ac1f22b65bc5ab CommandExecute.sql
1+
71f0367d66f06a3ca9fe88dcf03fe762610e56de129219cfb573c31198b5d025 CommandExecute.sql
22
7a508fa7ed562ec5ee09d4f587f7f2a87f7a4eb3c57450602ee99cdeb4e18b31 CommandLog.sql
3-
c3d27def0a8587a321fe7b84a69da78b1be52f0032bdd7feef3e0e682d9bd0d8 DatabaseBackup.sql
4-
670427a40c7ec3b0f8e3295fe211a0385d6f392eadde4fe26f9257f35319f880 DatabaseIntegrityCheck.sql
5-
d162f07803223a4d48a210263b194ad0fb2347ee9245726a770cb683bc45bffb IndexOptimize.sql
6-
685456ce6d847a4402814c0d28a09dd0c2d984cb6d6157d69b2fef20669322f9 MaintenanceSolution.sql
7-
b3757ee5c69286c09db609f7db5e550d69e2a292b52a60ad5b8e7d58975aa74c MaintenanceSolutionAzureSQLDatabase.sql
3+
20a248b861316bfc2822fe82506e9e3941c59893f4157fcb5aa2e851d97bfebd DatabaseBackup.sql
4+
38c0cef0a2b62139bce5c45944b37f1f08760b261dde2041add5b66b8474ae28 DatabaseIntegrityCheck.sql
5+
8da5a69a245925ea99e198cad654baa1c31c027deb8c283cb1c2e910de15554d IndexOptimize.sql
6+
1791f866508e0932164720f4ab15860f028bc4874b6d442ce7c421d413a64b8c MaintenanceSolution.sql
7+
bc48478247802f9ab6906749bf1065cc6e2942f0ec1fa7cc6d4aa53e11e830fc MaintenanceSolutionAzureSQLDatabase.sql
88
c30c3b986cc53efe75420e073af5ae9f0830c8f5b0dd1989649e249533588308 Queue.sql
99
8e61a33a6b6755ceae483968d8dedea87da3f82534dc37fba4786e9fbe9c1ec9 QueueDatabase.sql

0 commit comments

Comments
 (0)