Extracted data access helpers and migration support to Weasel.

Closes GH-1467. Closes GH-1646. Closes GH-1803

docker-compose.yml

@@ -8,4 +8,5 @@ services:
       POSTGRES_PASSWORD: postgres
       POSTGRES_USER: postgres
       POSTGRES_DB: marten_testing
+      NAMEDATALEN: 100
 

src/AspNetCoreWithMarten/Samples/ByNestedClosure/Startup.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Weasel.Postgresql;
 
 namespace AspNetCoreWithMarten.Samples.ByNestedClosure
 {

src/AspNetCoreWithMarten/Samples/ByStoreOptions/Startup.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Weasel.Postgresql;
 
 namespace AspNetCoreWithMarten.Samples.ByStoreOptions
 {

src/AspNetCoreWithMarten/Samples/ConfiguringSessionCreation/Startup.cs

@@ -1,17 +1,14 @@
-using System;
 using System.Data;
 using Marten;
-using Marten.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Npgsql;
+using Weasel.Postgresql;
 
 namespace AspNetCoreWithMarten.Samples.ConfiguringSessionCreation
 {
-
     #region sample_CustomSessionFactory
+
     public class CustomSessionFactory: ISessionFactory
     {
         private readonly IDocumentStore _store;
@@ -37,35 +34,37 @@ public IDocumentSession OpenSession()
             return _store.LightweightSession(IsolationLevel.Serializable);
         }
     }
+
     #endregion sample_CustomSessionFactory
 
     #region sample_AddMartenWithCustomSessionCreation
+
     public class Startup
     {
-        public IConfiguration Configuration { get; }
-        public IHostEnvironment Hosting { get; }
-
         public Startup(IConfiguration configuration, IHostEnvironment hosting)
         {
             Configuration = configuration;
             Hosting = hosting;
         }
 
+        public IConfiguration Configuration { get; }
+        public IHostEnvironment Hosting { get; }
+
         public void ConfigureServices(IServiceCollection services)
         {
             var connectionString = Configuration.GetConnectionString("postgres");
 
             services.AddMarten(opts =>
-            {
-                opts.Connection(connectionString);
-
-                // Use the more permissive schema auto create behavior
-                // while in development
-                if (Hosting.IsDevelopment())
                 {
-                    opts.AutoCreateSchemaObjects = AutoCreate.All;
-                }
-            })
+                    opts.Connection(connectionString);
+
+                    // Use the more permissive schema auto create behavior
+                    // while in development
+                    if (Hosting.IsDevelopment())
+                    {
+                        opts.AutoCreateSchemaObjects = AutoCreate.All;
+                    }
+                })
 
                 // Chained helper to replace the built in
                 // session factory behavior
@@ -74,5 +73,6 @@ public void ConfigureServices(IServiceCollection services)
 
         // And other methods we don't care about here...
     }
+
     #endregion sample_AddMartenWithCustomSessionCreation
 }

src/AspNetCoreWithMarten/Samples/PerScopeSessionCreation/Startup.cs

@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Npgsql;
+using Weasel.Postgresql;
 
 namespace AspNetCoreWithMarten.Samples.PerScopeSessionCreation
 {

src/AspNetCoreWithMarten/Startup.cs

@@ -1,19 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Marten;
-using Marten.Events.Daemon.Resiliency;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Weasel.Postgresql;
 
 namespace AspNetCoreWithMarten
 {
     #region sample_StartupConfigureServices
+
     public class Startup
     {
         public IConfiguration Configuration { get; }
@@ -46,6 +43,7 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         // and other methods we don't care about right now...
+
         #endregion sample_StartupConfigureServices
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

src/CommandLineRunner/Program.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Marten;
 using Marten.AsyncDaemon.Testing;
@@ -9,6 +6,7 @@
 using Marten.Testing.Harness;
 using Microsoft.Extensions.Hosting;
 using Oakton;
+using Weasel.Postgresql;
 
 namespace CommandLineRunner
 {
@@ -19,8 +17,9 @@ public static Task<int> Main(string[] args)
             return CreateHostBuilder(args).RunOaktonCommands(args);
         }
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
+        public static IHostBuilder CreateHostBuilder(string[] args)
+        {
+            return Host.CreateDefaultBuilder(args)
                 .ConfigureServices((hostContext, services) =>
                 {
                     services.AddMarten(opts =>
@@ -34,5 +33,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                         opts.Events.Projections.Add(new DistanceProjection(), ProjectionLifecycle.Async);
                     });
                 });
+        }
     }
 }

src/EventPublisher/Program.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Timers;
 using Baseline.Dates;
 using Marten;
 using Marten.AsyncDaemon.Testing.TestingSupport;
 using Marten.Testing.Harness;
