Skip to content

Commit d3f8998

Browse files
authored
Merge pull request #560 from iceljc/bugfix/revert-mongo-db-name
fix db name
2 parents aee41a0 + 5262494 commit d3f8998

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

src/Plugins/BotSharp.Plugin.MongoStorage/MongoDbContext.cs

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Web;
2+
using System.Xml.Linq;
23

34
namespace BotSharp.Plugin.MongoStorage;
45

@@ -20,27 +21,14 @@ public MongoDbContext(BotSharpDatabaseSettings dbSettings)
2021

2122
private string GetDatabaseName(string mongoDbConnectionString)
2223
{
23-
var dbName = string.Empty;
24-
if (!Uri.TryCreate(mongoDbConnectionString, UriKind.Absolute, out var conn))
24+
var databaseName = mongoDbConnectionString.Substring(mongoDbConnectionString.LastIndexOf("/", StringComparison.InvariantCultureIgnoreCase) + 1);
25+
if (databaseName.Contains("?"))
2526
{
26-
return dbName;
27+
databaseName = databaseName.Substring(0, databaseName.IndexOf("?", StringComparison.InvariantCultureIgnoreCase));
2728
}
28-
29-
var query = HttpUtility.ParseQueryString(conn.Query);
30-
var keys = query.AllKeys ?? [];
31-
32-
if (keys.Contains(DB_NAME_INDEX))
33-
{
34-
dbName = query[DB_NAME_INDEX];
35-
}
36-
else
37-
{
38-
dbName = conn.Segments?.FirstOrDefault(x => x != "/") ?? string.Empty;
39-
}
40-
return dbName;
29+
return databaseName;
4130
}
4231

43-
4432
private IMongoDatabase Database { get { return _mongoClient.GetDatabase(_mongoDbDatabaseName); } }
4533

4634
#region Indexes

0 commit comments

Comments
 (0)