diff --git a/util/Migrator/RerunableSqlTableJournal.cs b/util/Migrator/RerunableSqlTableJournal.cs deleted file mode 100644 index 34eedd8344..0000000000 --- a/util/Migrator/RerunableSqlTableJournal.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Data; -using DbUp.Engine; -using DbUp.Engine.Output; -using DbUp.Engine.Transactions; -using DbUp.SqlServer; -using DbUp.Support; - -namespace Bit.Migrator; - -public class RerunableSqlTableJournal : TableJournal -{ - - public RerunableSqlTableJournal(Func connectionManager, Func logger, string schema, string table) - : base(connectionManager, logger, new SqlServerObjectParser(), schema, table) - { - } - - protected new IDbCommand GetInsertScriptCommand(Func dbCommandFactory, SqlScript script) - { - var command = dbCommandFactory(); - - var scriptNameParam = command.CreateParameter(); - scriptNameParam.ParameterName = "scriptName"; - scriptNameParam.Value = script.Name; - command.Parameters.Add(scriptNameParam); - - var appliedParam = command.CreateParameter(); - appliedParam.ParameterName = "applied"; - appliedParam.Value = DateTime.Now; - command.Parameters.Add(appliedParam); - - command.CommandText = GetInsertJournalEntrySql("@scriptName", "@applied"); - command.CommandType = CommandType.Text; - return command; - } - - protected override string GetInsertJournalEntrySql(string @scriptName, string @applied) - { - return $"insert into {FqSchemaTableName} (ScriptName, Applied) values ({@scriptName}, {@applied})"; - } - - protected override string GetJournalEntriesSql() - { - return $"select [ScriptName] from {FqSchemaTableName} order by [ScriptName]"; - } - - protected override string CreateSchemaTableSql(string quotedPrimaryKeyName) - { - return -$@"create table {FqSchemaTableName} ( - [Id] int identity(1,1) not null constraint {quotedPrimaryKeyName} primary key, - [ScriptName] nvarchar(255) not null, - [Applied] datetime not null -)"; - } -} diff --git a/util/Migrator/SqlTableJournalExtensions.cs b/util/Migrator/SqlTableJournalExtensions.cs index e791064b3a..f3fa76824d 100644 --- a/util/Migrator/SqlTableJournalExtensions.cs +++ b/util/Migrator/SqlTableJournalExtensions.cs @@ -10,3 +10,51 @@ public static class SqlTableJournalExtensions return builder; } } + +public class RerunableSqlTableJournal : TableJournal +{ + + public RerunableSqlTableJournal(Func connectionManager, Func logger, string schema, string table) + : base(connectionManager, logger, new SqlServerObjectParser(), schema, table) + { + } + + protected new IDbCommand GetInsertScriptCommand(Func dbCommandFactory, SqlScript script) + { + var command = dbCommandFactory(); + + var scriptNameParam = command.CreateParameter(); + scriptNameParam.ParameterName = "scriptName"; + scriptNameParam.Value = script.Name; + command.Parameters.Add(scriptNameParam); + + var appliedParam = command.CreateParameter(); + appliedParam.ParameterName = "applied"; + appliedParam.Value = DateTime.Now; + command.Parameters.Add(appliedParam); + + command.CommandText = GetInsertJournalEntrySql("@scriptName", "@applied"); + command.CommandType = CommandType.Text; + return command; + } + + protected override string GetInsertJournalEntrySql(string @scriptName, string @applied) + { + return $"insert into {FqSchemaTableName} (ScriptName, Applied) values ({@scriptName}, {@applied})"; + } + + protected override string GetJournalEntriesSql() + { + return $"select [ScriptName] from {FqSchemaTableName} order by [ScriptName]"; + } + + protected override string CreateSchemaTableSql(string quotedPrimaryKeyName) + { + return +$@"create table {FqSchemaTableName} ( + [Id] int identity(1,1) not null constraint {quotedPrimaryKeyName} primary key, + [ScriptName] nvarchar(255) not null, + [Applied] datetime not null +)"; + } +}