From 7632c2978368f7eef744ee2f50b37cc27a939f2a Mon Sep 17 00:00:00 2001
From: Naveen <navzeus192021@gmail.com>
Date: Wed, 19 Aug 2026 00:26:37 +0530
Subject: [PATCH] Fix BACKUP_PRIORITY and GRANT/DENY CREATE ANY DATABASE for
 availability groups (#222)

Two independent ALTER AVAILABILITY GROUP syntax gaps, both documented and
valid T-SQL, failed to parse:

1. BACKUP_PRIORITY replica option
   In ADD REPLICA ON ... WITH (...) / MODIFY REPLICA ON ..., the
   literalReplicaOption rule only accepted an integer-valued option when it
   was SESSION_TIMEOUT, otherwise forcing a match on APPLY_DELAY. So
   BACKUP_PRIORITY = n produced "Expected APPLY_DELAY but encountered
   BACKUP_PRIORITY". Add a BackupPriority branch to the integer path,
   AvailabilityReplicaOptionKind.BackupPriority (appended), the BACKUP_PRIORITY
   keyword constant, and the option-helper mapping. Applied to all grammars
   that have the rule: TSql110 through TSql180 and TSqlFabricDW (SQL 2012+).

2. GRANT / DENY CREATE ANY DATABASE
   ALTER AVAILABILITY GROUP had no branch for this clause, so GRANT/CREATE/ANY
   all errored. Add the grammar branch plus two appended
   AlterAvailabilityGroupStatementType values (GrantCreateAnyDatabase,
   DenyCreateAnyDatabase) and the corresponding script-generator cases.
   Applied to TSql130 through TSql180 and TSqlFabricDW (SQL 2016+); earlier
   parsers correctly continue to reject it.

Both changes are additive to the public AST (new appended enum members, no
renumbering or retyping), so they are non-breaking for downstream consumers.

Tests:
- Positive round-trip: AlterAvailabilityGroupBackupPriorityTests.sql (110) and
  AlterAvailabilityGroupCreateAnyDatabaseTests130.sql (130), with baselines,
  wired through Only110SyntaxTests.cs / Only130SyntaxTests.cs. Error counts
  version-gate the syntax (BACKUP_PRIORITY rejected pre-110, GRANT/DENY CREATE
  ANY DATABASE rejected pre-130).
- Negative: AlterAvailabilityGroupCreateAnyDatabaseNegativeTest in
  ParserErrorsTests.cs asserts only CREATE ANY DATABASE is accepted.
---
 .../TSql/AlterAvailabilityGroupStatementType.cs    |  8 ++++++++
 .../Parser/TSql/AvailabilityReplicaOptionKind.cs   |  4 ++++
 .../TSql/AvailabilityReplicaOptionsHelper.cs       |  1 +
 .../Parser/TSql/CodeGenerationSupporter.cs         |  1 +
 SqlScriptDom/Parser/TSql/TSql110.g                 |  4 ++++
 SqlScriptDom/Parser/TSql/TSql120.g                 |  4 ++++
 SqlScriptDom/Parser/TSql/TSql130.g                 | 14 ++++++++++++++
 SqlScriptDom/Parser/TSql/TSql140.g                 | 14 ++++++++++++++
 SqlScriptDom/Parser/TSql/TSql150.g                 | 14 ++++++++++++++
 SqlScriptDom/Parser/TSql/TSql160.g                 | 14 ++++++++++++++
 SqlScriptDom/Parser/TSql/TSql170.g                 | 14 ++++++++++++++
 SqlScriptDom/Parser/TSql/TSql180.g                 | 14 ++++++++++++++
 SqlScriptDom/Parser/TSql/TSqlFabricDW.g            | 14 ++++++++++++++
 ...ratorVisitor.AlterAvailabilityGroupStatement.cs | 12 ++++++++++++
 .../AlterAvailabilityGroupBackupPriorityTests.sql  |  9 +++++++++
 ...rAvailabilityGroupCreateAnyDatabaseTests130.sql |  5 +++++
 Test/SqlDom/Only110SyntaxTests.cs                  |  1 +
 Test/SqlDom/Only130SyntaxTests.cs                  |  3 ++-
 Test/SqlDom/ParserErrorsTests.cs                   | 13 +++++++++++++
 .../AlterAvailabilityGroupBackupPriorityTests.sql  |  8 ++++++++
 ...rAvailabilityGroupCreateAnyDatabaseTests130.sql |  5 +++++
 21 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 Test/SqlDom/Baselines110/AlterAvailabilityGroupBackupPriorityTests.sql
 create mode 100644 Test/SqlDom/Baselines130/AlterAvailabilityGroupCreateAnyDatabaseTests130.sql
 create mode 100644 Test/SqlDom/TestScripts/AlterAvailabilityGroupBackupPriorityTests.sql
 create mode 100644 Test/SqlDom/TestScripts/AlterAvailabilityGroupCreateAnyDatabaseTests130.sql

diff --git a/SqlScriptDom/Parser/TSql/AlterAvailabilityGroupStatementType.cs b/SqlScriptDom/Parser/TSql/AlterAvailabilityGroupStatementType.cs
index 6787ba02..aa77ba99 100644
--- a/SqlScriptDom/Parser/TSql/AlterAvailabilityGroupStatementType.cs
+++ b/SqlScriptDom/Parser/TSql/AlterAvailabilityGroupStatementType.cs
@@ -41,5 +41,13 @@ public enum AlterAvailabilityGroupStatementType
         /// Take an action
         /// </summary>
         Action                      = 6,
+        /// <summary>
+        /// Grant CREATE ANY DATABASE
+        /// </summary>
+        GrantCreateAnyDatabase      = 7,
+        /// <summary>
+        /// Deny CREATE ANY DATABASE
+        /// </summary>
+        DenyCreateAnyDatabase       = 8,
     }
 }
