Initial set of changes adding support for NpgsqlDataSource support

docs/configuration/storeoptions.md

@@ -15,7 +15,7 @@ public static DocumentStore For(Action<StoreOptions> configure)
     return new DocumentStore(options);
 }
 ```
-<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten/DocumentStore.cs#L508-L518' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_documentstore.for' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten/DocumentStore.cs#L512-L522' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_documentstore.for' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 The major parts of `StoreOptions` are shown in the class diagram below:

docs/documents/plv8.md

@@ -303,7 +303,8 @@ The `Patch.Remove()` operation removes the given item from a child collection:
 <!-- snippet: sample_remove_primitive_element -->
 <a id='snippet-sample_remove_primitive_element'></a>
 ```cs
-[Fact]public void remove_primitive_element()
+[Fact]
+public void remove_primitive_element()
 {
     var random = new Random();
     var target = Target.Random();

docs/documents/querying/linq/booleans.md

@@ -20,5 +20,5 @@ public void query_by_booleans(IDocumentSession session)
     session.Query<Target>().Where(x => x.Flag == false).ToArray();
 }
 ```
-<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L154-L170' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_boolean_queries' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L158-L174' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_boolean_queries' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->

docs/documents/querying/linq/nulls.md

@@ -15,5 +15,5 @@ public void query_by_nullable_type_nulls(IDocumentSession session)
     session.Query<Target>().Where(x => x.Inner == null);
 }
 ```
-<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L172-L183' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_query_by_nullable_types' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L176-L187' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_query_by_nullable_types' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->

docs/documents/querying/linq/operators.md

@@ -33,7 +33,7 @@ public void select_a_single_value(IDocumentSession session)
     session.Query<Target>().Single(x => x.Number == 5);
 }
 ```
-<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L134-L152' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_select_a_single_value' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L138-L156' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_select_a_single_value' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 ## Filtering Documents
@@ -108,9 +108,12 @@ public void order_by(IDocumentSession session)
 
     // You can use multiple order by's
     session.Query<Target>().OrderBy(x => x.Date).ThenBy(x => x.Number);
+
+    // If you're brave, you can even use raw SQL literals as of Marten v7!
+    session.Query<Target>().OrderBySql("substring(d.data -> 'String', 1, 2)");
 }
 ```
-<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L84-L97' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_ordering-in-linq' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L85-L101' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_ordering-in-linq' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 ## Ordering with dynamic properties
@@ -143,7 +146,7 @@ public void order_by_dynamic_props(IDocumentSession session)
     session.Query<Target>().OrderBy("Date DESC", "Number");
 }
 ```
-<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L99-L123' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_ordering-in-linq-using-dynamic-props' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L103-L127' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_ordering-in-linq-using-dynamic-props' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 ## Case-insensitive ordering for strings
@@ -190,7 +193,7 @@ public async Task sample_aggregation_operations(IQuerySession session)
     var average = await session.Query<Target>().AverageAsync(x => x.Number);
 }
 ```
-<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L186-L201' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_aggregation_operations' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L190-L205' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_aggregation_operations' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 ## Partitioning Operators
@@ -209,7 +212,7 @@ public void using_take_and_skip(IDocumentSession session)
     session.Query<Target>().Skip(10).Take(10).OrderBy(x => x.Number).ToArray();
 }
 ```
-<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L125-L132' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_using_take_and_skip' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L129-L136' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_using_take_and_skip' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 TODO -- link to the paging support

docs/documents/querying/linq/strings.md

@@ -31,9 +31,10 @@ public void case_insensitive_string_fields(IDocumentSession session)
     session.Query<Target>().Where(x => x.String.Contains("soMeThiNg", StringComparison.OrdinalIgnoreCase));
 
     session.Query<Target>().Where(x => x.String.Equals("ThE SaMe ThInG", StringComparison.OrdinalIgnoreCase));
+
 }
 ```
-<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L70-L82' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_searching_within_case_insensitive_string_fields' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/marten/blob/master/src/Marten.Testing/Examples/LinqExamples.cs#L70-L83' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_searching_within_case_insensitive_string_fields' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 A shorthand for case-insensitive string matching is provided through `EqualsIgnoreCase` (string extension method in *Baseline*):

src/CoreTests/DatabaseMultiTenancy/SingleServerMultiTenancyTests.cs

@@ -6,13 +6,15 @@
 using Npgsql;
 using Shouldly;
 using Weasel.Postgresql;
