From 79e9b01c6a7b104fce1ee184f1a3ccc87805ed75 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Thu, 27 Jan 2022 01:12:17 +0100
Subject: [PATCH] dong

---
 zero.Core/Persistence/RavenOptions.cs          |  2 ++
 zero.Core/Persistence/ZeroPersistenceModule.cs |  1 +
 zero.Core/Stores/EntityStore.cs                | 10 ++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/zero.Core/Persistence/RavenOptions.cs b/zero.Core/Persistence/RavenOptions.cs
index 0100448e..9ff3d2de 100644
--- a/zero.Core/Persistence/RavenOptions.cs
+++ b/zero.Core/Persistence/RavenOptions.cs
@@ -9,6 +9,8 @@ public class RavenOptions
 
   public string Database { get; set; }
 
+  public bool DatabaseIsDefault { get; set; } = false;
+
   public string CollectionPrefix { get; set; } = String.Empty;
 
   public RavenIndexesOptions Indexes { get; set; } = new();
diff --git a/zero.Core/Persistence/ZeroPersistenceModule.cs b/zero.Core/Persistence/ZeroPersistenceModule.cs
index 3f197f6b..b539d5d0 100644
--- a/zero.Core/Persistence/ZeroPersistenceModule.cs
+++ b/zero.Core/Persistence/ZeroPersistenceModule.cs
@@ -30,6 +30,7 @@ internal class ZeroPersistenceModule : ZeroModule
 
     IZeroDocumentStore store = new ZeroDocumentStore(options)
     {
+      Database = ravenOptions.DatabaseIsDefault ? ravenOptions.Database : null,
       Urls = new string[1] { ravenOptions.Url },
       Conventions =
       {
diff --git a/zero.Core/Stores/EntityStore.cs b/zero.Core/Stores/EntityStore.cs
index 89a90ef1..50332a8d 100644
--- a/zero.Core/Stores/EntityStore.cs
+++ b/zero.Core/Stores/EntityStore.cs
@@ -15,13 +15,14 @@ public abstract class EntityStore<T> : IEntityStore<T> where T : ZeroIdEntity, I
   /// <inheritdoc />
   public StoreConfig Config => Operations.Config;
 
+  /// <inheritdoc />
+  public IStoreOperations Operations { get; private set; }
+
   protected IZeroContext Context { get; private set; }
 
 
   protected IInterceptors Interceptors { get; private set; }
 
-  protected IStoreOperations Operations { get; private set; }
-
   protected IZeroOptions Options { get; private set; }
 
 
@@ -107,6 +108,11 @@ public interface IEntityStore<T> where T : ZeroIdEntity, ISupportsFlavors, ISupp
   /// </summary>
   StoreConfig Config { get; }
 
+  /// <summary>
+  /// Access to underlying operations helper
+  /// </summary>
+  IStoreOperations Operations { get; }
+
   /// <summary>
   /// Get new instance of an entity (with an optional flavor)
   /// </summary>