diff --git a/SqlScriptDom/Parser/TSql/AvailabilityReplicaOptionKind.cs b/SqlScriptDom/Parser/TSql/AvailabilityReplicaOptionKind.cs
index 3e181b44..7f88774c 100644
--- a/SqlScriptDom/Parser/TSql/AvailabilityReplicaOptionKind.cs
+++ b/SqlScriptDom/Parser/TSql/AvailabilityReplicaOptionKind.cs
@@ -41,6 +41,10 @@ public enum AvailabilityReplicaOptionKind
         /// Primary role
         /// </summary>
         PrimaryRole         = 6,
+        /// <summary>
+        /// Backup priority
+        /// </summary>
+        BackupPriority      = 7,
 
     }
 }
diff --git a/SqlScriptDom/Parser/TSql/AvailabilityReplicaOptionsHelper.cs b/SqlScriptDom/Parser/TSql/AvailabilityReplicaOptionsHelper.cs
index 9bfff922..bd9174b2 100644
--- a/SqlScriptDom/Parser/TSql/AvailabilityReplicaOptionsHelper.cs
+++ b/SqlScriptDom/Parser/TSql/AvailabilityReplicaOptionsHelper.cs
@@ -14,6 +14,7 @@ internal class AvailabilityReplicaOptionsHelper : OptionsHelper<AvailabilityRepl
         private AvailabilityReplicaOptionsHelper()
         {
             AddOptionMapping(AvailabilityReplicaOptionKind.ApplyDelay, CodeGenerationSupporter.ApplyDelay);
+            AddOptionMapping(AvailabilityReplicaOptionKind.BackupPriority, CodeGenerationSupporter.BackupPriority);
             AddOptionMapping(AvailabilityReplicaOptionKind.AvailabilityMode, CodeGenerationSupporter.AvailabilityMode);
             AddOptionMapping(AvailabilityReplicaOptionKind.EndpointUrl, CodeGenerationSupporter.EndpointUrl);
             AddOptionMapping(AvailabilityReplicaOptionKind.SecondaryRole, CodeGenerationSupporter.SecondaryRole);
diff --git a/SqlScriptDom/Parser/TSql/CodeGenerationSupporter.cs b/SqlScriptDom/Parser/TSql/CodeGenerationSupporter.cs
index 7bd0e484..13baef4f 100644
--- a/SqlScriptDom/Parser/TSql/CodeGenerationSupporter.cs
+++ b/SqlScriptDom/Parser/TSql/CodeGenerationSupporter.cs
@@ -133,6 +133,7 @@ internal static class CodeGenerationSupporter
         internal const string ApplicationLog = "APPLICATION_LOG";
         internal const string Apply = "APPLY";
         internal const string ApplyDelay = "APPLY_DELAY";
+        internal const string BackupPriority = "BACKUP_PRIORITY";
         internal const string Assembly = "ASSEMBLY";
         internal const string Asymmetric = "ASYMMETRIC";
         internal const string AsynchronousCommit = "ASYNCHRONOUS_COMMIT";
diff --git a/SqlScriptDom/Parser/TSql/TSql110.g b/SqlScriptDom/Parser/TSql/TSql110.g
index a4974e16..9f801c05 100644
--- a/SqlScriptDom/Parser/TSql/TSql110.g
+++ b/SqlScriptDom/Parser/TSql/TSql110.g
@@ -7850,6 +7850,10 @@ literalReplicaOption returns [LiteralReplicaOption vResult = FragmentFactory.Cre
                 {
                     vResult.OptionKind=AvailabilityReplicaOptionKind.SessionTimeout;
                 }
+                else if(TryMatch(tOption, CodeGenerationSupporter.BackupPriority))
+                {
+                    vResult.OptionKind=AvailabilityReplicaOptionKind.BackupPriority;
+                }
                 else
                 {
                     Match(tOption, CodeGenerationSupporter.ApplyDelay);
diff --git a/SqlScriptDom/Parser/TSql/TSql120.g b/SqlScriptDom/Parser/TSql/TSql120.g
index ca52e509..1452987d 100644
--- a/SqlScriptDom/Parser/TSql/TSql120.g
+++ b/SqlScriptDom/Parser/TSql/TSql120.g
@@ -8011,6 +8011,10 @@ literalReplicaOption returns [LiteralReplicaOption vResult = FragmentFactory.Cre
                 {
                     vResult.OptionKind=AvailabilityReplicaOptionKind.SessionTimeout;
                 }
+                else if(TryMatch(tOption, CodeGenerationSupporter.BackupPriority))
+                {
+                    vResult.OptionKind=AvailabilityReplicaOptionKind.BackupPriority;
+                }
                 else
                 {
                     Match(tOption, CodeGenerationSupporter.ApplyDelay);
diff --git a/SqlScriptDom/Parser/TSql/TSql130.g b/SqlScriptDom/Parser/TSql/TSql130.g
index bc917aa6..b7afa2c4 100644
--- a/SqlScriptDom/Parser/TSql/TSql130.g
+++ b/SqlScriptDom/Parser/TSql/TSql130.g
@@ -8555,6 +8555,16 @@ alterAvailabilityGroupStatement returns [AlterAvailabilityGroupStatement vResult
         alterAvailabilityGroupRemoveReplica[vResult]
     |    alterAvailabilityGroupSetOption[vResult]
     |    alterAvailabilityGroupTakeAction[vResult]
+    |    tGrant:Grant Create Any tGrantDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.GrantCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tGrantDatabase);
+        }
+    |    tDeny:Deny Create Any tDenyDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.DenyCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tDenyDatabase);
+        }
      )
     ;
 
@@ -8920,6 +8930,10 @@ literalReplicaOption returns [LiteralReplicaOption vResult = FragmentFactory.Cre
                 {
                     vResult.OptionKind=AvailabilityReplicaOptionKind.SessionTimeout;
                 }
+                else if(TryMatch(tOption, CodeGenerationSupporter.BackupPriority))
+                {
+                    vResult.OptionKind=AvailabilityReplicaOptionKind.BackupPriority;
+                }
                 else
                 {
                     Match(tOption, CodeGenerationSupporter.ApplyDelay);
diff --git a/SqlScriptDom/Parser/TSql/TSql140.g b/SqlScriptDom/Parser/TSql/TSql140.g
index 323a91ab..1a62a138 100644
--- a/SqlScriptDom/Parser/TSql/TSql140.g
+++ b/SqlScriptDom/Parser/TSql/TSql140.g
@@ -8947,6 +8947,16 @@ alterAvailabilityGroupStatement returns [AlterAvailabilityGroupStatement vResult
         alterAvailabilityGroupRemoveReplica[vResult]
     |    alterAvailabilityGroupSetOption[vResult]
     |    alterAvailabilityGroupTakeAction[vResult]
+    |    tGrant:Grant Create Any tGrantDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.GrantCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tGrantDatabase);
+        }
+    |    tDeny:Deny Create Any tDenyDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.DenyCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tDenyDatabase);
+        }
      )
     ;
 
