Skip to content

Commit abaafb9

Browse files
olahallengrenolahallengren
authored
Merge pull request #1165 from olahallengren/minor_updates
Remove support for ClusterName token in the non-AvailabilityGroup parameters
2 parents 45f23c4 + 423a5b1 commit abaafb9

7 files changed

Lines changed: 23 additions & 23 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-08-17 22:22:29 //--
41+
--// Version: 2026-08-23 12:39:41 //--
4242
----------------------------------------------------------------------------------------------------
4343

4444
SET NOCOUNT ON

‎DatabaseBackup.sql‎

Lines changed: 3 additions & 3 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-08-17 22:22:29 //--
97+
--// Version: 2026-08-23 12:39:41 //--
9898
----------------------------------------------------------------------------------------------------
9999

100100
SET NOCOUNT ON
@@ -2415,7 +2415,7 @@ BEGIN
24152415

24162416
----------------------------------------------------------------------------------------------------
24172417

2418-
IF EXISTS (SELECT * FROM (SELECT REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@DirectoryStructure,'{DirectorySeparator}',''),'{ServerName}',''),'{InstanceName}',''),'{ServiceName}',''),'{ClusterName}',''),'{DatabaseName}',''),'{BackupType}',''),'{Partial}',''),'{CopyOnly}',''),'{Description}',''),'{BackupSetName}',''),'{Year}',''),'{Month}',''),'{Day}',''),'{Week}',''),'{Weekday}',''),'{Hour}',''),'{Minute}',''),'{Second}',''),'{Millisecond}',''),'{Microsecond}',''),'{MajorVersion}',''),'{MinorVersion}','') AS DirectoryStructure) Temp WHERE DirectoryStructure LIKE '%{%' OR DirectoryStructure LIKE '%}%')
2418+
IF EXISTS (SELECT * FROM (SELECT REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@DirectoryStructure,'{DirectorySeparator}',''),'{ServerName}',''),'{InstanceName}',''),'{ServiceName}',''),'{DatabaseName}',''),'{BackupType}',''),'{Partial}',''),'{CopyOnly}',''),'{Description}',''),'{BackupSetName}',''),'{Year}',''),'{Month}',''),'{Day}',''),'{Week}',''),'{Weekday}',''),'{Hour}',''),'{Minute}',''),'{Second}',''),'{Millisecond}',''),'{Microsecond}',''),'{MajorVersion}',''),'{MinorVersion}','') AS DirectoryStructure) Temp WHERE DirectoryStructure LIKE '%{%' OR DirectoryStructure LIKE '%}%')
24192419
BEGIN
24202420
INSERT INTO @Errors ([Message], Severity, [State])
24212421
VALUES('The parameter @DirectoryStructure contains one or more tokens that are not supported. See https://ola.hallengren.com/sql-server-backup.html#DirectoryStructure.', 16, 1)
@@ -2431,7 +2431,7 @@ BEGIN
24312431

24322432
----------------------------------------------------------------------------------------------------
24332433

2434-
IF EXISTS (SELECT * FROM (SELECT REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@FileName,'{ServerName}',''),'{InstanceName}',''),'{ServiceName}',''),'{ClusterName}',''),'{DatabaseName}',''),'{BackupType}',''),'{Partial}',''),'{CopyOnly}',''),'{Description}',''),'{BackupSetName}',''),'{Year}',''),'{Month}',''),'{Day}',''),'{Week}',''),'{Weekday}',''),'{Hour}',''),'{Minute}',''),'{Second}',''),'{Millisecond}',''),'{Microsecond}',''),'{FileNumber}',''),'{NumberOfFiles}',''),'{FileExtension}',''),'{MajorVersion}',''),'{MinorVersion}','') AS [FileName]) Temp WHERE [FileName] LIKE '%{%' OR [FileName] LIKE '%}%')
2434+
IF EXISTS (SELECT * FROM (SELECT REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@FileName,'{ServerName}',''),'{InstanceName}',''),'{ServiceName}',''),'{DatabaseName}',''),'{BackupType}',''),'{Partial}',''),'{CopyOnly}',''),'{Description}',''),'{BackupSetName}',''),'{Year}',''),'{Month}',''),'{Day}',''),'{Week}',''),'{Weekday}',''),'{Hour}',''),'{Minute}',''),'{Second}',''),'{Millisecond}',''),'{Microsecond}',''),'{FileNumber}',''),'{NumberOfFiles}',''),'{FileExtension}',''),'{MajorVersion}',''),'{MinorVersion}','') AS [FileName]) Temp WHERE [FileName] LIKE '%{%' OR [FileName] LIKE '%}%')
24352435
BEGIN
24362436
INSERT INTO @Errors ([Message], Severity, [State])
24372437
VALUES('The parameter @FileName contains one or more tokens that are not supported. See https://ola.hallengren.com/sql-server-backup.html#FileName.', 16, 1)