+using Weasel.Postgresql.Connections;
 using Xunit;
 
 namespace CoreTests.DatabaseMultiTenancy;
 
 [CollectionDefinition("multi-tenancy", DisableParallelization = true)]
-public class SingleServerMultiTenancyTests : IAsyncLifetime
+public class SingleServerMultiTenancyTests: IAsyncLifetime
 {
+    private DefaultNpgsqlDataSourceFactory dataSourceFactory = new();
     private SingleServerMultiTenancy theTenancy;
 
     public async Task InitializeAsync()
@@ -23,7 +25,9 @@ public async Task InitializeAsync()
         await DropDatabaseIfExists("database1");
         await DropDatabaseIfExists("database2");
 
-        theTenancy = new SingleServerMultiTenancy(ConnectionSource.ConnectionString, new StoreOptions());
+        var dataSource = dataSourceFactory.Create(ConnectionSource.ConnectionString);
+
+        theTenancy = new SingleServerMultiTenancy(dataSourceFactory, dataSource, new StoreOptions());
     }
 
     public Task DisposeAsync()

src/Marten.CommandLine/Marten.CommandLine.csproj

@@ -36,7 +36,7 @@
         <PackageReference Include="JasperFx.CodeGeneration.Commands" Version="3.4.0"/>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
         <PackageReference Include="Oakton" Version="6.1.0"/>
-        <PackageReference Include="Weasel.CommandLine" Version="7.0.0-alpha.3"/>
+        <PackageReference Include="Weasel.CommandLine" Version="7.0.0-alpha.6"/>
     </ItemGroup>
     <Import Project="../../Analysis.Build.props"/>
 </Project>

src/Marten.Testing/Harness/ConnectionSource.cs

@@ -1,12 +1,14 @@
 using System;
+using Weasel.Postgresql.Connections;
 
 namespace Marten.Testing.Harness;
 
-public class ConnectionSource : ConnectionFactory
+public class ConnectionSource: ConnectionFactory
 {
     // Keep the default timeout pretty short
     public static readonly string ConnectionString = Environment.GetEnvironmentVariable("marten_testing_database")
-                                                     ?? "Host=localhost;Port=5432;Database=marten_testing;Username=postgres;password=postgres;Command Timeout=5";
+                                                     ??
+                                                     "Host=localhost;Port=5432;Database=marten_testing;Username=postgres;password=postgres;Command Timeout=5";
 
     static ConnectionSource()
     {
@@ -16,7 +18,7 @@ static ConnectionSource()
     }
 
 
-    public ConnectionSource() : base(ConnectionString)
+    public ConnectionSource(): base(new DefaultNpgsqlDataSourceFactory(), ConnectionString)
     {
     }
 }

src/Marten/ConnectionFactory.cs

@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using Npgsql;
+using Weasel.Postgresql.Connections;
 
 namespace Marten;
 
@@ -9,29 +10,33 @@ namespace Marten;
 /// </summary>
 public class ConnectionFactory: IConnectionFactory
 {
+    private readonly INpgsqlDataSourceFactory _npgsqlDataSourceFactory;
     private readonly Lazy<string> _connectionString;
 
     /// <summary>
     ///     Supply a lambda that can resolve the connection string
     ///     for a Postgresql database
     /// </summary>
     /// <param name="connectionSource"></param>
-    public ConnectionFactory(Func<string> connectionSource)
+    public ConnectionFactory(INpgsqlDataSourceFactory npgsqlDataSourceFactory, Func<string> connectionSource)
     {
+        _npgsqlDataSourceFactory = npgsqlDataSourceFactory;
         _connectionString = new Lazy<string>(connectionSource);
     }
 
     /// <summary>
     ///     Supply the connection string to the Postgresql database directly
     /// </summary>
     /// <param name="connectionString"></param>
-    public ConnectionFactory(string connectionString)
+    public ConnectionFactory(INpgsqlDataSourceFactory npgsqlDataSourceFactory, string connectionString)
     {
+        _npgsqlDataSourceFactory = npgsqlDataSourceFactory;
         _connectionString = new Lazy<string>(() => connectionString);
     }
 
     public NpgsqlConnection Create()
     {
-        return new NpgsqlConnection(_connectionString.Value);
+        var dataSource = _npgsqlDataSourceFactory.Create(_connectionString.Value);
+        return dataSource.CreateConnection();
     }
 }

src/Marten/DocumentStore.IMartenStorage.cs

