Visitar URL original
Sync Repos: Release 180.102.0 by allancascante · Pull Request #230 · microsoft/SqlScriptDOM · GitHub
Skip to content

Sync Repos: Release 180.102.0 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allancascante merged 13 commits into from
Aug 28, 2026
Merged

Sync Repos: Release 180.102.0 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
93e0daf
Fix INSERT VALUES alignment
Aug 27, 2026
18bf63f
Add configurable batch newline options
Aug 27, 2026
67895d1
Fix CREATE DATABASE COLLATE option ordering
Aug 27, 2026
9174e1b
Add multiline WITH and OPTION formatting
Aug 27, 2026
d4f1dd8
Add Fabric DW GROUP BY ALL and ORDER BY ALL support
Aug 27, 2026
2b77f6e
Fix SPARSE before MASKED column parsing (#216)
Aug 27, 2026
369e5ab
Add block statement terminator option
Aug 27, 2026
eb945d9
Add trailing GO preservation option
Aug 27, 2026
be80507
Add built-in function casing option
Aug 27, 2026
ced3315
Add multiline query clause formatting options
Aug 27, 2026
92d71f4
Add configurable leading comma spacing
Aug 27, 2026
9dd1884
Fix nested function formatting with parameter comments
Aug 27, 2026
c2f7c4d
Adding release notes for 180.102.0
Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions SqlScriptDom/Parser/TSql/Ast.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3550,6 +3550,8 @@
</Class>
<Class Name="OrderByClause" Summary="Represents the order by clause that can be used in statements like select.">
<Member Name="OrderByElements" Type="ExpressionWithSortOrder" Collection="true" Summary="The items."/>
<Member Name="All" Type="bool" Summary="True if the ORDER BY ALL shorthand is used, which orders by every column in the select list. When true, OrderByElements is empty."/>
<Member Name="AllSortOrder" Type="SortOrder" GenerateUpdatePositionInfoCall="false" Summary="The sort order (ASC/DESC) applied to ORDER BY ALL. Only meaningful when All is true."/>
</Class>
<Class Name="JoinTableReference" Base="TableReference" Abstract="true" Summary="Base class for JOIN table references">
<Member Name="FirstTableReference" Type="TableReference" Summary="The first table reference."/>
Expand Down Expand Up @@ -4046,6 +4048,7 @@
</Class>
<Class Name="TSqlScript" Summary="Represents a TSql sript.">
<Member Name="Batches" Type="TSqlBatch" Collection ="true" Summary="Batches in the script."/>
<Member Name="TrailingGoCount" Type="int" Summary="The number of consecutive trailing GO batch separators at the end of the script (0 if none)."/>
</Class>
<Class Name="TSqlBatch" Summary="Represents a batch in T-SQL script." >
<Member Name="Statements" Type="TSqlStatement" Collection="true" Summary="A list of statements, possibly empty."/>
Expand Down
20 changes: 20 additions & 0 deletions SqlScriptDom/Parser/TSql/OptionsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ public OptionType Value
{
get { return _optionValue; }
}

public string Identifier
{
get { return _identifier; }
}
}

private Dictionary<OptionType, OptionInfo> _optionToOptionInfo = new Dictionary<OptionType, OptionInfo>();
Expand Down Expand Up @@ -208,6 +213,21 @@ internal bool TryGenerateSourceForOption(ScriptWriter writer, OptionType option)
return false;
}

// Exposes the literal source text of identifier-backed options so callers can apply their own
// casing; returns false for token-backed options, whose text comes from the token table.
internal bool TryGetOptionIdentifier(OptionType option, out string identifier)
{
OptionInfo optionInfo;
if (_optionToOptionInfo.TryGetValue(option, out optionInfo) && optionInfo.Identifier != null)
{
identifier = optionInfo.Identifier;
return true;
}

identifier = null;
return false;
}

