Merge pull request DbUp#37 from JakeGinnivan/ReleasePrep

Release prep

Author: JakeGinnivan

lib/nuget/NuGet.exe

@@ -46,7 +46,7 @@ private static UpgradeEngineBuilder SqlCeDatabase(IConnectionManager connectionM
  {
  var builder = new UpgradeEngineBuilder();
  builder.Configure(c => c.ConnectionManager = connectionManager);
- builder.Configure(c => c.ScriptExecutor = new SqlScriptExecutor(() => c.ConnectionManager, () => c.Log, null, () => c.VariablesEnabled, () => c.IsScriptOutputLogged, c.ScriptPreprocessors));
+ builder.Configure(c => c.ScriptExecutor = new SqlScriptExecutor(() => c.ConnectionManager, () => c.Log, null, () => c.VariablesEnabled, c.ScriptPreprocessors));
  builder.Configure(c => c.Journal = new SqlTableJournal(()=>connectionManager, ()=>c.Log, null, "SchemaVersions"));
  builder.WithPreprocessor(new SqlCePreprocessor());
  return builder;

src/DbUp.SqlCe/SqlCeExtensions.cs

@@ -29,7 +29,7 @@ public static UpgradeEngineBuilder SQLiteDatabase(this SupportedDatabases suppor
  builder.Configure(c => c.ConnectionManager = new SQLiteConnectionManager(connectionString));
  builder.Configure(c => c.Journal = new SQLiteTableJournal(() => c.ConnectionManager, () => c.Log, "SchemaVersions"));
  builder.Configure(c => c.ScriptExecutor = new SqlScriptExecutor(() => c.ConnectionManager, () => c.Log, null,
- () => c.VariablesEnabled, () => c.IsScriptOutputLogged, c.ScriptPreprocessors));
+ () => c.VariablesEnabled, c.ScriptPreprocessors));
  builder.WithPreprocessor(new SQLitePreprocessor());
  return builder;
  }
@@ -48,7 +48,7 @@ public static UpgradeEngineBuilder SQLiteDatabase(this SupportedDatabases suppor
  builder.Configure(c => c.ConnectionManager = new SQLiteConnectionManager(sharedConnection));
  builder.Configure(c => c.Journal = new SQLiteTableJournal(() => c.ConnectionManager, () => c.Log, "SchemaVersions"));
  builder.Configure(c => c.ScriptExecutor = new SqlScriptExecutor(() => c.ConnectionManager, () => c.Log, null,
- () => c.VariablesEnabled, () => c.IsScriptOutputLogged, c.ScriptPreprocessors));
+ () => c.VariablesEnabled, c.ScriptPreprocessors));
  builder.WithPreprocessor(new SQLitePreprocessor());
  return builder;
  }

src/DbUp.Sqlite/SqliteExtensions.cs

@@ -30,7 +30,7 @@ public override UpgradeEngine Given()
  dbCommand = Substitute.For<IDbCommand>();
  dbConnection.CreateCommand().Returns(dbCommand);
  var connectionManager = new TestConnectionManager(dbConnection);
- scriptExecutor = new SqlScriptExecutor(() => connectionManager, () => new TraceUpgradeLog(), null, () => true, () => false, null);
+ scriptExecutor = new SqlScriptExecutor(() => connectionManager, () => new TraceUpgradeLog(), null, () => true, null);
 
  var builder = new UpgradeEngineBuilder()
  .WithScript(new SqlScript("1234", "create table $var$ (Id int)"))

src/DbUp.Tests/Engine/UpgradeEngineTests.cs

@@ -16,7 +16,7 @@ public class SqlScriptExecutorTests
  [Test]
  public void verify_schema_should_not_check_when_schema_is_null()
  {
- var executor = new SqlScriptExecutor(() => Substitute.For<IConnectionManager>(), () => null, null, () => false, () => false, null);
+ var executor = new SqlScriptExecutor(() => Substitute.For<IConnectionManager>(), () => null, null, () => false, null);
 
  executor.VerifySchema();
  }
@@ -27,7 +27,7 @@ public void when_schema_is_null_schema_is_stripped_from_scripts()
  var dbConnection = Substitute.For<IDbConnection>();
  var command = Substitute.For<IDbCommand>();
  dbConnection.CreateCommand().Returns(command);
- var executor = new SqlScriptExecutor(() => new TestConnectionManager(dbConnection, true), () => new ConsoleUpgradeLog(), null, () => true, () => false, null);
+ var executor = new SqlScriptExecutor(() => new TestConnectionManager(dbConnection, true), () => new ConsoleUpgradeLog(), null, () => true, null);
 
  executor.Execute(new SqlScript("Test", "create $schema$.Table"));
 
