Skip to content

Commit 48d09e0

Browse files
committed
fix test and related from clause generation change
1 parent 231b2b3 commit 48d09e0

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

SqlScriptDom/ScriptDom/SqlServer/ScriptGenerator/SqlScriptGeneratorVisitor.FromClause.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,9 @@ protected void GenerateFromClause(FromClause fromClause, AlignmentPoint clauseBo
2828
MarkAndPushAlignmentPoint(start);
2929

3030
GenerateKeyword(TSqlTokenType.From);
31-
if (_suppressNextClauseAlignment)
32-
{
33-
// Simple single space after FROM when coming directly after an inline trailing comment
34-
_suppressNextClauseAlignment = false;
35-
GenerateSpace();
36-
}
37-
else
38-
{
39-
MarkClauseBodyAlignmentWhenNecessary(_options.NewLineBeforeFromClause, clauseBody);
40-
GenerateSpace();
41-
}
31+
32+
MarkClauseBodyAlignmentWhenNecessary(_options.NewLineBeforeFromClause, clauseBody);
33+
GenerateSpace();
4234

4335
AlignmentPoint fromItems = new AlignmentPoint();
4436
MarkAndPushAlignmentPoint(fromItems);

Test/SqlDom/ScriptGeneratorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ @EndDate DATETIME -- End of reporting range
524524
SELECT Col1, /* inline comment */
525525
Col2,
526526
* -- all the columns
527-
FROM MyTable;";
527+
FROM MyTable;";
528528
var formattedSqlWithoutComments = @"SELECT Col1,
529529
Col2,
530530
*

0 commit comments

Comments
 (0)