internal void GenerateCommaSeparatedFlagOptions(ScriptWriter writer, OptionType options)
{
bool first = true;
Expand Down
4 changes: 4 additions & 0 deletions SqlScriptDom/Parser/TSql/TSql100.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ script returns [TSqlScript vResult = this.FragmentFactory.CreateFragment<TSqlScr
(
Go
{
vResult.TrailingGoCount++;
ResetQuotedIdentifiersSettingToInitial();
ThrowPartialAstIfPhaseOne(null);
}
vCurrentBatch = batch
{
if (vCurrentBatch != null)
{
AddAndUpdateTokenInfo(vResult, vResult.Batches, vCurrentBatch);
vResult.TrailingGoCount = 0;
}
}

)*
Expand Down
8 changes: 8 additions & 0 deletions SqlScriptDom/Parser/TSql/TSql110.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ script returns [TSqlScript vResult = this.FragmentFactory.CreateFragment<TSqlScr
(
Go
{
vResult.TrailingGoCount++;
ResetQuotedIdentifiersSettingToInitial();
ThrowPartialAstIfPhaseOne(null);
}
vCurrentBatch = batch
{
if (vCurrentBatch != null)
{
AddAndUpdateTokenInfo(vResult, vResult.Batches, vCurrentBatch);
vResult.TrailingGoCount = 0;
}
}

)*
Expand Down Expand Up @@ -2677,6 +2681,10 @@ createDatabase returns [CreateDatabaseStatement vResult = FragmentFactory.Create
vResult.DatabaseName = vIdentifier;
ThrowPartialAstIfPhaseOne(vResult);
}
// NOTE: Unlike TSql120+, azureOptions and the collationOpt branch here are mutually-exclusive
// alternatives, so COLLATE and Azure edition options cannot coexist in either order. The
// COLLATE-before-options fix applied to TSql120-180/FabricDW is intentionally NOT ported here:
// it would require restructuring these alternatives into sequential optionals (a larger change).
(
{NextTokenMatches(CodeGenerationSupporter.MaxSize,2) || NextTokenMatches(CodeGenerationSupporter.Edition,2)}?
azureOptions[vResult, vResult.Options]
Expand Down
11 changes: 11 additions & 0 deletions SqlScriptDom/Parser/TSql/TSql120.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ script returns [TSqlScript vResult = this.FragmentFactory.CreateFragment<TSqlScr
(
Go
{
vResult.TrailingGoCount++;
ResetQuotedIdentifiersSettingToInitial();
ThrowPartialAstIfPhaseOne(null);
}
vCurrentBatch = batch
{
if (vCurrentBatch != null)
{
AddAndUpdateTokenInfo(vResult, vResult.Batches, vCurrentBatch);
vResult.TrailingGoCount = 0;
}
}

)*
Expand Down Expand Up @@ -2771,6 +2775,13 @@ createDatabase returns [CreateDatabaseStatement vResult = FragmentFactory.Create
)?
recoveryUnitList[vResult]
collationOpt[vResult]
(
// Azure SQL: parenthesized edition options may follow COLLATE.
// Limitation: each azureOptions invocation checks SQL46049 duplicates only within its own
// group, so an option repeated across the pre- and post-COLLATE groups is not flagged.
{NextTokenMatches(CodeGenerationSupporter.MaxSize,2) || NextTokenMatches(CodeGenerationSupporter.Edition,2) || NextTokenMatches(CodeGenerationSupporter.ServiceObjective,2)}?
azureOptions[vResult, vResult.Options]
)?
(
dbAddendums[vResult]
)?
Expand Down
16 changes: 16 additions & 0 deletions SqlScriptDom/Parser/TSql/TSql130.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ script returns [TSqlScript vResult = this.FragmentFactory.CreateFragment<TSqlScr
(
Go
{
vResult.TrailingGoCount++;
ResetQuotedIdentifiersSettingToInitial();
ThrowPartialAstIfPhaseOne(null);
}
vCurrentBatch = batch
{
if (vCurrentBatch != null)
{
AddAndUpdateTokenInfo(vResult, vResult.Batches, vCurrentBatch);
vResult.TrailingGoCount = 0;
}
}

)*
Expand Down Expand Up @@ -3530,6 +3534,13 @@ createDatabase returns [CreateDatabaseStatement vResult = FragmentFactory.Create
)?
recoveryUnitList[vResult]
collationOpt[vResult]
(
// Azure SQL: parenthesized edition options may follow COLLATE.
// Limitation: each azureOptions invocation checks SQL46049 duplicates only within its own
// group, so an option repeated across the pre- and post-COLLATE groups is not flagged.
{NextTokenMatches(CodeGenerationSupporter.MaxSize,2) || NextTokenMatches(CodeGenerationSupporter.Edition,2) || NextTokenMatches(CodeGenerationSupporter.ServiceObjective,2)}?
azureOptions[vResult, vResult.Options]
)?
(
dbAddendums[vResult]
)?
Expand Down Expand Up @@ -26975,6 +26986,11 @@ regularColumnBody [IndexAffectingStatement statementType, ColumnDefinition vPare
vParent.StorageOptions = vStorageOptions;
}
)?
// MASKED WITH may follow the storage options (documented SPARSE-before-MASKED order)
(
{NextTokenMatches(CodeGenerationSupporter.Masked)}?
maskedClause[vParent]
)?
)?
{
VerifyColumnDataType(vParent);
Expand Down
16 changes: 16 additions & 0 deletions SqlScriptDom/Parser/TSql/TSql140.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ script returns [TSqlScript vResult = this.FragmentFactory.CreateFragment<TSqlScr
(
Go
{
vResult.TrailingGoCount++;
ResetQuotedIdentifiersSettingToInitial();
ThrowPartialAstIfPhaseOne(null);
}
vCurrentBatch = batch
{
if (vCurrentBatch != null)
{
AddAndUpdateTokenInfo(vResult, vResult.Batches, vCurrentBatch);
vResult.TrailingGoCount = 0;
}
}

)*
Expand Down Expand Up @@ -3904,6 +3908,13 @@ createDatabase returns [CreateDatabaseStatement vResult = FragmentFactory.Create
)?
recoveryUnitList[vResult]
collationOpt[vResult]
(
// Azure SQL: parenthesized edition options may follow COLLATE.
// Limitation: each azureOptions invocation checks SQL46049 duplicates only within its own
// group, so an option repeated across the pre- and post-COLLATE groups is not flagged.
{NextTokenMatches(CodeGenerationSupporter.MaxSize,2) || NextTokenMatches(CodeGenerationSupporter.Edition,2) || NextTokenMatches(CodeGenerationSupporter.ServiceObjective,2)}?
azureOptions[vResult, vResult.Options]
)?
(
dbAddendums[vResult]
)?
Expand Down Expand Up @@ -27713,6 +27724,11 @@ regularColumnBody [IndexAffectingStatement statementType, ColumnDefinition vPare
vParent.StorageOptions = vStorageOptions;
}
)?
// MASKED WITH may follow the storage options (documented SPARSE-before-MASKED order)
(
{NextTokenMatches(CodeGenerationSupporter.Masked)}?
maskedClause[vParent]
)?
)?
(
{NextTokenMatches(CodeGenerationSupporter.Hidden)}?
Expand Down
16 changes: 16 additions & 0 deletions SqlScriptDom/Parser/TSql/TSql150.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ script returns [TSqlScript vResult = this.FragmentFactory.CreateFragment<TSqlScr
(
Go
{
vResult.TrailingGoCount++;
ResetQuotedIdentifiersSettingToInitial();
ThrowPartialAstIfPhaseOne(null);
}
vCurrentBatch = batch
{
if (vCurrentBatch != null)
{
AddAndUpdateTokenInfo(vResult, vResult.Batches, vCurrentBatch);
vResult.TrailingGoCount = 0;
}
}

)*
Expand Down Expand Up @@ -4427,6 +4431,13 @@ createDatabase returns [CreateDatabaseStatement vResult = FragmentFactory.Create
)?
recoveryUnitList[vResult]
collationOpt[vResult]
(
// Azure SQL: parenthesized edition options may follow COLLATE.
// Limitation: each azureOptions invocation checks SQL46049 duplicates only within its own
// group, so an option repeated across the pre- and post-COLLATE groups is not flagged.
{NextTokenMatches(CodeGenerationSupporter.MaxSize,2) || NextTokenMatches(CodeGenerationSupporter.Edition,2) || NextTokenMatches(CodeGenerationSupporter.ServiceObjective,2)}?
azureOptions[vResult, vResult.Options]
)?
(
dbAddendums[vResult]
)?
Expand Down Expand Up @@ -28553,6 +28564,11 @@ regularColumnBody [IndexAffectingStatement statementType, ColumnDefinition vPare
vParent.StorageOptions = vStorageOptions;
}
)?
// MASKED WITH may follow the storage options (documented SPARSE-before-MASKED order)
(
{NextTokenMatches(CodeGenerationSupporter.Masked)}?
maskedClause[vParent]
)?
)?
(
{NextTokenMatches(CodeGenerationSupporter.Hidden)}?
Expand Down
16 changes: 16 additions & 0 deletions SqlScriptDom/Parser/TSql/TSql160.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ script returns [TSqlScript vResult = this.FragmentFactory.CreateFragment<TSqlScr
(
Go
{
vResult.TrailingGoCount++;
ResetQuotedIdentifiersSettingToInitial();
ThrowPartialAstIfPhaseOne(null);
}
vCurrentBatch = batch
{
if (vCurrentBatch != null)
{
AddAndUpdateTokenInfo(vResult, vResult.Batches, vCurrentBatch);
vResult.TrailingGoCount = 0;
}
}

)*
Expand Down Expand Up @@ -4447,6 +4451,13 @@ createDatabase returns [CreateDatabaseStatement vResult = FragmentFactory.Create
)?
recoveryUnitList[vResult]
collationOpt[vResult]
(
// Azure SQL: parenthesized edition options may follow COLLATE.
// Limitation: each azureOptions invocation checks SQL46049 duplicates only within its own
// group, so an option repeated across the pre- and post-COLLATE groups is not flagged.
{NextTokenMatches(CodeGenerationSupporter.MaxSize,2) || NextTokenMatches(CodeGenerationSupporter.Edition,2) || NextTokenMatches(CodeGenerationSupporter.ServiceObjective,2)}?
azureOptions[vResult, vResult.Options]
)?
(
dbAddendums[vResult]
)?
Expand Down Expand Up @@ -29033,6 +29044,11 @@ regularColumnBody [IndexAffectingStatement statementType, ColumnDefinition vPare
vParent.StorageOptions = vStorageOptions;
}
)?
// MASKED WITH may follow the storage options (documented SPARSE-before-MASKED order)
(
{NextTokenMatches(CodeGenerationSupporter.Masked)}?
maskedClause[vParent]
)?
)?
(
{NextTokenMatches(CodeGenerationSupporter.Hidden)}?
Expand Down
16 changes: 16 additions & 0 deletions SqlScriptDom/Parser/TSql/TSql170.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ script returns [TSqlScript vResult = this.FragmentFactory.CreateFragment<TSqlScr
(
Go
{
vResult.TrailingGoCount++;
ResetQuotedIdentifiersSettingToInitial();
ThrowPartialAstIfPhaseOne(null);
}
vCurrentBatch = batch
{
if (vCurrentBatch != null)
{
AddAndUpdateTokenInfo(vResult, vResult.Batches, vCurrentBatch);
vResult.TrailingGoCount = 0;
}
}

)*
Expand Down Expand Up @@ -4496,6 +4500,13 @@ createDatabase returns [CreateDatabaseStatement vResult = FragmentFactory.Create
)?
recoveryUnitList[vResult]
collationOpt[vResult]
(
// Azure SQL: parenthesized edition options may follow COLLATE.
// Limitation: each azureOptions invocation checks SQL46049 duplicates only within its own
// group, so an option repeated across the pre- and post-COLLATE groups is not flagged.
{NextTokenMatches(CodeGenerationSupporter.MaxSize,2) || NextTokenMatches(CodeGenerationSupporter.Edition,2) || NextTokenMatches(CodeGenerationSupporter.ServiceObjective,2)}?
azureOptions[vResult, vResult.Options]
)?
(
dbAddendums[vResult]
)?
Expand Down Expand Up @@ -29729,6 +29740,11 @@ regularColumnBody [IndexAffectingStatement statementType, ColumnDefinition vPare
vParent.StorageOptions = vStorageOptions;
}
)?
// MASKED WITH may follow the storage options (documented SPARSE-before-MASKED order)
(
{NextTokenMatches(CodeGenerationSupporter.Masked)}?
maskedClause[vParent]
)?
)?
(
{NextTokenMatches(CodeGenerationSupporter.Hidden)}?
Expand Down
16 changes: 16 additions & 0 deletions SqlScriptDom/Parser/TSql/TSql180.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@ script returns [TSqlScript vResult = this.FragmentFactory.CreateFragment<TSqlScr
(
Go
{
vResult.TrailingGoCount++;
ResetQuotedIdentifiersSettingToInitial();
ThrowPartialAstIfPhaseOne(null);
}
vCurrentBatch = batch
{
if (vCurrentBatch != null)
{
AddAndUpdateTokenInfo(vResult, vResult.Batches, vCurrentBatch);
vResult.TrailingGoCount = 0;
}
}

)*
Expand Down Expand Up @@ -4499,6 +4503,13 @@ createDatabase returns [CreateDatabaseStatement vResult = FragmentFactory.Create
)?
recoveryUnitList[vResult]
collationOpt[vResult]
(
// Azure SQL: parenthesized edition options may follow COLLATE.
// Limitation: each azureOptions invocation checks SQL46049 duplicates only within its own
// group, so an option repeated across the pre- and post-COLLATE groups is not flagged.
{NextTokenMatches(CodeGenerationSupporter.MaxSize,2) || NextTokenMatches(CodeGenerationSupporter.Edition,2) || NextTokenMatches(CodeGenerationSupporter.ServiceObjective,2)}?
azureOptions[vResult, vResult.Options]
)?
(
dbAddendums[vResult]
)?
Expand Down Expand Up @@ -29967,6 +29978,11 @@ regularColumnBody [IndexAffectingStatement statementType, ColumnDefinition vPare
vParent.StorageOptions = vStorageOptions;
}
)?
// MASKED WITH may follow the storage options (documented SPARSE-before-MASKED order)
(
{NextTokenMatches(CodeGenerationSupporter.Masked)}?
maskedClause[vParent]
)?
)?
(
{NextTokenMatches(CodeGenerationSupporter.Hidden)}?
Expand Down
Loading
Loading