@@ -64,6 +64,6 @@ ValueTask<IMartenDatabase> IMartenStorage.FindOrCreateDatabase(string tenantIdOr
 
     private MartenDatabase nulloDatabase()
     {
-        return new MartenDatabase(Options, new ConnectionFactory(string.Empty), "NULLO");
+        return new MartenDatabase(Options, new ConnectionFactory(dataSourceFactory, string.Empty), "NULLO");
     }
 }

src/Marten/DocumentStore.cs

@@ -18,6 +18,7 @@
 using Marten.Storage;
 using Microsoft.Extensions.Logging;
 using Weasel.Core.Migrations;
+using Weasel.Postgresql.Connections;
 using IsolationLevel = System.Data.IsolationLevel;
 
 namespace Marten;
@@ -28,13 +29,16 @@ namespace Marten;
 public partial class DocumentStore: IDocumentStore, IAsyncDisposable
 {
     private readonly IMartenLogger _logger;
+    private readonly INpgsqlDataSourceFactory dataSourceFactory;
 
     /// <summary>
     ///     Creates a new DocumentStore with the supplied StoreOptions
     /// </summary>
     /// <param name="options"></param>
     public DocumentStore(StoreOptions options)
     {
+        // TODO: Inject here npgsql builder lambda from StoreOptions
+        dataSourceFactory = new DefaultNpgsqlDataSourceFactory();
         options.ApplyConfiguration();
         options.Validate();
 

src/Marten/Marten.csproj

@@ -43,10 +43,10 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
         <!-- This is forced by Npgsql peer dependency -->
-        <PackageReference Include="Npgsql.Json.NET" Version="8.0.0" />
-        <PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
-        <PackageReference Include="Weasel.Postgresql" Version="7.0.0-alpha.3"/>
-        <PackageReference Include="System.Text.Json" Version="8.0.0" />
+        <PackageReference Include="Npgsql.Json.NET" Version="8.0.0"/>
+        <PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.0"/>
+        <PackageReference Include="Weasel.Postgresql" Version="7.0.0-alpha.6"/>
+        <PackageReference Include="System.Text.Json" Version="8.0.0"/>
     </ItemGroup>
 
     <!--SourceLink specific settings-->

src/Marten/Storage/MartenDatabase.DocumentCleaner.cs

@@ -64,7 +64,7 @@ public async Task DeleteAllDocumentsAsync(CancellationToken ct = default)
         var builder = new CommandBuilder();
         foreach (var table in tables) builder.Append($"truncate {table} cascade;");
 
-        await builder.ExecuteNonQueryAsync(conn, ct).ConfigureAwait(false);
+        await conn.ExecuteNonQueryAsync(builder, ct).ConfigureAwait(false);
     }
 
     public void DeleteDocumentsByType(Type documentType)
@@ -83,7 +83,8 @@ public async Task DeleteDocumentsByTypeAsync(Type documentType, CancellationToke
 
     public void DeleteDocumentsExcept(params Type[] documentTypes)
     {
-        var documentMappings = _options.Storage.DocumentMappingsWithSchema.Where(x => !documentTypes.Contains(x.DocumentType));
+        var documentMappings =
+            _options.Storage.DocumentMappingsWithSchema.Where(x => !documentTypes.Contains(x.DocumentType));
         foreach (var mapping in documentMappings)
         {
             var storage = Providers.StorageFor(mapping.DocumentType);
@@ -93,7 +94,8 @@ public void DeleteDocumentsExcept(params Type[] documentTypes)
 
     public async Task DeleteDocumentsExceptAsync(CancellationToken ct, params Type[] documentTypes)
     {
-        var documentMappings = _options.Storage.DocumentMappingsWithSchema.Where(x => !documentTypes.Contains(x.DocumentType));
+        var documentMappings =
+            _options.Storage.DocumentMappingsWithSchema.Where(x => !documentTypes.Contains(x.DocumentType));
         foreach (var mapping in documentMappings)
         {
             var storage = Providers.StorageFor(mapping.DocumentType);
@@ -124,6 +126,7 @@ public void CompletelyRemove(Type documentType)
             {
                 e.Data[nameof(NpgsqlCommand)] = cmd;
             }
+
             MartenExceptionTransformer.WrapAndThrow(e);
         }
     }

src/Marten/Storage/MartenDatabase.EventStorage.cs

@@ -91,7 +91,7 @@ public partial class MartenDatabase
         var builder = new CommandBuilder();
         handler.ConfigureCommand(builder, null);
 
-        await using var reader = await builder.ExecuteReaderAsync(conn, token).ConfigureAwait(false);
+        await using var reader = await conn.ExecuteReaderAsync(builder, token).ConfigureAwait(false);
         return await handler.HandleAsync(reader, null, token).ConfigureAwait(false);
     }
 
@@ -120,7 +120,7 @@ public partial class MartenDatabase
         var builder = new CommandBuilder();
         handler.ConfigureCommand(builder, null);
 
-        await using var reader = await builder.ExecuteReaderAsync(conn, token).ConfigureAwait(false);
+        await using var reader = await conn.ExecuteReaderAsync(builder, token).ConfigureAwait(false);
         var state = await handler.HandleAsync(reader, null, token).ConfigureAwait(false);
 
         return state?.Sequence ?? 0;

src/Marten/Storage/MartenDatabase.cs

@@ -6,6 +6,7 @@
 using Marten.Internal;
 using Marten.Schema;
 using Marten.Schema.Identity.Sequences;
+using Npgsql;
 using Weasel.Core;
 using Weasel.Core.Migrations;
 using Weasel.Postgresql;
@@ -22,8 +23,25 @@ public partial class MartenDatabase: PostgresqlDatabase, IMartenDatabase
 
     private Lazy<SequenceFactory> _sequences;
 
-    public MartenDatabase(StoreOptions options, IConnectionFactory factory, string identifier)
-        : base(options, options.AutoCreateSchemaObjects, options.Advanced.Migrator, identifier, factory.Create)
+    public MartenDatabase(
+        StoreOptions options,
+        IConnectionFactory connectionFactory,
+        string identifier
+    ): base(options, options.AutoCreateSchemaObjects, options.Advanced.Migrator, identifier, connectionFactory.Create)
+    {
+        _features = options.Storage;
+        _options = options;
+
+        resetSequences();
+
+        Providers = options.Providers;
+    }
+
+    public MartenDatabase(
+        StoreOptions options,
+        NpgsqlDataSource npgsqlDataSource,
+        string identifier
+    ): base(options, options.AutoCreateSchemaObjects, options.Advanced.Migrator, identifier, npgsqlDataSource)
     {
         _features = options.Storage;
         _options = options;

src/Marten/Storage/SingleServerMultiTenancy.cs

@@ -3,7 +3,9 @@
 using System.Threading.Tasks;
 using JasperFx.Core;
 using Marten.Schema;
+using Npgsql;
 using Weasel.Core.Migrations;
+using Weasel.Postgresql.Connections;
 using Weasel.Postgresql.Migrations;
 
 namespace Marten.Storage;
@@ -28,6 +30,7 @@ public interface ISingleServerMultiTenancy
 internal class SingleServerMultiTenancy: SingleServerDatabaseCollection<MartenDatabase>, ITenancy,
     ISingleServerMultiTenancy
 {
+    private readonly INpgsqlDataSourceFactory _dataSourceFactory;
     private readonly StoreOptions _options;
 
     private readonly Dictionary<string, string> _tenantToDatabase = new();
@@ -37,8 +40,13 @@ internal class SingleServerMultiTenancy: SingleServerDatabaseCollection<MartenDa
 
     private ImHashMap<string, Tenant> _tenants = ImHashMap<string, Tenant>.Empty;
 
-    public SingleServerMultiTenancy(string masterConnectionString, StoreOptions options): base(masterConnectionString)
+    public SingleServerMultiTenancy(
+        INpgsqlDataSourceFactory dataSourceFactory,
+        NpgsqlDataSource npgsqlDataSource,
+        StoreOptions options
+    ): base(dataSourceFactory, npgsqlDataSource)
     {
+        _dataSourceFactory = dataSourceFactory;
         _options = options;
         Cleaner = new CompositeDocumentCleaner(this);
     }
@@ -132,8 +140,8 @@ public async ValueTask<IReadOnlyList<IDatabase>> BuildDatabases()
         return AllDatabases();
     }
 
-    protected override MartenDatabase buildDatabase(string databaseName, string connectionString)
+    protected override MartenDatabase buildDatabase(string databaseName, NpgsqlDataSource npgsqlDataSource)
     {
-        return new MartenDatabase(_options, new ConnectionFactory(connectionString), databaseName);
+        return new MartenDatabase(_options, npgsqlDataSource, databaseName);
     }
 }