From 26c1c553ad4d054bed972f4166f5af471d96f34a Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Mon, 29 Jul 2024 16:23:03 +1000 Subject: [PATCH] Changed case from `SQLite` to `Sqlite` https://github.com/DbUp/dbup-sqlite/issues/6 --- src/Sample/Program.cs | 14 +++--- .../NoPublicApiChanges.Run.approved.cs | 44 +++++++++---------- src/Tests/DatabaseSupportTests.cs | 6 +-- src/Tests/NoPublicApiChanges.cs | 4 +- ...eSupportTests.cs => SqliteSupportTests.cs} | 6 +-- ...nalTests.cs => SqliteTableJournalTests.cs} | 8 ++-- src/Tests/Tests.csproj | 2 +- ...eDatabase.cs => InMemorySqliteDatabase.cs} | 14 +++--- src/dbup-sqlite/Helpers/SharedConnection.cs | 2 +- ...Database.cs => TemporarySqliteDatabase.cs} | 10 ++--- ...nManager.cs => SqliteConnectionManager.cs} | 10 ++--- src/dbup-sqlite/SqliteExtensions.cs | 30 ++++++------- ...eObjectParser.cs => SqliteObjectParser.cs} | 6 +-- src/dbup-sqlite/SqlitePreprocessor.cs | 4 +- ...iptExecutor.cs => SqliteScriptExecutor.cs} | 10 ++--- ...eTableJournal.cs => SqliteTableJournal.cs} | 10 ++--- src/dbup-sqlite/dbup-sqlite.csproj | 2 +- 17 files changed, 91 insertions(+), 91 deletions(-) rename src/Tests/{SQLiteSupportTests.cs => SqliteSupportTests.cs} (84%) rename src/Tests/{SQLiteTableJournalTests.cs => SqliteTableJournalTests.cs} (91%) rename src/dbup-sqlite/Helpers/{InMemorySQLiteDatabase.cs => InMemorySqliteDatabase.cs} (81%) rename src/dbup-sqlite/Helpers/{TemporarySQLiteDatabase.cs => TemporarySqliteDatabase.cs} (88%) rename src/dbup-sqlite/{SQLiteConnectionManager.cs => SqliteConnectionManager.cs} (82%) rename src/dbup-sqlite/{SQLiteObjectParser.cs => SqliteObjectParser.cs} (62%) rename src/dbup-sqlite/{SQLiteScriptExecutor.cs => SqliteScriptExecutor.cs} (87%) rename src/dbup-sqlite/{SQLiteTableJournal.cs => SqliteTableJournal.cs} (84%) diff --git a/src/Sample/Program.cs b/src/Sample/Program.cs index 90bc3e8..e825c6d 100644 --- a/src/Sample/Program.cs +++ b/src/Sample/Program.cs @@ -1,6 +1,6 @@ using System; -namespace SQLiteSampleApplication +namespace SqliteSampleApplication { public static class Program { @@ -13,11 +13,11 @@ static void Main() static void InMemoryDb() { - using (var database = new DbUp.SQLite.Helpers.InMemorySQLiteDatabase()) + using (var database = new DbUp.Sqlite.Helpers.InMemorySqliteDatabase()) { var upgrader = DbUp.DeployChanges.To - .SQLiteDatabase(database.ConnectionString) + .SqliteDatabase(database.ConnectionString) .WithScriptsEmbeddedInAssembly(System.Reflection.Assembly.GetExecutingAssembly()) .LogToConsole() .Build(); @@ -34,11 +34,11 @@ static void InMemoryDb() static void TemporaryFileDb() { - using (var database = new DbUp.SQLite.Helpers.TemporarySQLiteDatabase("test.db")) + using (var database = new DbUp.Sqlite.Helpers.TemporarySqliteDatabase("test.db")) { var upgrader = DbUp.DeployChanges.To - .SQLiteDatabase(database.SharedConnection) + .SqliteDatabase(database.SharedConnection) .WithScriptsEmbeddedInAssembly(System.Reflection.Assembly.GetExecutingAssembly()) .LogToConsole() .Build(); @@ -57,11 +57,11 @@ static void PermanentFileDb() { Microsoft.Data.Sqlite.SqliteConnection connection = new("Data Source=dbup.db"); - using (var database = new DbUp.SQLite.Helpers.SharedConnection(connection)) + using (var database = new DbUp.Sqlite.Helpers.SharedConnection(connection)) { var upgrader = DbUp.DeployChanges .To - .SQLiteDatabase(connection.ConnectionString) + .SqliteDatabase(connection.ConnectionString) .WithScriptsEmbeddedInAssembly(System.Reflection.Assembly.GetExecutingAssembly()) .LogToConsole() .Build(); diff --git a/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs b/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs index b691b30..5d983b2 100644 --- a/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs +++ b/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs @@ -2,49 +2,49 @@ [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly: System.Runtime.InteropServices.GuidAttribute("9f949414-f078-49bf-b50e-a3859c18fb6e")] -public static class SQLiteExtensions +public static class SqliteExtensions { - public static DbUp.Builder.UpgradeEngineBuilder JournalToSQLiteTable(this DbUp.Builder.UpgradeEngineBuilder builder, string table) { } - public static DbUp.Builder.UpgradeEngineBuilder SQLiteDatabase(this DbUp.Builder.SupportedDatabases supported, string connectionString) { } - public static DbUp.Builder.UpgradeEngineBuilder SQLiteDatabase(this DbUp.Builder.SupportedDatabases supported, DbUp.SQLite.Helpers.SharedConnection sharedConnection) { } + public static DbUp.Builder.UpgradeEngineBuilder JournalToSqliteTable(this DbUp.Builder.UpgradeEngineBuilder builder, string table) { } + public static DbUp.Builder.UpgradeEngineBuilder SqliteDatabase(this DbUp.Builder.SupportedDatabases supported, string connectionString) { } + public static DbUp.Builder.UpgradeEngineBuilder SqliteDatabase(this DbUp.Builder.SupportedDatabases supported, DbUp.Sqlite.Helpers.SharedConnection sharedConnection) { } } -namespace DbUp.SQLite +namespace DbUp.Sqlite { - public class SQLiteConnectionManager : DbUp.Engine.Transactions.DatabaseConnectionManager, DbUp.Engine.Transactions.IConnectionManager + public class SqliteConnectionManager : DbUp.Engine.Transactions.DatabaseConnectionManager, DbUp.Engine.Transactions.IConnectionManager { - public SQLiteConnectionManager(string connectionString) { } - public SQLiteConnectionManager(DbUp.SQLite.Helpers.SharedConnection sharedConnection) { } + public SqliteConnectionManager(string connectionString) { } + public SqliteConnectionManager(DbUp.Sqlite.Helpers.SharedConnection sharedConnection) { } public override System.Collections.Generic.IEnumerable SplitScriptIntoCommands(string scriptContents) { } } - public class SQLiteObjectParser : DbUp.Support.SqlObjectParser, DbUp.Engine.ISqlObjectParser + public class SqliteObjectParser : DbUp.Support.SqlObjectParser, DbUp.Engine.ISqlObjectParser { - public SQLiteObjectParser() { } + public SqliteObjectParser() { } } - public class SQLitePreprocessor : DbUp.Engine.IScriptPreprocessor + public class SqlitePreprocessor : DbUp.Engine.IScriptPreprocessor { - public SQLitePreprocessor() { } + public SqlitePreprocessor() { } public string Process(string contents) { } } - public class SQLiteScriptExecutor : DbUp.Support.ScriptExecutor, DbUp.Engine.IScriptExecutor + public class SqliteScriptExecutor : DbUp.Support.ScriptExecutor, DbUp.Engine.IScriptExecutor { - public SQLiteScriptExecutor(System.Func connectionManagerFactory, System.Func log, string schema, System.Func variablesEnabled, System.Collections.Generic.IEnumerable scriptPreprocessors, System.Func journalFactory) { } + public SqliteScriptExecutor(System.Func connectionManagerFactory, System.Func log, string schema, System.Func variablesEnabled, System.Collections.Generic.IEnumerable scriptPreprocessors, System.Func journalFactory) { } protected override void ExecuteCommandsWithinExceptionHandler(int index, DbUp.Engine.SqlScript script, System.Action executeCommand) { } protected override string GetVerifySchemaSql(string schema) { } } - public class SQLiteTableJournal : DbUp.Support.TableJournal, DbUp.Engine.IJournal + public class SqliteTableJournal : DbUp.Support.TableJournal, DbUp.Engine.IJournal { - public SQLiteTableJournal(System.Func connectionManager, System.Func logger, string table) { } + public SqliteTableJournal(System.Func connectionManager, System.Func logger, string table) { } protected override string CreateSchemaTableSql(string quotedPrimaryKeyName) { } protected override string DoesTableExistSql() { } protected override string GetInsertJournalEntrySql(string scriptName, string applied) { } protected override string GetJournalEntriesSql() { } } } -namespace DbUp.SQLite.Helpers +namespace DbUp.Sqlite.Helpers { - public class InMemorySQLiteDatabase : System.IDisposable + public class InMemorySqliteDatabase : System.IDisposable { - public InMemorySQLiteDatabase() { } + public InMemorySqliteDatabase() { } public string ConnectionString { get; set; } public DbUp.Helpers.AdHocSqlRunner SqlRunner { get; } public void Dispose() { } @@ -66,10 +66,10 @@ public void Dispose() { } public void DoClose() { } public void Open() { } } - public class TemporarySQLiteDatabase : System.IDisposable + public class TemporarySqliteDatabase : System.IDisposable { - public TemporarySQLiteDatabase(string name) { } - public DbUp.SQLite.Helpers.SharedConnection SharedConnection { get; } + public TemporarySqliteDatabase(string name) { } + public DbUp.Sqlite.Helpers.SharedConnection SharedConnection { get; } public DbUp.Helpers.AdHocSqlRunner SqlRunner { get; } public void Dispose() { } } diff --git a/src/Tests/DatabaseSupportTests.cs b/src/Tests/DatabaseSupportTests.cs index 6fd3237..f56b0c5 100644 --- a/src/Tests/DatabaseSupportTests.cs +++ b/src/Tests/DatabaseSupportTests.cs @@ -1,7 +1,7 @@ using DbUp.Builder; using DbUp.Tests.Common; -namespace DbUp.SQLite.Tests; +namespace DbUp.Sqlite.Tests; public class DatabaseSupportTests : DatabaseSupportTestsBase { @@ -10,11 +10,11 @@ public DatabaseSupportTests() : base() } protected override UpgradeEngineBuilder DeployTo(SupportedDatabases to) - => to.SQLiteDatabase(""); + => to.SqliteDatabase(""); protected override UpgradeEngineBuilder AddCustomNamedJournalToBuilder(UpgradeEngineBuilder builder, string schema, string tableName) => builder.JournalTo( (connectionManagerFactory, logFactory) - => new SQLiteTableJournal(connectionManagerFactory, logFactory, tableName) + => new SqliteTableJournal(connectionManagerFactory, logFactory, tableName) ); } diff --git a/src/Tests/NoPublicApiChanges.cs b/src/Tests/NoPublicApiChanges.cs index 81e81d9..7d86fb2 100644 --- a/src/Tests/NoPublicApiChanges.cs +++ b/src/Tests/NoPublicApiChanges.cs @@ -1,11 +1,11 @@ using DbUp.Tests.Common; -namespace DbUp.SQLite.Tests; +namespace DbUp.Sqlite.Tests; public class NoPublicApiChanges : NoPublicApiChangesBase { public NoPublicApiChanges() - : base(typeof(SQLiteExtensions).Assembly) + : base(typeof(SqliteExtensions).Assembly) { } } diff --git a/src/Tests/SQLiteSupportTests.cs b/src/Tests/SqliteSupportTests.cs similarity index 84% rename from src/Tests/SQLiteSupportTests.cs rename to src/Tests/SqliteSupportTests.cs index 0b32f7d..b1880bc 100644 --- a/src/Tests/SQLiteSupportTests.cs +++ b/src/Tests/SqliteSupportTests.cs @@ -2,9 +2,9 @@ using Shouldly; using Xunit; -namespace DbUp.SQLite.Tests +namespace DbUp.Sqlite.Tests { - public class SQLiteSupportTests + public class SqliteSupportTests { static readonly string dbFilePath = Path.Combine(Environment.CurrentDirectory, "test.db"); @@ -14,7 +14,7 @@ public void CanUseSQLite() var connectionString = $"Data Source={dbFilePath}"; var upgrader = DeployChanges.To - .SQLiteDatabase(connectionString) + .SqliteDatabase(connectionString) .WithScript("Script0001", "CREATE TABLE IF NOT EXISTS Foo (Id int)") .Build(); diff --git a/src/Tests/SQLiteTableJournalTests.cs b/src/Tests/SqliteTableJournalTests.cs similarity index 91% rename from src/Tests/SQLiteTableJournalTests.cs rename to src/Tests/SqliteTableJournalTests.cs index 151aed8..cdf7c59 100644 --- a/src/Tests/SQLiteTableJournalTests.cs +++ b/src/Tests/SqliteTableJournalTests.cs @@ -8,9 +8,9 @@ using Shouldly; using Xunit; -namespace DbUp.SQLite.Tests +namespace DbUp.Sqlite.Tests { - public class SQLiteTableJournalTests + public class SqliteTableJournalTests { [Fact] public void dbversion_is_zero_when_journal_table_not_exist() @@ -22,7 +22,7 @@ public void dbversion_is_zero_when_journal_table_not_exist() var connectionManager = Substitute.For(); command.ExecuteScalar().Returns(x => { throw new SqliteException("table not found", 0); }); var consoleUpgradeLog = new ConsoleUpgradeLog(); - var journal = new SQLiteTableJournal(() => connectionManager, () => consoleUpgradeLog, "SchemaVersions"); + var journal = new SqliteTableJournal(() => connectionManager, () => consoleUpgradeLog, "SchemaVersions"); // When var scripts = journal.GetExecutedScripts(); @@ -47,7 +47,7 @@ public void creates_a_new_journal_table_when_not_exist() command.CreateParameter().Returns(param1, param2); command.ExecuteScalar().Returns(x => 0); var consoleUpgradeLog = new ConsoleUpgradeLog(); - var journal = new SQLiteTableJournal(() => connectionManager, () => consoleUpgradeLog, "SchemaVersions"); + var journal = new SqliteTableJournal(() => connectionManager, () => consoleUpgradeLog, "SchemaVersions"); // When journal.StoreExecutedScript(new SqlScript("test", "select 1"), () => command); diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index 137ec2f..0935f6e 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -3,7 +3,7 @@ net8 Tests - DbUp.SQLite.Tests + DbUp.Sqlite.Tests enable enable diff --git a/src/dbup-sqlite/Helpers/InMemorySQLiteDatabase.cs b/src/dbup-sqlite/Helpers/InMemorySqliteDatabase.cs similarity index 81% rename from src/dbup-sqlite/Helpers/InMemorySQLiteDatabase.cs rename to src/dbup-sqlite/Helpers/InMemorySqliteDatabase.cs index 8e3dfb3..1e65768 100644 --- a/src/dbup-sqlite/Helpers/InMemorySQLiteDatabase.cs +++ b/src/dbup-sqlite/Helpers/InMemorySqliteDatabase.cs @@ -4,20 +4,20 @@ using Microsoft.Data.Sqlite; -namespace DbUp.SQLite.Helpers +namespace DbUp.Sqlite.Helpers { /// /// Used to create in-memory SQLite database that is deleted at the end of a test. /// - public class InMemorySQLiteDatabase : IDisposable + public class InMemorySqliteDatabase : IDisposable { - readonly SQLiteConnectionManager connectionManager; + readonly SqliteConnectionManager connectionManager; readonly SqliteConnection sharedConnection; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public InMemorySQLiteDatabase() + public InMemorySqliteDatabase() { var connectionStringBuilder = new SqliteConnectionStringBuilder { @@ -26,10 +26,10 @@ public InMemorySQLiteDatabase() }; ConnectionString = connectionStringBuilder.ToString(); - connectionManager = new SQLiteConnectionManager(connectionStringBuilder.ConnectionString); + connectionManager = new SqliteConnectionManager(connectionStringBuilder.ConnectionString); sharedConnection = new SqliteConnection(connectionStringBuilder.ConnectionString); sharedConnection.Open(); - SqlRunner = new AdHocSqlRunner(() => sharedConnection.CreateCommand(), new SQLiteObjectParser(), null, () => true); + SqlRunner = new AdHocSqlRunner(() => sharedConnection.CreateCommand(), new SqliteObjectParser(), null, () => true); } public string ConnectionString { get; set; } diff --git a/src/dbup-sqlite/Helpers/SharedConnection.cs b/src/dbup-sqlite/Helpers/SharedConnection.cs index 823996c..3540479 100644 --- a/src/dbup-sqlite/Helpers/SharedConnection.cs +++ b/src/dbup-sqlite/Helpers/SharedConnection.cs @@ -1,7 +1,7 @@ using System; using System.Data; -namespace DbUp.SQLite.Helpers +namespace DbUp.Sqlite.Helpers { /// /// A database connection wrapper to manage underlying connection as a shared connection diff --git a/src/dbup-sqlite/Helpers/TemporarySQLiteDatabase.cs b/src/dbup-sqlite/Helpers/TemporarySqliteDatabase.cs similarity index 88% rename from src/dbup-sqlite/Helpers/TemporarySQLiteDatabase.cs rename to src/dbup-sqlite/Helpers/TemporarySqliteDatabase.cs index 80cbac3..2626f03 100644 --- a/src/dbup-sqlite/Helpers/TemporarySQLiteDatabase.cs +++ b/src/dbup-sqlite/Helpers/TemporarySqliteDatabase.cs @@ -4,21 +4,21 @@ using Microsoft.Data.Sqlite; -namespace DbUp.SQLite.Helpers +namespace DbUp.Sqlite.Helpers { /// /// Used to create SQLite databases that are deleted at the end of a test. /// - public class TemporarySQLiteDatabase : IDisposable + public class TemporarySqliteDatabase : IDisposable { readonly string dataSourcePath; readonly SqliteConnection sqLiteConnection; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The name. - public TemporarySQLiteDatabase(string name) + public TemporarySqliteDatabase(string name) { dataSourcePath = Path.Combine(Directory.GetCurrentDirectory(), name); @@ -31,7 +31,7 @@ public TemporarySQLiteDatabase(string name) sqLiteConnection = new SqliteConnection(connectionStringBuilder.ConnectionString); sqLiteConnection.Open(); SharedConnection = new SharedConnection(sqLiteConnection); - SqlRunner = new AdHocSqlRunner(() => sqLiteConnection.CreateCommand(), new SQLiteObjectParser(), null, () => true); + SqlRunner = new AdHocSqlRunner(() => sqLiteConnection.CreateCommand(), new SqliteObjectParser(), null, () => true); } /// diff --git a/src/dbup-sqlite/SQLiteConnectionManager.cs b/src/dbup-sqlite/SqliteConnectionManager.cs similarity index 82% rename from src/dbup-sqlite/SQLiteConnectionManager.cs rename to src/dbup-sqlite/SqliteConnectionManager.cs index 133ec6e..af3191b 100644 --- a/src/dbup-sqlite/SQLiteConnectionManager.cs +++ b/src/dbup-sqlite/SqliteConnectionManager.cs @@ -2,27 +2,27 @@ using System.Linq; using System.Text.RegularExpressions; using DbUp.Engine.Transactions; -using DbUp.SQLite.Helpers; +using DbUp.Sqlite.Helpers; using Microsoft.Data.Sqlite; -namespace DbUp.SQLite +namespace DbUp.Sqlite { /// /// Connection manager for Sql Lite /// - public class SQLiteConnectionManager : DatabaseConnectionManager + public class SqliteConnectionManager : DatabaseConnectionManager { /// /// Creates new SQLite Connection Manager /// - public SQLiteConnectionManager(string connectionString) : base(l => new SqliteConnection(connectionString)) + public SqliteConnectionManager(string connectionString) : base(l => new SqliteConnection(connectionString)) { } /// /// Creates new SQLite Connection Manager /// - public SQLiteConnectionManager(SharedConnection sharedConnection) : base(l => sharedConnection) + public SqliteConnectionManager(SharedConnection sharedConnection) : base(l => sharedConnection) { } diff --git a/src/dbup-sqlite/SqliteExtensions.cs b/src/dbup-sqlite/SqliteExtensions.cs index b72c0f8..7c35462 100644 --- a/src/dbup-sqlite/SqliteExtensions.cs +++ b/src/dbup-sqlite/SqliteExtensions.cs @@ -1,6 +1,6 @@ using DbUp.Builder; -using DbUp.SQLite; -using DbUp.SQLite.Helpers; +using DbUp.Sqlite; +using DbUp.Sqlite.Helpers; /// /// Configuration extension methods for SQLite (see http://www.sqlite.org/) @@ -9,7 +9,7 @@ // Since the class just contains extension methods, we leave it in the root so that it is always discovered // and people don't have to manually add using statements. // ReSharper disable CheckNamespace -public static class SQLiteExtensions +public static class SqliteExtensions // ReSharper restore CheckNamespace { /// @@ -20,14 +20,14 @@ public static class SQLiteExtensions /// /// A builder for a database upgrader designed for SQLite databases. /// - public static UpgradeEngineBuilder SQLiteDatabase(this SupportedDatabases supported, string connectionString) + public static UpgradeEngineBuilder SqliteDatabase(this SupportedDatabases supported, string connectionString) { var builder = new UpgradeEngineBuilder(); - 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 SQLiteScriptExecutor(() => c.ConnectionManager, () => c.Log, null, + 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 SqliteScriptExecutor(() => c.ConnectionManager, () => c.Log, null, () => c.VariablesEnabled, c.ScriptPreprocessors, () => c.Journal)); - builder.WithPreprocessor(new SQLitePreprocessor()); + builder.WithPreprocessor(new SqlitePreprocessor()); return builder; } @@ -39,14 +39,14 @@ public static UpgradeEngineBuilder SQLiteDatabase(this SupportedDatabases suppor /// /// A builder for a database upgrader designed for SQLite databases. /// - public static UpgradeEngineBuilder SQLiteDatabase(this SupportedDatabases supported, SharedConnection sharedConnection) + public static UpgradeEngineBuilder SqliteDatabase(this SupportedDatabases supported, SharedConnection sharedConnection) { var builder = new UpgradeEngineBuilder(); - 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 SQLiteScriptExecutor(() => c.ConnectionManager, () => c.Log, null, + 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 SqliteScriptExecutor(() => c.ConnectionManager, () => c.Log, null, () => c.VariablesEnabled, c.ScriptPreprocessors, () => c.Journal)); - builder.WithPreprocessor(new SQLitePreprocessor()); + builder.WithPreprocessor(new SqlitePreprocessor()); return builder; } @@ -55,9 +55,9 @@ public static UpgradeEngineBuilder SQLiteDatabase(this SupportedDatabases suppor /// /// The name of the table used to store the list of executed scripts. /// The used to set the journal table name. - public static UpgradeEngineBuilder JournalToSQLiteTable(this UpgradeEngineBuilder builder, string table) + public static UpgradeEngineBuilder JournalToSqliteTable(this UpgradeEngineBuilder builder, string table) { - builder.Configure(c => c.Journal = new SQLiteTableJournal(() => c.ConnectionManager, () => c.Log, table)); + builder.Configure(c => c.Journal = new SqliteTableJournal(() => c.ConnectionManager, () => c.Log, table)); return builder; } } diff --git a/src/dbup-sqlite/SQLiteObjectParser.cs b/src/dbup-sqlite/SqliteObjectParser.cs similarity index 62% rename from src/dbup-sqlite/SQLiteObjectParser.cs rename to src/dbup-sqlite/SqliteObjectParser.cs index 71d6320..2d674d6 100644 --- a/src/dbup-sqlite/SQLiteObjectParser.cs +++ b/src/dbup-sqlite/SqliteObjectParser.cs @@ -1,13 +1,13 @@ using DbUp.Support; -namespace DbUp.SQLite +namespace DbUp.Sqlite { /// /// Parses Sql Objects and performs quoting functions. /// - public class SQLiteObjectParser : SqlObjectParser + public class SqliteObjectParser : SqlObjectParser { - public SQLiteObjectParser() + public SqliteObjectParser() : base("[", "]") { } diff --git a/src/dbup-sqlite/SqlitePreprocessor.cs b/src/dbup-sqlite/SqlitePreprocessor.cs index 7efb51f..6cbd668 100644 --- a/src/dbup-sqlite/SqlitePreprocessor.cs +++ b/src/dbup-sqlite/SqlitePreprocessor.cs @@ -1,12 +1,12 @@ using System.Text.RegularExpressions; using DbUp.Engine; -namespace DbUp.SQLite +namespace DbUp.Sqlite { /// /// This preprocessor makes adjustments to your sql to make it compatible with Sqlite /// - public class SQLitePreprocessor : IScriptPreprocessor + public class SqlitePreprocessor : IScriptPreprocessor { /// /// Performs some preprocessing step on a SQLite script diff --git a/src/dbup-sqlite/SQLiteScriptExecutor.cs b/src/dbup-sqlite/SqliteScriptExecutor.cs similarity index 87% rename from src/dbup-sqlite/SQLiteScriptExecutor.cs rename to src/dbup-sqlite/SqliteScriptExecutor.cs index d966615..9b0ed03 100644 --- a/src/dbup-sqlite/SQLiteScriptExecutor.cs +++ b/src/dbup-sqlite/SqliteScriptExecutor.cs @@ -6,15 +6,15 @@ using DbUp.Support; using Microsoft.Data.Sqlite; -namespace DbUp.SQLite +namespace DbUp.Sqlite { /// /// An implementation of that executes against a SQLite database. /// - public class SQLiteScriptExecutor : ScriptExecutor + public class SqliteScriptExecutor : ScriptExecutor { /// - /// Initializes an instance of the class. + /// Initializes an instance of the class. /// /// /// The logging mechanism. @@ -22,9 +22,9 @@ public class SQLiteScriptExecutor : ScriptExecutor /// Function that returns true if variables should be replaced, false otherwise. /// Script Preprocessors in addition to variable substitution /// Database journal - public SQLiteScriptExecutor(Func connectionManagerFactory, Func log, string schema, Func variablesEnabled, + public SqliteScriptExecutor(Func connectionManagerFactory, Func log, string schema, Func variablesEnabled, IEnumerable scriptPreprocessors, Func journalFactory) - : base(connectionManagerFactory, new SQLiteObjectParser(), log, schema, variablesEnabled, scriptPreprocessors, journalFactory) + : base(connectionManagerFactory, new SqliteObjectParser(), log, schema, variablesEnabled, scriptPreprocessors, journalFactory) { } diff --git a/src/dbup-sqlite/SQLiteTableJournal.cs b/src/dbup-sqlite/SqliteTableJournal.cs similarity index 84% rename from src/dbup-sqlite/SQLiteTableJournal.cs rename to src/dbup-sqlite/SqliteTableJournal.cs index a3a4714..92c6d23 100644 --- a/src/dbup-sqlite/SQLiteTableJournal.cs +++ b/src/dbup-sqlite/SqliteTableJournal.cs @@ -4,19 +4,19 @@ using DbUp.Engine.Transactions; using DbUp.Support; -namespace DbUp.SQLite +namespace DbUp.Sqlite { /// /// An implementation of the interface which tracks version numbers for a /// SQLite database using a table called SchemaVersions. /// - public class SQLiteTableJournal : TableJournal + public class SqliteTableJournal : TableJournal { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public SQLiteTableJournal(Func connectionManager, Func logger, string table) : - base(connectionManager, logger, new SQLiteObjectParser(), null, table) + public SqliteTableJournal(Func connectionManager, Func logger, string table) : + base(connectionManager, logger, new SqliteObjectParser(), null, table) { } protected override string GetInsertJournalEntrySql(string @scriptName, string @applied) diff --git a/src/dbup-sqlite/dbup-sqlite.csproj b/src/dbup-sqlite/dbup-sqlite.csproj index 8ad197e..2b4c830 100644 --- a/src/dbup-sqlite/dbup-sqlite.csproj +++ b/src/dbup-sqlite/dbup-sqlite.csproj @@ -8,7 +8,7 @@ Copyright © DbUp Contributors 2015 netstandard2.0 dbup-sqlite - DbUp.SQLite + DbUp.Sqlite dbup-sqlite ../dbup.snk true