‎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-08-17 22:22:29 //--
43+
--// Version: 2026-08-23 12:39:41 //--
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-08-17 22:22:29 //--
59+
--// Version: 2026-08-23 12:39:41 //--
6060
----------------------------------------------------------------------------------------------------
6161

6262
SET NOCOUNT ON

‎MaintenanceSolution.sql‎

Lines changed: 7 additions & 7 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-08-17 22:22:29
13+
Version: 2026-08-23 12:39:41
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-08-17 22:22:29 //--
136+
--// Version: 2026-08-23 12:39:41 //--
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-08-17 22:22:29 //--
496+
--// Version: 2026-08-23 12:39:41 //--
497497
----------------------------------------------------------------------------------------------------
498498

499499
SET NOCOUNT ON
@@ -2814,7 +2814,7 @@ BEGIN
28142814

28152815
----------------------------------------------------------------------------------------------------
28162816

2817-
IF EXISTS (SELECT * FROM (SELECT REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@DirectoryStructure,'{DirectorySeparator}',''),'{ServerName}',''),'{InstanceName}',''),'{ServiceName}',''),'{ClusterName}',''),'{DatabaseName}',''),'{BackupType}',''),'{Partial}',''),'{CopyOnly}',''),'{Description}',''),'{BackupSetName}',''),'{Year}',''),'{Month}',''),'{Day}',''),'{Week}',''),'{Weekday}',''),'{Hour}',''),'{Minute}',''),'{Second}',''),'{Millisecond}',''),'{Microsecond}',''),'{MajorVersion}',''),'{MinorVersion}','') AS DirectoryStructure) Temp WHERE DirectoryStructure LIKE '%{%' OR DirectoryStructure LIKE '%}%')
2817+
IF EXISTS (SELECT * FROM (SELECT REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@DirectoryStructure,'{DirectorySeparator}',''),'{ServerName}',''),'{InstanceName}',''),'{ServiceName}',''),'{DatabaseName}',''),'{BackupType}',''),'{Partial}',''),'{CopyOnly}',''),'{Description}',''),'{BackupSetName}',''),'{Year}',''),'{Month}',''),'{Day}',''),'{Week}',''),'{Weekday}',''),'{Hour}',''),'{Minute}',''),'{Second}',''),'{Millisecond}',''),'{Microsecond}',''),'{MajorVersion}',''),'{MinorVersion}','') AS DirectoryStructure) Temp WHERE DirectoryStructure LIKE '%{%' OR DirectoryStructure LIKE '%}%')
28182818
BEGIN
28192819
INSERT INTO @Errors ([Message], Severity, [State])
28202820
VALUES('The parameter @DirectoryStructure contains one or more tokens that are not supported. See https://ola.hallengren.com/sql-server-backup.html#DirectoryStructure.', 16, 1)
@@ -2830,7 +2830,7 @@ BEGIN
28302830

28312831
----------------------------------------------------------------------------------------------------
28322832

2833-
IF EXISTS (SELECT * FROM (SELECT REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@FileName,'{ServerName}',''),'{InstanceName}',''),'{ServiceName}',''),'{ClusterName}',''),'{DatabaseName}',''),'{BackupType}',''),'{Partial}',''),'{CopyOnly}',''),'{Description}',''),'{BackupSetName}',''),'{Year}',''),'{Month}',''),'{Day}',''),'{Week}',''),'{Weekday}',''),'{Hour}',''),'{Minute}',''),'{Second}',''),'{Millisecond}',''),'{Microsecond}',''),'{FileNumber}',''),'{NumberOfFiles}',''),'{FileExtension}',''),'{MajorVersion}',''),'{MinorVersion}','') AS [FileName]) Temp WHERE [FileName] LIKE '%{%' OR [FileName] LIKE '%}%')
2833+
IF EXISTS (SELECT * FROM (SELECT REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(@FileName,'{ServerName}',''),'{InstanceName}',''),'{ServiceName}',''),'{DatabaseName}',''),'{BackupType}',''),'{Partial}',''),'{CopyOnly}',''),'{Description}',''),'{BackupSetName}',''),'{Year}',''),'{Month}',''),'{Day}',''),'{Week}',''),'{Weekday}',''),'{Hour}',''),'{Minute}',''),'{Second}',''),'{Millisecond}',''),'{Microsecond}',''),'{FileNumber}',''),'{NumberOfFiles}',''),'{FileExtension}',''),'{MajorVersion}',''),'{MinorVersion}','') AS [FileName]) Temp WHERE [FileName] LIKE '%{%' OR [FileName] LIKE '%}%')
28342834
BEGIN
28352835
INSERT INTO @Errors ([Message], Severity, [State])
28362836
VALUES('The parameter @FileName contains one or more tokens that are not supported. See https://ola.hallengren.com/sql-server-backup.html#FileName.', 16, 1)
@@ -5156,7 +5156,7 @@ BEGIN
51565156
--// Source: https://ola.hallengren.com //--
51575157
--// License: https://ola.hallengren.com/license.html //--
51585158
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
5159-
--// Version: 2026-08-17 22:22:29 //--
5159+
--// Version: 2026-08-23 12:39:41 //--
51605160
----------------------------------------------------------------------------------------------------
51615161