@@ -41,7 +41,7 @@ public void uses_variable_subtitute_preprocessor_when_running_scripts()
  var dbConnection = Substitute.For<IDbConnection>();
  var command = Substitute.For<IDbCommand>();
  dbConnection.CreateCommand().Returns(command);
- var executor = new SqlScriptExecutor(() => new TestConnectionManager(dbConnection, true), () => new ConsoleUpgradeLog(), null, () => true, () => false, null);
+ var executor = new SqlScriptExecutor(() => new TestConnectionManager(dbConnection, true), () => new ConsoleUpgradeLog(), null, () => true, null);
 
  executor.Execute(new SqlScript("Test", "create $foo$.Table"), new Dictionary<string, string>{{"foo", "bar"}});
 
@@ -55,7 +55,7 @@ public void does_not_use_variable_subtitute_preprocessor_when_setting_false()
  var dbConnection = Substitute.For<IDbConnection>();
  var command = Substitute.For<IDbCommand>();
  dbConnection.CreateCommand().Returns(command);
- var executor = new SqlScriptExecutor(() => new TestConnectionManager(dbConnection, true), () => new ConsoleUpgradeLog(), null, () => false, () => false, null);
+ var executor = new SqlScriptExecutor(() => new TestConnectionManager(dbConnection, true), () => new ConsoleUpgradeLog(), null, () => false, null);
 
  executor.Execute(new SqlScript("Test", "create $foo$.Table"), new Dictionary<string, string> { { "foo", "bar" } });
 
@@ -69,12 +69,30 @@ public void uses_variable_subtitutes_schema()
  var dbConnection = Substitute.For<IDbConnection>();
  var command = Substitute.For<IDbCommand>();
  dbConnection.CreateCommand().Returns(command);
- var executor = new SqlScriptExecutor(() => new TestConnectionManager(dbConnection, true), () => new ConsoleUpgradeLog(), "foo", () => true, () => false, null);
+ var executor = new SqlScriptExecutor(() => new TestConnectionManager(dbConnection, true), () => new ConsoleUpgradeLog(), "foo", () => true, null);
 
  executor.Execute(new SqlScript("Test", "create $schema$.Table"));
 
  command.Received().ExecuteNonQuery();
  Assert.AreEqual("create [foo].Table", command.CommandText);
  }
+
+ [Test]
+ public void logs_output_when_configured_to()
+ {
+ var dbConnection = Substitute.For<IDbConnection>();
+ var command = Substitute.For<IDbCommand>();
+ dbConnection.CreateCommand().Returns(command);
+ var executor = new SqlScriptExecutor(() => new TestConnectionManager(dbConnection, true)
+ {
+ IsScriptOutputLogged = true
+ }, () => new ConsoleUpgradeLog(), "foo", () => true, null);
+
+ executor.Execute(new SqlScript("Test", "create $schema$.Table"));
+
+ command.Received().ExecuteReader();
+ command.DidNotReceive().ExecuteNonQuery();
+ Assert.AreEqual("create [foo].Table", command.CommandText);
+ }
  }
 }

src/DbUp.Tests/Support/SqlServer/SqlScriptExecutorTests.cs