@@ -9312,6 +9322,10 @@ literalReplicaOption returns [LiteralReplicaOption vResult = FragmentFactory.Cre
                 {
                     vResult.OptionKind=AvailabilityReplicaOptionKind.SessionTimeout;
                 }
+                else if(TryMatch(tOption, CodeGenerationSupporter.BackupPriority))
+                {
+                    vResult.OptionKind=AvailabilityReplicaOptionKind.BackupPriority;
+                }
                 else
                 {
                     Match(tOption, CodeGenerationSupporter.ApplyDelay);
diff --git a/SqlScriptDom/Parser/TSql/TSql150.g b/SqlScriptDom/Parser/TSql/TSql150.g
index 6fc72dfe..b8d69df3 100644
--- a/SqlScriptDom/Parser/TSql/TSql150.g
+++ b/SqlScriptDom/Parser/TSql/TSql150.g
@@ -9589,6 +9589,16 @@ alterAvailabilityGroupStatement returns [AlterAvailabilityGroupStatement vResult
         alterAvailabilityGroupRemoveReplica[vResult]
     |    alterAvailabilityGroupSetOption[vResult]
     |    alterAvailabilityGroupTakeAction[vResult]
+    |    tGrant:Grant Create Any tGrantDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.GrantCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tGrantDatabase);
+        }
+    |    tDeny:Deny Create Any tDenyDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.DenyCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tDenyDatabase);
+        }
      )
     ;
 
