Skip to content

Accept a Func<SqlConnection> instead of a pre-created connection #34

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
droyad merged 2 commits into from
Feb 24, 2026
Merged

Accept a Func<SqlConnection> instead of a pre-created connection #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ce8f7b
DbUp creates multiple connections, so we need to pass in a Func inste…
droyad Feb 24, 2026
744c36f
Approval changes
droyad Feb 24, 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
6 changes: 3 additions & 3 deletions src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ public static DbUp.Builder.UpgradeEngineBuilder AzureSqlDatabaseWithIntegratedSe
public static class SqlServerExtensions
{
public static DbUp.Builder.UpgradeEngineBuilder JournalToSqlTable(this DbUp.Builder.UpgradeEngineBuilder builder, string schema, string table) { }
public static DbUp.Builder.UpgradeEngineBuilder SqlDatabase(this DbUp.Builder.SupportedDatabases supported, Microsoft.Data.SqlClient.SqlConnection connection) { }
public static DbUp.Builder.UpgradeEngineBuilder SqlDatabase(this DbUp.Builder.SupportedDatabases supported, System.Func<Microsoft.Data.SqlClient.SqlConnection> connectionFactory) { }
public static DbUp.Builder.UpgradeEngineBuilder SqlDatabase(this DbUp.Builder.SupportedDatabases supported, string connectionString) { }
public static void SqlDatabase(this DbUp.SupportedDatabasesForDropDatabase supported, string connectionString) { }
public static bool SqlDatabase(this DbUp.SupportedDatabasesForEnsureDatabase supported, string connectionString) { }
public static DbUp.Builder.UpgradeEngineBuilder SqlDatabase(this DbUp.Builder.SupportedDatabases supported, DbUp.Engine.Transactions.IConnectionManager connectionManager, string schema = null) { }
public static DbUp.Builder.UpgradeEngineBuilder SqlDatabase(this DbUp.Builder.SupportedDatabases supported, Microsoft.Data.SqlClient.SqlConnection connection, string schema) { }
public static DbUp.Builder.UpgradeEngineBuilder SqlDatabase(this DbUp.Builder.SupportedDatabases supported, System.Func<Microsoft.Data.SqlClient.SqlConnection> connectionFactory, string schema) { }
public static DbUp.Builder.UpgradeEngineBuilder SqlDatabase(this DbUp.Builder.SupportedDatabases supported, string connectionString, string schema) { }
public static void SqlDatabase(this DbUp.SupportedDatabasesForDropDatabase supported, string connectionString, int commandTimeout) { }
public static bool SqlDatabase(this DbUp.SupportedDatabasesForEnsureDatabase supported, string connectionString, DbUp.SqlServer.AzureDatabaseEdition azureDatabaseEdition) { }
Expand Down Expand Up @@ -48,7 +48,7 @@ public override System.Collections.Generic.IEnumerable<string> SplitScriptIntoCo
}
public class SqlConnectionManager : DbUp.Engine.Transactions.DatabaseConnectionManager
{
public SqlConnectionManager(Microsoft.Data.SqlClient.SqlConnection connection) { }
public SqlConnectionManager(System.Func<Microsoft.Data.SqlClient.SqlConnection> connectionFactory) { }
public SqlConnectionManager(string connectionString) { }
public override System.Collections.Generic.IEnumerable<string> SplitScriptIntoCommands(string scriptContents) { }
}
Expand Down
20 changes: 12 additions & 8 deletions src/dbup-sqlserver/SqlConnectionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.SqlClient;
using DbUp.Engine.Transactions;
Expand All @@ -15,22 +16,25 @@ public class SqlConnectionManager : DatabaseConnectionManager
/// </summary>
/// <param name="connectionString"></param>
public SqlConnectionManager(string connectionString)
: this(new SqlConnection(connectionString))
{ }
: this(() => new SqlConnection(connectionString))
{
}

/// <summary>
/// Manages Sql Database Connections using an existing connection.
/// </summary>
/// <param name="connection">The existing SQL connection to use.</param>
public SqlConnectionManager(SqlConnection connection)
/// <param name="connectionFactory">A factory function that creates a new SQL connection.</param>
public SqlConnectionManager(Func<SqlConnection> connectionFactory)
: base(new DelegateConnectionFactory((log, dbManager) =>
{
var conn = connectionFactory();
if (dbManager.IsScriptOutputLogged)
connection.InfoMessage += (sender, e) => log.LogInformation($"{{0}}", e.Message);
conn.InfoMessage += (sender, e) => log.LogInformation("{0}", e.Message);

return connection;
return conn;
}))
{ }
{
}

/// <inheritdoc/>
public override IEnumerable<string> SplitScriptIntoCommands(string scriptContents)
Expand All @@ -40,4 +44,4 @@ public override IEnumerable<string> SplitScriptIntoCommands(string scriptContent
return scriptStatements;
}
}
}
}
12 changes: 6 additions & 6 deletions src/dbup-sqlserver/SqlServerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ public static UpgradeEngineBuilder SqlDatabase(this SupportedDatabases supported
/// Creates an upgrader for SQL Server databases.
/// </summary>
/// <param name="supported">Fluent helper type.</param>
/// <param name="connection">The sql connection.</param>
/// <param name="connectionFactory">A func that create a new SqlConnection</param>
/// <returns>
/// A builder for a database upgrader designed for SQL Server databases.
/// </returns>
public static UpgradeEngineBuilder SqlDatabase(this SupportedDatabases supported, SqlConnection connection)
public static UpgradeEngineBuilder SqlDatabase(this SupportedDatabases supported, Func<SqlConnection> connectionFactory)
{
return SqlDatabase(supported, connection, null);
return SqlDatabase(supported, connectionFactory, null);
}

/// <summary>
Expand Down Expand Up @@ -79,14 +79,14 @@ public static UpgradeEngineBuilder SqlDatabase(this SupportedDatabases supported
/// Creates an upgrader for SQL Server databases.
/// </summary>
/// <param name="supported">Fluent helper type.</param>
/// <param name="connection">The sql connection.</param>
/// <param name="connectionFactory">A func that create a new SqlConnection</param>
/// <param name="schema">The SQL schema name to use. Defaults to 'dbo'.</param>
/// <returns>
/// A builder for a database upgrader designed for SQL Server databases.
/// </returns>
public static UpgradeEngineBuilder SqlDatabase(this SupportedDatabases supported, SqlConnection connection, string schema)
public static UpgradeEngineBuilder SqlDatabase(this SupportedDatabases supported, Func<SqlConnection> connectionFactory, string schema)
{
return SqlDatabase(new SqlConnectionManager(connection), schema);
return SqlDatabase(new SqlConnectionManager(connectionFactory), schema);
}

/// <summary>
Expand Down