51625162
SET NOCOUNT ON
@@ -7203,7 +7203,7 @@ BEGIN
72037203
--// Source: https://ola.hallengren.com //--
72047204
--// License: https://ola.hallengren.com/license.html //--
72057205
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
7206-
--// Version: 2026-08-17 22:22:29 //--
7206+
--// Version: 2026-08-23 12:39:41 //--
72077207
----------------------------------------------------------------------------------------------------
72087208

72097209
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-08-17 22:22:29
12+
Version: 2026-08-23 12:39:41
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-08-17 22:22:29 //--
91+
--// Version: 2026-08-23 12:39:41 //--
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-08-17 22:22:29 //--
397+
--// Version: 2026-08-23 12:39:41 //--
398398
----------------------------------------------------------------------------------------------------
399399

400400
SET NOCOUNT ON
@@ -2441,7 +2441,7 @@ BEGIN
24412441
--// Source: https://ola.hallengren.com //--
24422442
--// License: https://ola.hallengren.com/license.html //--
24432443
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
2444-
--// Version: 2026-08-17 22:22:29 //--
2444+
--// Version: 2026-08-23 12:39:41 //--
24452445
----------------------------------------------------------------------------------------------------
24462446

24472447
SET NOCOUNT ON

‎SHA256SUMS.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
80e65a63e0dd81a8073c69b538ba222381354bd3435ba6141e6fb8eb6acbb070 CommandExecute.sql
1+
9e9f725972f82497a13570259fd333e5d70732134a9aaa0509d9c726bcc0c8a2 CommandExecute.sql
22
7a508fa7ed562ec5ee09d4f587f7f2a87f7a4eb3c57450602ee99cdeb4e18b31 CommandLog.sql
3-
503d04e5047622c273ab2a24b7a08ae5fec7f56e105f73e16a12c25eaa082194 DatabaseBackup.sql
4-
19e773fe4b4ee9956899e281799745269b4f610e70cb875dc71e4c72f583b3ce DatabaseIntegrityCheck.sql
5-
06c03f53f96d0e13945fc14a3c83e55d6409e3c38ffbc113b4936f80287f327f IndexOptimize.sql
6-
8d4b5fa1f45dfb78a6267cca11d4bc4cfb52109952b59399d6c8d171be55be83 MaintenanceSolution.sql
7-
20ac5ac10110a137dfddeec3daa34e6b885ef18809dd84e95fdd5770a4eebb72 MaintenanceSolutionAzureSQLDatabase.sql
3+
8e3bc4ffa4515a809638a883535633e5aadce72de100c03ae800e149c931d46f DatabaseBackup.sql
4+
aa32ffee55c30ab2a5e8266ab8c2ba34c207ce2e0d6b48b7c0b14348dd7efefe DatabaseIntegrityCheck.sql
5+
1db2fd5f28c5d3da2bd04a402b9ac61287a9a4352de3886c2d61ff3c69a41466 IndexOptimize.sql
6+
cca8c5162e9a819af6f9e9e1d966cdb8e7f8dfb136a5ae0481ee7df9405b1e3b MaintenanceSolution.sql
7+
ac2fc1a8723b818cf72eb2fe7df50e70b8ffef1b143658a451fa2a4685d9edfe MaintenanceSolutionAzureSQLDatabase.sql
88
c30c3b986cc53efe75420e073af5ae9f0830c8f5b0dd1989649e249533588308 Queue.sql
99
8e61a33a6b6755ceae483968d8dedea87da3f82534dc37fba4786e9fbe9c1ec9 QueueDatabase.sql

0 commit comments

Comments
 (0)