@@ -52,7 +52,7 @@ public static UpgradeEngineBuilder LogToConsole(this UpgradeEngineBuilder builde
  /// </returns>
  public static UpgradeEngineBuilder LogScriptOutput(this UpgradeEngineBuilder builder)
  {
- builder.Configure(c => c.IsScriptOutputLogged = true);
+ builder.Configure(c => c.ConnectionManager.IsScriptOutputLogged = true);
  return builder;
  }
 

src/DbUp/Builder/StandardExtensions.cs

@@ -34,11 +34,6 @@ public UpgradeConfiguration()
  /// </summary>
  public IUpgradeLog Log { get; set; }
 
- /// <summary>
- /// Gets or sets a log which captures details about the upgrade.
- /// </summary>
- public bool IsScriptOutputLogged { get; set; }
-
  /// <summary>
  /// Gets a mutable list of script providers.
  /// </summary>

src/DbUp/Builder/UpgradeConfiguration.cs

@@ -19,7 +19,6 @@ public class UpgradeEngine
  public UpgradeEngine(UpgradeConfiguration configuration)
  {
  this.configuration = configuration;
- this.configuration.ConnectionManager.IsScriptOutputLogged = this.configuration.IsScriptOutputLogged;
  }
 
  /// <summary>

src/DbUp/Engine/UpgradeEngine.cs

@@ -18,11 +18,10 @@ namespace DbUp.Support.SqlServer
  /// </summary>
  public sealed class SqlScriptExecutor : IScriptExecutor
  {
- private readonly Func<IConnectionManager> connectionManager;
+ private readonly Func<IConnectionManager> connectionManagerFactory;
  private readonly Func<IUpgradeLog> log;
  private readonly IEnumerable<IScriptPreprocessor> scriptPreprocessors;
  private readonly Func<bool> variablesEnabled;
- private readonly Func<bool> scriptOutputLogged;
 
  /// <summary>
  /// SQLCommand Timeout in seconds. If not set, the default SQLCommand timeout is not changed.
@@ -32,21 +31,19 @@ public sealed class SqlScriptExecutor : IScriptExecutor
  /// <summary>
  /// Initializes an instance of the <see cref="SqlScriptExecutor"/> class.
  /// </summary>
- /// <param name="connectionManager"></param>
+ /// <param name="connectionManagerFactory"></param>
  /// <param name="log">The logging mechanism.</param>
  /// <param name="schema">The schema that contains the table.</param>
  /// <param name="variablesEnabled">Function that returns <c>true</c> if variables should be replaced, <c>false</c> otherwise.</param>
- /// <param name="scriptOutputLogged">Function that returns <c>true</c> if the db script output should be logged, <c>false</c> otherwise.</param>
  /// <param name="scriptPreprocessors">Script Preprocessors in addition to variable substitution</param>
- public SqlScriptExecutor(Func<IConnectionManager> connectionManager, Func<IUpgradeLog> log, string schema, Func<bool> variablesEnabled, Func<bool> scriptOutputLogged, 
+ public SqlScriptExecutor(Func<IConnectionManager> connectionManagerFactory, Func<IUpgradeLog> log, string schema, Func<bool> variablesEnabled, 
  IEnumerable<IScriptPreprocessor> scriptPreprocessors)
  {
  Schema = schema;
  this.log = log;
  this.variablesEnabled = variablesEnabled;
- this.scriptOutputLogged = scriptOutputLogged;
  this.scriptPreprocessors = scriptPreprocessors;
- this.connectionManager = connectionManager;
+ this.connectionManagerFactory = connectionManagerFactory;
  }
 
  /// <summary>
@@ -70,7 +67,7 @@ public void VerifySchema()
  {
  if (string.IsNullOrEmpty(Schema)) return;
 
- connectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
+ connectionManagerFactory().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
  {
  var sqlRunner = new AdHocSqlRunner(dbCommandFactory, Schema, () => true);
 
@@ -101,11 +98,12 @@ public void Execute(SqlScript script, IDictionary<string, string> variables)
  contents = (scriptPreprocessors??new IScriptPreprocessor[0])
  .Aggregate(contents, (current, additionalScriptPreprocessor) => additionalScriptPreprocessor.Process(current));
 
- var scriptStatements = connectionManager().SplitScriptIntoCommands(contents);
+ var connectionManager = connectionManagerFactory();
+ var scriptStatements = connectionManager.SplitScriptIntoCommands(contents);
  var index = -1;
  try
  {
- connectionManager().ExecuteCommandsWithManagedConnection(dbCommandFactory =>
+ connectionManager.ExecuteCommandsWithManagedConnection(dbCommandFactory =>
  {
  foreach (var statement in scriptStatements)
  {
@@ -115,7 +113,7 @@ public void Execute(SqlScript script, IDictionary<string, string> variables)
  command.CommandText = statement;
  if (ExecutionTimeoutSeconds != null)
  command.CommandTimeout = ExecutionTimeoutSeconds.Value;
- if (scriptOutputLogged())
+ if (connectionManager.IsScriptOutputLogged)
  {
  using (var reader = command.ExecuteReader())
  {

src/DbUp/Support/SqlServer/SqlScriptExecutor.cs

@@ -80,7 +80,7 @@ private static UpgradeEngineBuilder SqlDatabase(IConnectionManager connectionMan
  {
  var builder = new UpgradeEngineBuilder();
  builder.Configure(c => c.ConnectionManager = connectionManager);
- builder.Configure(c => c.ScriptExecutor = new SqlScriptExecutor(() => c.ConnectionManager, () => c.Log, schema, () => c.VariablesEnabled, () => c.IsScriptOutputLogged, c.ScriptPreprocessors));
+ builder.Configure(c => c.ScriptExecutor = new SqlScriptExecutor(() => c.ConnectionManager, () => c.Log, schema, () => c.VariablesEnabled, c.ScriptPreprocessors));
  builder.Configure(c => c.Journal = new SqlTableJournal(()=>c.ConnectionManager, ()=>c.Log, schema, "SchemaVersions"));
  return builder;
  }