@@ -9954,6 +9964,10 @@ literalReplicaOption returns [LiteralReplicaOption vResult = FragmentFactory.Cre
                 {
                     vResult.OptionKind=AvailabilityReplicaOptionKind.SessionTimeout;
                 }
+                else if(TryMatch(tOption, CodeGenerationSupporter.BackupPriority))
+                {
+                    vResult.OptionKind=AvailabilityReplicaOptionKind.BackupPriority;
+                }
                 else
                 {
                     Match(tOption, CodeGenerationSupporter.ApplyDelay);
diff --git a/SqlScriptDom/Parser/TSql/TSql160.g b/SqlScriptDom/Parser/TSql/TSql160.g
index 9bedb727..0ca5bf79 100644
--- a/SqlScriptDom/Parser/TSql/TSql160.g
+++ b/SqlScriptDom/Parser/TSql/TSql160.g
@@ -9614,6 +9614,16 @@ alterAvailabilityGroupStatement returns [AlterAvailabilityGroupStatement vResult
         alterAvailabilityGroupRemoveReplica[vResult]
     |    alterAvailabilityGroupSetOption[vResult]
     |    alterAvailabilityGroupTakeAction[vResult]
+    |    tGrant:Grant Create Any tGrantDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.GrantCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tGrantDatabase);
+        }
+    |    tDeny:Deny Create Any tDenyDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.DenyCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tDenyDatabase);
+        }
      )
     ;
 
@@ -9979,6 +9989,10 @@ literalReplicaOption returns [LiteralReplicaOption vResult = FragmentFactory.Cre
                 {
                     vResult.OptionKind=AvailabilityReplicaOptionKind.SessionTimeout;
                 }
+                else if(TryMatch(tOption, CodeGenerationSupporter.BackupPriority))
+                {
+                    vResult.OptionKind=AvailabilityReplicaOptionKind.BackupPriority;
+                }
                 else
                 {
                     Match(tOption, CodeGenerationSupporter.ApplyDelay);
diff --git a/SqlScriptDom/Parser/TSql/TSql170.g b/SqlScriptDom/Parser/TSql/TSql170.g
index ceb78600..5490cc6a 100644
--- a/SqlScriptDom/Parser/TSql/TSql170.g
+++ b/SqlScriptDom/Parser/TSql/TSql170.g
@@ -9669,6 +9669,16 @@ alterAvailabilityGroupStatement returns [AlterAvailabilityGroupStatement vResult
         alterAvailabilityGroupRemoveReplica[vResult]
     |    alterAvailabilityGroupSetOption[vResult]
     |    alterAvailabilityGroupTakeAction[vResult]
+    |    tGrant:Grant Create Any tGrantDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.GrantCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tGrantDatabase);
+        }
+    |    tDeny:Deny Create Any tDenyDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.DenyCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tDenyDatabase);
+        }
      )
     ;
 
