Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ public override void ExplicitVisit(StatementList node)
}
else
{
NewLine();
for (var i = 0; i < _options.NumNewlinesAfterStatement; i++)
{
NewLine();
}
}

GenerateFragmentIfNotNull(statement);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
<Description>IncludeSemiColons_Description</Description>
<Summary>Gets or sets a boolean indicating if a semi colon should be included after each statement</Summary>
</Setting>
<Setting name="NumNewlinesAfterStatement" type="int" default="1" min="0">
<Summary>Gets or sets the number of newlines to include after each statement</Summary>
</Setting>
</SettingGroup>
<SettingGroup name="CREATE TABLE">
<Setting name="AlignColumnDefinitionFields" type="bool" default="true">
Expand Down
44 changes: 44 additions & 0 deletions Test/SqlDom/ScriptGeneratorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// </copyright>
//------------------------------------------------------------------------------

using System;
using Microsoft.SqlServer.TransactSql.ScriptDom;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using SqlStudio.Tests.AssemblyTools.TestCategory;
Expand Down Expand Up @@ -113,5 +114,48 @@ public void TestSqlServerlessScriptGenerator()
var scriptGenerator = new SqlServerlessScriptGenerator(options);
Assert.AreEqual(SqlVersion.Sql160, scriptGenerator.Options.SqlVersion);
}

[TestMethod]
[Priority(0)]
[SqlStudioTestCategory(Category.UnitTest)]
public void TestNewlinesBetweenStatementsGeneratorOption() {
var tableName = new SchemaObjectName();
tableName.Identifiers.Add(new Identifier { Value = "TableName" });

var tableStatement = new CreateTableStatement
{
SchemaObjectName = tableName
};
var tableStatementString = "CREATE TABLE TableName;";

var statements = new StatementList();
statements.Statements.Add(tableStatement);
statements.Statements.Add(tableStatement);

var generatorOptions = new SqlScriptGeneratorOptions {
KeywordCasing = KeywordCasing.Uppercase,
IncludeSemicolons = true,
NumNewlinesAfterStatement = 0
};

var generator = new Sql80ScriptGenerator(generatorOptions);

generator.GenerateScript(statements, out var sql);

Assert.AreEqual(tableStatementString + tableStatementString, sql);

generatorOptions.NumNewlinesAfterStatement = 1;
generator = new Sql80ScriptGenerator(generatorOptions);

generator.GenerateScript(statements, out sql);

Assert.AreEqual(tableStatementString + Environment.NewLine + tableStatementString, sql);

generatorOptions.NumNewlinesAfterStatement = 2;
generator = new Sql80ScriptGenerator(generatorOptions);

generator.GenerateScript(statements, out sql);
Assert.AreEqual(tableStatementString + Environment.NewLine + Environment.NewLine + tableStatementString, sql);
}
}
}