+using Weasel.Postgresql;
 
 namespace EventPublisher
 {

src/EventSourceWorker/Program.cs

@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Marten;
 using Marten.AsyncDaemon.Testing.TestingSupport;
 using Marten.Events.Daemon.Resiliency;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Weasel.Postgresql;
 
 namespace EventSourceWorker
 {

src/Marten.AsyncDaemon.Testing/HighWaterDetectorTests.cs

@@ -5,6 +5,7 @@
 using Marten.AsyncDaemon.Testing.TestingSupport;
 using Marten.Events;
 using Marten.Events.Daemon.HighWater;
+using Weasel.Postgresql;
 using Marten.Services;
 using Marten.Util;
 using NpgsqlTypes;

src/Marten.CommandLine.Testing/ApplyThenAssertSmokeTests.cs

@@ -0,0 +1,33 @@
+using System.Threading.Tasks;
+using Marten.CommandLine.Commands;
+using Marten.Testing.Documents;
+using Marten.Testing.Harness;
+using Microsoft.Extensions.Hosting;
+using Xunit;
+
+namespace Marten.CommandLine.Testing
+{
+    public class ApplyThenAssertSmokeTests
+    {
+        [Fact]
+        public async Task do_it_all()
+        {
+            var options = new StoreOptions();
+            options.Connection(ConnectionSource.ConnectionString);
+            options.Schema.For<User>();
+            options.Schema.For<Target>();
+
+            await new DocumentStore(options).Advanced.Clean.CompletelyRemoveAllAsync();
+
+            await new ApplyCommand().Execute(new MartenInput
+            {
+                HostBuilder = new HostBuilder().ConfigureServices(x => x.AddMarten(options))
+            });
+
+            await new AssertCommand().Execute(new MartenInput
+            {
+                HostBuilder = new HostBuilder().ConfigureServices(x => x.AddMarten(options))
+            });
+        }
+    }
+}

src/Marten.CommandLine.Testing/AssemblyInfo.cs

@@ -0,0 +1,2 @@
+using Xunit;
+[assembly: CollectionBehavior(DisableTestParallelization = true)]

src/Marten.CommandLine.Testing/DumpCommandSmokeTests.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
 using Baseline;
 using Marten.CommandLine.Commands.Dump;
 using Marten.Testing.Documents;
@@ -12,7 +13,7 @@ namespace Marten.CommandLine.Testing
     public class DumpCommandSmokeTests
     {
         [Fact]
-        public void can_clean_repeatedly_for_directory()
+        public async Task can_clean_repeatedly_for_directory()
         {
             var options = new StoreOptions();
             options.Connection(ConnectionSource.ConnectionString);
@@ -27,15 +28,15 @@ public void can_clean_repeatedly_for_directory()
 
             };
 
-            new DumpCommand().Execute(input);
+            await new DumpCommand().Execute(input);
             Thread.Sleep(100); // Let the file system calm down
 
             input.HostBuilder = new HostBuilder().ConfigureServices(x => x.AddMarten(options));
-            new DumpCommand().Execute(input);
+            await new DumpCommand().Execute(input);
         }
 
         [Fact]
-        public void can_clean_repeatedly_for_file()
+        public async Task can_clean_repeatedly_for_file()
         {
             var options = new StoreOptions();
             options.Connection(ConnectionSource.ConnectionString);
@@ -52,11 +53,11 @@ public void can_clean_repeatedly_for_file()
 
             };
 
-            new DumpCommand().Execute(input);
+            await new DumpCommand().Execute(input);
             Thread.Sleep(100); // Let the file system calm down
 
             input.HostBuilder = new HostBuilder().ConfigureServices(x => x.AddMarten(options));
-            new DumpCommand().Execute(input);
+            await new DumpCommand().Execute(input);
         }
     }
 }

src/Marten.CommandLine.Testing/PatchCommandSmokeTests.cs

@@ -0,0 +1,35 @@
+using System.IO;
+using System.Reflection.Metadata;
+using System.Threading.Tasks;
+using Baseline;
+using Marten.CommandLine.Commands.Patch;
+using Marten.Testing.Documents;
+using Marten.Testing.Harness;
+using Microsoft.Extensions.Hosting;
+using Xunit;
+
+namespace Marten.CommandLine.Testing
+{
+    public class PatchCommandSmokeTests
+    {
+
+        [Fact]
+        public async Task can_write_both_files()
+        {
+            var options = new StoreOptions();
+            options.Connection(ConnectionSource.ConnectionString);
+            options.Schema.For<User>();
+            options.Schema.For<Target>();
+
+            var input = new PatchInput()
+            {
+                HostBuilder = new HostBuilder().ConfigureServices(x => x.AddMarten(options)),
+                FileName = Path.GetTempPath().AppendPath("dump1.sql"),
+
+
+            };
+
+            await new PatchCommand().Execute(input);
+        }
+    }
+}

src/Marten.CommandLine/Commands/ApplyCommand.cs

@@ -1,16 +1,17 @@
 using System;
+using System.Threading.Tasks;
 using Oakton;
 
 namespace Marten.CommandLine.Commands
 {
     [Description("Applies all outstanding changes to the database based on the current configuration", Name = "marten-apply")]
     public class ApplyCommand: MartenCommand<MartenInput>
     {
-        protected override bool execute(IDocumentStore store, MartenInput input)
+        protected override async Task<bool> execute(IDocumentStore store, MartenInput input)
         {
             try
             {
-                store.Schema.ApplyAllConfiguredChangesToDatabase();
+                await store.Schema.ApplyAllConfiguredChangesToDatabase();
 
                 input.WriteLine(ConsoleColor.Green, "Successfully applied outstanding database changes");
                 return true;

src/Marten.CommandLine/Commands/AssertCommand.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Marten.Exceptions;
 using Marten.Schema;
 using Oakton;
@@ -8,11 +9,11 @@ namespace Marten.CommandLine.Commands
     [Description("Assert that the existing database matches the current Marten configuration", Name = "marten-assert")]
     public class AssertCommand: MartenCommand<MartenInput>
     {
-        protected override bool execute(IDocumentStore store, MartenInput input)
+        protected override async Task<bool> execute(IDocumentStore store, MartenInput input)
         {
             try
             {
-                store.Schema.AssertDatabaseMatchesConfiguration();
+                await store.Schema.AssertDatabaseMatchesConfiguration();
 
                 input.WriteLine(ConsoleColor.Green, "No database differences detected.");