@@ -10034,6 +10044,10 @@ literalReplicaOption returns [LiteralReplicaOption vResult = FragmentFactory.Cre
                 {
                     vResult.OptionKind=AvailabilityReplicaOptionKind.SessionTimeout;
                 }
+                else if(TryMatch(tOption, CodeGenerationSupporter.BackupPriority))
+                {
+                    vResult.OptionKind=AvailabilityReplicaOptionKind.BackupPriority;
+                }
                 else
                 {
                     Match(tOption, CodeGenerationSupporter.ApplyDelay);
diff --git a/SqlScriptDom/Parser/TSql/TSql180.g b/SqlScriptDom/Parser/TSql/TSql180.g
index 934911db..266ec4c2 100644
--- a/SqlScriptDom/Parser/TSql/TSql180.g
+++ b/SqlScriptDom/Parser/TSql/TSql180.g
@@ -9672,6 +9672,16 @@ alterAvailabilityGroupStatement returns [AlterAvailabilityGroupStatement vResult
         alterAvailabilityGroupRemoveReplica[vResult]
     |    alterAvailabilityGroupSetOption[vResult]
     |    alterAvailabilityGroupTakeAction[vResult]
+    |    tGrant:Grant Create Any tGrantDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.GrantCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tGrantDatabase);
+        }
+    |    tDeny:Deny Create Any tDenyDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.DenyCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tDenyDatabase);
+        }
      )
     ;
 
@@ -10037,6 +10047,10 @@ literalReplicaOption returns [LiteralReplicaOption vResult = FragmentFactory.Cre
                 {
                     vResult.OptionKind=AvailabilityReplicaOptionKind.SessionTimeout;
                 }
+                else if(TryMatch(tOption, CodeGenerationSupporter.BackupPriority))
+                {
+                    vResult.OptionKind=AvailabilityReplicaOptionKind.BackupPriority;
+                }
                 else
                 {
                     Match(tOption, CodeGenerationSupporter.ApplyDelay);
diff --git a/SqlScriptDom/Parser/TSql/TSqlFabricDW.g b/SqlScriptDom/Parser/TSql/TSqlFabricDW.g
index 4ad40b85..64f9e4ad 100644
--- a/SqlScriptDom/Parser/TSql/TSqlFabricDW.g
+++ b/SqlScriptDom/Parser/TSql/TSqlFabricDW.g
@@ -9643,6 +9643,16 @@ alterAvailabilityGroupStatement returns [AlterAvailabilityGroupStatement vResult
         alterAvailabilityGroupRemoveReplica[vResult]
     |    alterAvailabilityGroupSetOption[vResult]
     |    alterAvailabilityGroupTakeAction[vResult]
+    |    tGrant:Grant Create Any tGrantDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.GrantCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tGrantDatabase);
+        }
+    |    tDeny:Deny Create Any tDenyDatabase:Database
+        {
+            vResult.AlterAvailabilityGroupStatementType = AlterAvailabilityGroupStatementType.DenyCreateAnyDatabase;
+            UpdateTokenInfo(vResult, tDenyDatabase);
+        }
      )
     ;
 
@@ -10008,6 +10018,10 @@ literalReplicaOption returns [LiteralReplicaOption vResult = FragmentFactory.Cre
                 {
                     vResult.OptionKind=AvailabilityReplicaOptionKind.SessionTimeout;
                 }
+                else if(TryMatch(tOption, CodeGenerationSupporter.BackupPriority))
+                {
+                    vResult.OptionKind=AvailabilityReplicaOptionKind.BackupPriority;
+                }
                 else
                 {
                     Match(tOption, CodeGenerationSupporter.ApplyDelay);
diff --git a/SqlScriptDom/ScriptDom/SqlServer/ScriptGenerator/SqlScriptGeneratorVisitor.AlterAvailabilityGroupStatement.cs b/SqlScriptDom/ScriptDom/SqlServer/ScriptGenerator/SqlScriptGeneratorVisitor.AlterAvailabilityGroupStatement.cs
index 990ff0f6..2b8b0059 100644
--- a/SqlScriptDom/ScriptDom/SqlServer/ScriptGenerator/SqlScriptGeneratorVisitor.AlterAvailabilityGroupStatement.cs
+++ b/SqlScriptDom/ScriptDom/SqlServer/ScriptGenerator/SqlScriptGeneratorVisitor.AlterAvailabilityGroupStatement.cs
@@ -61,6 +61,18 @@ public override void ExplicitVisit(AlterAvailabilityGroupStatement node)
                     GenerateSpace();
                     GenerateParenthesisedCommaSeparatedList(node.Options);
                     break;
+                case AlterAvailabilityGroupStatementType.GrantCreateAnyDatabase:
+                    GenerateSpaceAndKeyword(TSqlTokenType.Grant);
+                    GenerateSpaceAndKeyword(TSqlTokenType.Create);
+                    GenerateSpaceAndKeyword(TSqlTokenType.Any);
+                    GenerateSpaceAndKeyword(TSqlTokenType.Database);
+                    break;
+                case AlterAvailabilityGroupStatementType.DenyCreateAnyDatabase:
+                    GenerateSpaceAndKeyword(TSqlTokenType.Deny);
+                    GenerateSpaceAndKeyword(TSqlTokenType.Create);
+                    GenerateSpaceAndKeyword(TSqlTokenType.Any);
+                    GenerateSpaceAndKeyword(TSqlTokenType.Database);
+                    break;
                 default:
                     Debug.Assert(false, "Unexepected option encountered");
                     break;
diff --git a/Test/SqlDom/Baselines110/AlterAvailabilityGroupBackupPriorityTests.sql b/Test/SqlDom/Baselines110/AlterAvailabilityGroupBackupPriorityTests.sql
new file mode 100644
index 00000000..0732fa09
--- /dev/null
+++ b/Test/SqlDom/Baselines110/AlterAvailabilityGroupBackupPriorityTests.sql
@@ -0,0 +1,9 @@
+ALTER AVAILABILITY GROUP [SalesAG] ADD REPLICA ON 'node1' WITH (BACKUP_PRIORITY = 50);
+
+
+GO
+ALTER AVAILABILITY GROUP [SalesAG] ADD REPLICA ON 'node2' WITH (ENDPOINT_URL = 'TCP://node2:5022', FAILOVER_MODE = MANUAL, AVAILABILITY_MODE = ASYNCHRONOUS_COMMIT, BACKUP_PRIORITY = 50);
+
+
+GO
+ALTER AVAILABILITY GROUP [SalesAG] MODIFY REPLICA ON 'node1' WITH (BACKUP_PRIORITY = 100);
diff --git a/Test/SqlDom/Baselines130/AlterAvailabilityGroupCreateAnyDatabaseTests130.sql b/Test/SqlDom/Baselines130/AlterAvailabilityGroupCreateAnyDatabaseTests130.sql
new file mode 100644
index 00000000..74a22320
--- /dev/null
+++ b/Test/SqlDom/Baselines130/AlterAvailabilityGroupCreateAnyDatabaseTests130.sql
@@ -0,0 +1,5 @@
+ALTER AVAILABILITY GROUP [SalesAG] GRANT CREATE ANY DATABASE;
+
+
+GO
+ALTER AVAILABILITY GROUP [SalesAG] DENY CREATE ANY DATABASE;
diff --git a/Test/SqlDom/Only110SyntaxTests.cs b/Test/SqlDom/Only110SyntaxTests.cs
index 4da160e7..ecc65d65 100644
--- a/Test/SqlDom/Only110SyntaxTests.cs
+++ b/Test/SqlDom/Only110SyntaxTests.cs
@@ -15,6 +15,7 @@ public partial class SqlDomTests
         // Note: These filenames are case sensitive, make sure they match the checked-in file exactly
         private static readonly ParserTest[] Only110TestInfos = {
             new ParserTest110("AlterAvailabilityGroupStatementTests.sql", 24, 12, 12),
+            new ParserTest110("AlterAvailabilityGroupBackupPriorityTests.sql", 6, 3, 3),
             new ParserTest110("AlterSearchPropertyListStatementTests.sql", 4, 4, 4),
             new ParserTest110("AlterSelectiveXmlIndexStatementTests.sql", 2, 6, 6),
             new ParserTest110("AlterSequenceStatementTests.sql", 2, 6, 6),
diff --git a/Test/SqlDom/Only130SyntaxTests.cs b/Test/SqlDom/Only130SyntaxTests.cs
index 0665459f..a29d09db 100644
--- a/Test/SqlDom/Only130SyntaxTests.cs
+++ b/Test/SqlDom/Only130SyntaxTests.cs
@@ -75,7 +75,8 @@ public partial class SqlDomTests
             new ParserTest130("CreateWorkloadClassifierStatementSqlDwTests.sql", 2, 1, 1, 1, 1),
             new ParserTest130("PredictSqlDwTests.sql", 3, 3, 3, 3, 3),
             new ParserTest130("CreateEventSessionNotLikePredicate.sql", 2, 1, 1, 1, 1),
-            new ParserTest130("PersistSamplePercentStatisticsTests130.sql")
+            new ParserTest130("PersistSamplePercentStatisticsTests130.sql"),
+            new ParserTest130("AlterAvailabilityGroupCreateAnyDatabaseTests130.sql", 4, 3, 3, 3, 3)
         };
 
         [TestMethod]
diff --git a/Test/SqlDom/ParserErrorsTests.cs b/Test/SqlDom/ParserErrorsTests.cs
index faeb5a68..e8ea745c 100644
--- a/Test/SqlDom/ParserErrorsTests.cs
+++ b/Test/SqlDom/ParserErrorsTests.cs
@@ -16,6 +16,19 @@ namespace SqlStudio.Tests.UTSqlScriptDom
 {
     public partial class SqlDomTests
     {
+        /// <summary>
+        /// Negative test for GitHub issue #222: ALTER AVAILABILITY GROUP ... GRANT/DENY only
+        /// accepts CREATE ANY DATABASE; any other permission phrase must be rejected.
+        /// </summary>
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void AlterAvailabilityGroupCreateAnyDatabaseNegativeTest()
+        {
+            ParserTestUtils.ErrorTest130("ALTER AVAILABILITY GROUP [ag] GRANT CREATE ANY TABLE",
+                new ParserErrorInfo(47, "SQL46010", "TABLE"));
+        }
+
         /// <summary>
         /// Negative tests for create table with generated always
         /// as user id/name start/end columns
diff --git a/Test/SqlDom/TestScripts/AlterAvailabilityGroupBackupPriorityTests.sql b/Test/SqlDom/TestScripts/AlterAvailabilityGroupBackupPriorityTests.sql
new file mode 100644
index 00000000..7a8a0cee
--- /dev/null
+++ b/Test/SqlDom/TestScripts/AlterAvailabilityGroupBackupPriorityTests.sql
@@ -0,0 +1,8 @@
+-- Regression tests for GitHub issue #222: BACKUP_PRIORITY must be accepted as an integer-valued
+-- replica option in ADD REPLICA ON / MODIFY REPLICA ON.
+ALTER AVAILABILITY GROUP [SalesAG] ADD REPLICA ON 'node1' WITH (BACKUP_PRIORITY = 50)
+GO
+ALTER AVAILABILITY GROUP [SalesAG] ADD REPLICA ON 'node2' WITH (ENDPOINT_URL = 'TCP://node2:5022', FAILOVER_MODE = MANUAL, AVAILABILITY_MODE = ASYNCHRONOUS_COMMIT, BACKUP_PRIORITY = 50)
+GO
+ALTER AVAILABILITY GROUP [SalesAG] MODIFY REPLICA ON 'node1' WITH (BACKUP_PRIORITY = 100)
+GO
diff --git a/Test/SqlDom/TestScripts/AlterAvailabilityGroupCreateAnyDatabaseTests130.sql b/Test/SqlDom/TestScripts/AlterAvailabilityGroupCreateAnyDatabaseTests130.sql
new file mode 100644
index 00000000..276afd20
--- /dev/null
+++ b/Test/SqlDom/TestScripts/AlterAvailabilityGroupCreateAnyDatabaseTests130.sql
@@ -0,0 +1,5 @@
+-- Regression tests for GitHub issue #222: ALTER AVAILABILITY GROUP ... { GRANT | DENY } CREATE ANY DATABASE.
+ALTER AVAILABILITY GROUP [SalesAG] GRANT CREATE ANY DATABASE
+GO
+ALTER AVAILABILITY GROUP [SalesAG] DENY CREATE ANY DATABASE
+GO